[SCM] toonloop/master: Update changelog, control file and copyright hints.

Fri Apr 6 21:03:55 UTC 2012

The following commit has been merged in the master branch:
commit b9f05315a6099c1b7cd268aed6c248a1afe459c0
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 6 23:03:11 2012 +0200

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 13811b6..bd4831b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,14 +3,13 @@ toonloop (2.2.0-1) UNRELEASED; urgency=low
   * New upstream stable release (source identical to 2.1.18).
 
   [ Alessio Treglia ]
-  * Add patch 0005 to avoid FTBFS on SPARC (and other little-endian
-    architectures too, most likely).
-    Closes: #660151.
+  * Add patch 0005 to avoid FTBFS on big-endian architectures.
+    Closes: #660151. Thanks to Laurent Bigonville.
 
   [ Jonas Smedegaard ]
   * Drop dpkg-source local-options hint: Declared options are default
     since dpkg-source 1.16.1.
-  * Tidy patches:
+  * Tidy and improve patches:
     + Refresh with shortening quilt options -pab --no---no-timestamps
       --no-index.
     + Shorten short description.
@@ -19,6 +18,17 @@ toonloop (2.2.0-1) UNRELEASED; urgency=low
       it).
     + Add Last-Update field.
     + Stop patching autogenerated files.
+    + Add patch 0001 to avoid treating build warnings as errors.
+      Closes: bug#666756. Thanks to Sjoerd Simons.
+    + Drop unrelated and evidently bogus comment from patch 0004.
+    + Re-indent patch 0004 more similar to upstream coding style.
+    + Fix patch 0004 to properly unset custom USE_GLES2 flag (not set a
+      bogus debug option).
+      Closes: bug#660153. Thanks to Laurent Bigonville.
+    + Rephrase patch 0005 description: Only removes hardcoded endian
+      flag, but then needs it re-applied at build time.
+    + Add Author and Reviewed-By header paragraphs to patch 0005.
+    + Add patch 0006 to modernize autoconf.
   * Bump debhelper compat level to 7.
   * Bump standards-version to 3.9.3.
   * Update copyright file:
@@ -35,8 +45,21 @@ toonloop (2.2.0-1) UNRELEASED; urgency=low
     + Fix double-indent in Copyright fields as per Policy §5.6.13.
     + Bump format to 1.0.
     + Extend my copyright for Debian packaging.
