From 3f26205e814b32858e117dcd59d0ddfdce724de0 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 24 Apr 2008 20:17:57 +0000 Subject: Update local cdbs snippets. Fix upstream Git URL. * Update local cdbs snippets: + Strip any non-printable characters in copyright-check.mk. Update copyright_hints. * Fix upstream Git source in debian/copyright. --- diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk index 321244e..5341ff9 100644 --- a/debian/cdbs/1/rules/copyright-check.mk +++ b/debian/cdbs/1/rules/copyright-check.mk @@ -43,6 +43,7 @@ debian/stamp-copyright-check: licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \ | LC_ALL=C perl -e \ '$$n=0; while (<>) {'\ + ' s/[^[:print:]]//g;'\ ' if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\ ' $$files[$$n]{name}=$$1;'\ ' $$files[$$n]{license}=$$2;'\ diff --git a/debian/changelog b/debian/changelog index 1e38d3b..1586720 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,15 @@ -sugar-toolkit (0.79.6-1) UNRELEASED; urgency=low +sugar-toolkit (0.79.6-1) unstable; urgency=low * New upstream release. Highlights: + Fix installation of bundles + Use new style for unused variables + * Update local cdbs snippets: + + Strip any non-printable characters in copyright-check.mk. Update + copyright_hints. + * Fix upstream Git source in debian/copyright. - -- Jonas Smedegaard Thu, 24 Apr 2008 22:05:43 +0200 + -- Jonas Smedegaard Thu, 24 Apr 2008 22:17:27 +0200 sugar-toolkit (0.79.5-3) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index d0504dc..583aaca 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ This is sugar toolkit packaged for Debian GNU systems. Upstream source: http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/ -Upstream Git source: git://dev.laptop.org/git/sugar-toolkit +Upstream Git source: git://dev.laptop.org/sugar-toolkit Upstream author: Red Hat, Inc. diff --git a/debian/copyright_hints b/debian/copyright_hints index 2206873..cdd7d38 100644 --- a/debian/copyright_hints +++ b/debian/copyright_hints @@ -73,14 +73,13 @@ GENERATED FILE [1994-2002]: Makefile.in sugar/datastore/Makefile.in sugar/graphics/Makefile.in sugar/presence/Makefile.in -GPL GENERATED FILE [1999-2000, 2003-2005 Free Software Foundation, Inc]: compile - depcomp LGPL-2+ [2004-2006 Christian Hammond]: sugar/sexy-icon-entry.c sugar/sexy-icon-entry.h *No copyright* GENERATED FILE []: sugar/_sugarext.c GENERATED FILE [1992-1996, 1998-2001]: configure GENERATED FILE [1995-2002 Free Software Foundation, Inc / 2001-2004 Red Hat, Inc / 1996-2004]: aclocal.m4 -GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2005]: missing +GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2006]: missing +GPL GENERATED FILE [1999-2000, 2003-2006 Free Software]: depcomp GPL GENERATED FILE [2000-2001 Eazel, Inc / 2000, 2003 Free Software Foundation]: intltool-merge.in GPL GENERATED FILE [2000-2001, 2003-2005 Free Software Foundation, Inc]: py-compile GPL GENERATED FILE [2000-2003 Free Software Foundation]: intltool-update.in -- cgit v0.9.1