-
- -- Jonas Smedegaard <dr at jones.dk>  Fri, 06 Apr 2012 18:44:54 +0200
+  * Tidy rules file to list CDBS variables after snippet inclusions, and
+    sort inclusions roughly in order of usage.
+  * Re-declare during build endianness un-hardcoded by patch 0004.
+  * Update package relations:
+    + Stop build-depending on ffmpeg or gettext: Apparently unneeded.
+    + Stop build-depending on GStreamer plugin packages: Apparently
+      needed only at runtime.
+    + Stop build-depending on automake or libtool: Handled implicitly by
+      dh-autoreconf.
+    + Stop build-depending on mencoder: Unused since 2.0.2.
+    + Stop build-depending on libgtk2.0-dev: Unused since 2.1.14.
+    + Build-depend on unversioned libglew-dev (not libglew1.5-dev).
+    + Build-depend on virtual libglu-dev (not libglu1-mesa-dev).
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 06 Apr 2012 23:02:19 +0200
 
 toonloop (2.1.18-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e236f91..4676e8e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,22 +6,14 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/toonloop.git
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Alexandre Quessy <alexandre at quessy.net>,
  Jonas Smedegaard <dr at jones.dk>
-Build-Depends: dh-autoreconf,
- cdbs,
+Build-Depends: cdbs,
+ dh-autoreconf,
  autotools-dev,
  debhelper,
  dh-buildinfo,
- automake,
+ dpkg-dev (>= 1.15.4~),
  bison,
- ffmpeg,
  flex,
- gettext,
- gstreamer0.10-ffmpeg,
- gstreamer0.10-plugins-bad,
- gstreamer0.10-plugins-base,
- gstreamer0.10-plugins-good,
- gstreamer0.10-plugins-ugly (>= 0.10.14),
- gstreamer0.10-x,
  help2man,
  libasound2-dev,
  libavc1394-dev,
@@ -33,20 +25,17 @@ Build-Depends: dh-autoreconf,
  libboost-thread-dev,
  libclutter-1.0-dev,
  libclutter-gst-dev,
- libglew1.5-dev,
+ libglew-dev,
  libglib2.0-dev,
- libglu1-mesa-dev,
+ libglu-dev,
  libgstreamer-plugins-base0.10-dev,
  libgstreamer0.10-dev (>= 0.10.23),
- libgtk2.0-dev,
  libjack-dev,
  liblo-dev,
  libraw1394-dev,
  libstk0-dev,
- libtool,
  libxml2-dev,
- libxv-dev,
- mencoder
+ libxv-dev
 Standards-Version: 3.9.3
 Homepage: http://www.toonloop.com/
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 6b5afd6..3e8a5f3 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -16,6 +16,7 @@ Files: AUTHORS
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/patches/0001_dont_use_werror.patch
  debian/patches/0002-help2man.patch
  debian/patches/0003-rtmidi.patch
  debian/patches/0004-fix_arm.patch
@@ -143,24 +144,25 @@ Copyright: 2008-2009, Soci
 License: GPL-3+
  FIXME
 
+Files: m4/ltoptions.m4
+ m4/ltsugar.m4
+ m4/ltversion.m4
+ m4/lt~obsolete.m4
+Copyright: 2004, Free Software Foundation, Inc
+  2004-2005, 2007 Free Software Foundation, Inc
+  2004-2005, 2007-2008, Free Software Foundation, Inc
+License: UNKNOWN
+ FIXME
+
 Files: config.guess
  config.sub
  missing
 Copyright: 1992-1999,
-  1992-2000
+  1992-2001
   1996-1997, 1999-2000, 2002-2006
 License: GPL-2+
  FIXME
 
-Files: m4/ltsugar.m4
- m4/ltversion.m4
- m4/lt~obsolete.m4
-Copyright: 2004, Free Software Foundation, Inc
-  2004-2005, 2007, 2009, Free Software Foundation, Inc
-  2004-2005, 2007-2008, Free Software Foundation, Inc
-License: UNKNOWN
- FIXME
-
 Files: m4/ax_boost_date_time.m4
  m4/ax_boost_thread.m4
 Copyright: 2008, Michael Tindal
@@ -188,13 +190,13 @@ Copyright: (ISLOWER ? 'A' + ( - 'a') : )
   (ISLOWER ? ( | 0x40) : )
   1992-1996, 1998-2001,
   1996-2001, 2003-2005
-  2010, Free Software Foundation, Inc
+  2009, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: m4/libtool.m4
 Copyright: 1996-2001, 2003-2005
-  2010, Free Software Foundation, Inc
+  2008, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
@@ -218,14 +220,13 @@ Copyright: 1996-1997, 2000-2001, 2003, 2005, 2008
 License: GPL-2+
  FIXME
 
-Files: ltmain.sh
-Copyright: 1996-2001, 2003-2006
-  all begin with the string "--lt-"
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009 Free
 License: GPL-2+
  FIXME
 
-Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
@@ -271,11 +272,6 @@ Copyright: 2008, Daniel Casimiro <dan.casimiro at gmail.com>
 License: UNKNOWN
  FIXME
 
-Files: m4/ltoptions.m4
-Copyright: 2004-2005, 2007-2009, Free Software Foundation
-License: UNKNOWN
- FIXME
-
 Files: m4/ax_boost_filesystem.m4
 Copyright: 2009, Michael Tindal
   2009, Roman Rybalko <libtorrent at romanr.info>

-- 
toonloop packaging

