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

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Apr 6 16:57:26 UTC 2012


The following commit has been merged in the master branch:
commit 4056a887a0a04e64970383709a6206be734bd73c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 6 18:57:09 2012 +0200

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 1c55f13..185ef06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+toonloop (2.1.18-4) UNRELEASED; urgency=low
+
+  [ Alessio Treglia ]
+  * Add patch 0005 to avoid FTBFS on SPARC (and other little-endian
+    architectures too, most likely).
+    Closes: #660151.
+
+  [ Jonas Smedegaard ]
+  * Drop dpkg-source local-options hint: Declared options are default
+    since dpkg-source 1.16.1.
+  * Tidy patches:
+    + Refresh with shortening quilt options -pab --no---no-timestamps
+      --no-index.
+    + Shorten short description.
+    + Drop trailing dot in short description.
+    + Consistently describe what patch does (not what happened without
+      it).
+    + Add Last-Update field.
+    + Stop patching autogenerated files.
+  * Bump debhelper compat level to 7.
+  * Bump standards-version to 3.9.3.
+  * Update copyright file:
+    + Fix include verbatim all flavors of GAP licensing, and list them
+      as License sections.
+    + Fix include verbatim flavored Expat licensing, and rename its
+      shortname accordingly.
+    + Shorten GPL license comments, drop duplications, and quote license
+      strings in them.
+    + Fix include verbatim flavored GPL licensings, and rename to
+      approproate License shortnames.
+    + Fix add some files. Fix add a copyrithg holder.
+    + Fix extend/correct copyright years.
+    + 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
+
 toonloop (2.1.18-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f82f97b..e236f91 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Alexandre Quessy <alexandre at quessy.net>,
 Build-Depends: dh-autoreconf,
  cdbs,
  autotools-dev,
- debhelper (>= 6),
+ debhelper,
  dh-buildinfo,
  automake,
  bison,
@@ -47,7 +47,7 @@ Build-Depends: dh-autoreconf,
  libxml2-dev,
  libxv-dev,
  mencoder
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.toonloop.com/
 
 Package: toonloop
diff --git a/debian/copyright_hints b/debian/copyright_hints
index c1e082d..6b5afd6 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,17 +1,12 @@
-Format: http://bzr.debian.org/scm/loggerhead/dep/dep5/trunk/annotate/137/dep5.mdwn
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FIXME
 Upstream-Contact: FIXME
 Source: FIXME
-Copyright: FIXME
-License: FIXME
-Disclaimer: Autogenerated by CDBS snippet copyright-check.mk
+Disclaimer: Autogenerated by CDBS
 
 Files: AUTHORS
  Makefile.am
- NEWS
  OSC
- README
- RELEASE
  TODO
  completion/Makefile.am
  completion/toonloop
@@ -21,31 +16,45 @@ Files: AUTHORS
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/patches/0002-help2man.patch
+ debian/patches/0003-rtmidi.patch
+ debian/patches/0004-fix_arm.patch
+ debian/patches/0005-remove_endian_define.patch
+ debian/patches/series
  debian/source/format
- debian/source/local-options
- debian/toonloop.lintian-overrides
  debian/toonloop.menu
  debian/watch
  m4/as-ac-expand.m4
+ m4/as-version.m4
  man/Makefile.am
  pixmaps/Makefile.am
  pixmaps/toonloop.png
  pixmaps/toonloop_32x32.xpm
+ pixmaps/toonloop_window_icon.png
+ presets/Makefile.am
+ presets/midi.xml
  src/Makefile.am
+ src/brcosaeffect.cpp
  src/config.h
  src/config.h.in
  src/doxyfile.in
+ src/effect.cpp
+ src/glslang.cpp
  src/log.h
  src/oscreceiver.cpp
  src/oscreceiver.h
  src/oscsender.cpp
  src/oscsender.h
+ src/shaders/Makefile.am
+ src/shaders/brcosa.glsl
  src/unused.h
  tests/Makefile.am
  tests/check_bool.cpp
  tests/check_classes.cpp
  tests/check_containers.cpp
+ tests/check_imageimporter.cpp
  tests/check_looper.cpp
+ tests/check_properties.cpp
  tests/check_signals.cpp
  tests/check_statesaving.cpp
  tests/check_symlinks.cpp
@@ -55,34 +64,51 @@ Copyright: *No copyright*
 License: UNKNOWN
  FIXME
 
-Files: man/man-toonloop.txt
+Files: README
+ man/man-toonloop.txt
  man/toonloop.1
  src/application.cpp
  src/application.h
+ src/brcosaeffect.h
  src/clip.cpp
  src/clip.h
+ src/clutter-tools.cpp
+ src/clutter-tools.h
+ src/command.cpp
+ src/command.h
  src/concurrentqueue.h
  src/configuration.cpp
  src/configuration.h
  src/controller.cpp
  src/controller.h
+ src/effect.h
+ src/glslang.h
  src/gui.cpp
  src/gui.h
  src/image.cpp
  src/image.h
+ src/image_importer.cpp
+ src/image_importer.h
+ src/infowindow.cpp
+ src/infowindow.h
+ src/legacyclutter.h
  src/main.cpp
- src/message.h
- src/midi.cpp
- src/midi.h
+ src/midibinder.cpp
+ src/midibinder.h
+ src/midiinput.cpp
+ src/midiinput.h
  src/moviesaver.cpp
  src/moviesaver.h
  src/oscinterface.cpp
  src/oscinterface.h
  src/pipeline.cpp
  src/pipeline.h
+ src/playheaditerator.cpp
+ src/playheaditerator.h
+ src/properties.h
+ src/property.h
  src/saverworker.cpp
  src/saverworker.h
- src/statesaving.cpp
  src/statesaving.h
  src/subprocess.cpp
  src/subprocess.h
@@ -90,7 +116,8 @@ Files: man/man-toonloop.txt
  src/timer.h
  src/timing.cpp
  src/timing.h
-Copyright: 2010, Alexandre Quessy
+Copyright: 2010, Alexandre Quessy <alexandre at quessy.net>
+  2010, Tristan Matthews <le.businessman at gmail.com>
 License: GPL-3+
  FIXME
 
@@ -99,130 +126,131 @@ Files: INSTALL
  completion/Makefile.in
  man/Makefile.in
  pixmaps/Makefile.in
+ presets/Makefile.in
  src/Makefile.in
+ src/shaders/Makefile.in
  tests/Makefile.in
 Copyright: 1994-1996, 1999-2002, 2004-2005
- 1994-2002
+  1994-2002
 License: UNKNOWN
  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
+Files: src/raw1394util.cpp
+ src/raw1394util.h
+ src/v4l2util.cpp
+ src/v4l2util.h
+Copyright: 2008-2009, SociÃtà des arts technologiques (SAT)
+License: GPL-3+
  FIXME
 
 Files: config.guess
  config.sub
+ missing
 Copyright: 1992-1999,
- 1992-2001
+  1992-2000
+  1996-1997, 1999-2000, 2002-2006
 License: GPL-2+
  FIXME
 
-Files: src/v4l2util.cpp
- src/v4l2util.h
-Copyright: 2008-2009, SociÃtà des arts technologiques (SAT)
-License: GPL-3+
+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
- 2008, Thomas Porschberg <thomas at randspringer.de>
- 2009, Michael Tindal
- 2009, Thomas Porschberg <thomas at randspringer.de>
+  2008, Thomas Porschberg <thomas at randspringer.de>
+  2009, Michael Tindal
+  2009, Thomas Porschberg <thomas at randspringer.de>
 License: UNKNOWN
  FIXME
 
 Files: m4/ax_boost_base.m4
  m4/ax_boost_program_options.m4
 Copyright: 2008, Thomas Porschberg <thomas at randspringer.de>
- 2009, Thomas Porschberg <thomas at randspringer.de>
+  2009, Thomas Porschberg <thomas at randspringer.de>
 License: UNKNOWN
  FIXME
 
-Files: missing
-Copyright: 1996-1997, 1999-2000, 2002-2006
-License: GPL
- FIXME
-
 Files: debian/rules
-Copyright: 2010, Alexandre Quessy <alexandre at quessy.net>
- 2010, Jonas Smedegaard <dr at jones.dk>
-License: GPL
- FIXME
-
-Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
+Copyright: 2010, 2012 Jonas Smedegaard <dr at jones.dk>
+  2010, Alexandre Quessy <alexandre at quessy.net>
 License: GPL
  FIXME
 
 Files: configure
 Copyright: (ISLOWER ? 'A' + ( - 'a') : )
- (ISLOWER ? ( | 0x40) : )
- 1992-1996, 1998-2001,
- 1996-2001, 2003-2005
- 2009, Free Software Foundation, Inc
+  (ISLOWER ? ( | 0x40) : )
+  1992-1996, 1998-2001,
+  1996-2001, 2003-2005
+  2010, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: m4/libtool.m4
 Copyright: 1996-2001, 2003-2005
- 2008, Free Software Foundation, Inc
+  2010, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: aclocal.m4
 Copyright: 1996-1997, 2000-2001, 2003, 2005, 2008
- 1996-2004,
- 1997, 1999-2001, 2003-2005, 2008
- 1997, 2000-2001, 2003-2006, 2008
- 1999-2005, 2008
- 1999-2006, 2009
- 2001, 2003, 2005, 2008 Free Software Foundation, Inc
- 2001, 2003, 2005, Free Software Foundation, Inc
- 2001-2003, 2005, 2008, Free Software Foundation, Inc
- 2001-2003, 2005, 2009, Free Software Foundation, Inc
- 2002-2003, 2005-2008, Free Software Foundation, Inc
- 2003, 2005 Free Software Foundation, Inc
- 2003-2006, Free Software Foundation, Inc
- 2004, Scott James Remnant <scott at netsplit.com>
- 2004-2005, Free Software Foundation, Inc
- 2006, 2008 Free Software Foundation, Inc
+  1996-2004,
+  1997, 1999-2001, 2003-2005, 2008
+  1997, 2000-2001, 2003-2006, 2008
+  1999-2005, 2008
+  1999-2006, 2009
+  2001, 2003, 2005, 2008 Free Software Foundation, Inc
+  2001, 2003, 2005, Free Software Foundation, Inc
+  2001-2003, 2005, 2008, Free Software Foundation, Inc
+  2001-2003, 2005, 2009, Free Software Foundation, Inc
+  2002-2003, 2005-2008, Free Software Foundation, Inc
+  2003, 2005 Free Software Foundation, Inc
+  2003-2006, Free Software Foundation, Inc
+  2004, Scott James Remnant <scott at netsplit.com>
+  2004-2005, Free Software Foundation, Inc
+  2006, 2008 Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: ltmain.sh
-Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
+Copyright: 1996-2001, 2003-2006
+  all begin with the string "--lt-"
+License: GPL-2+
+ FIXME
+
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009 Free
 License: GPL-2+
  FIXME
 
 Files: COPYING
 Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
- <year> <name of author>
- HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
- are not
- disclaimer" for the program, if necessary
- holder as a result of your choosing to follow a
- holder explicitly and
- holder is
- holder is reinstated (a)
- holder notifies you of the
- holder who authorizes use under this
- holder, and you cure the violation prior to 30 days after
- holders of
- if you do
- law
- law, except executing it on a
- on the Program, and are irrevocable provided the stated
- on the software, and (2) offer you this License
- permission
- permission, other than the making of an
- treaty adopted on 20 December 1996, or
+  <year> <name of author>
+  HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+  are not
+  disclaimer" for the program, if necessary
+  holder as a result of your choosing to follow a
+  holder explicitly and
+  holder is
+  holder is reinstated (a)
+  holder notifies you of the
+  holder who authorizes use under this
+  holder, and you cure the violation prior to 30 days after
+  holders of
+  if you do
+  law
+  law, except executing it on a
+  on the Program, and are irrevocable provided the stated
+  on the software, and (2) offer you this License
+  permission
+  permission, other than the making of an
+  treaty adopted on 20 December 1996, or
 License: GPL-3+
  FIXME
 
@@ -238,21 +266,32 @@ License: UNKNOWN
 
 Files: m4/ax_boost_system.m4
 Copyright: 2008, Daniel Casimiro <dan.casimiro at gmail.com>
- 2008, Michael Tindal
- 2008, Thomas Porschberg <thomas at randspringer.de>
+  2008, Michael Tindal
+  2008, Thomas Porschberg <thomas at randspringer.de>
+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>
- 2009, Thomas Porschberg <thomas at randspringer.de>
+  2009, Roman Rybalko <libtorrent at romanr.info>
+  2009, Thomas Porschberg <thomas at randspringer.de>
 License: UNKNOWN
  FIXME
 
 Files: ChangeLog
 Copyright: file for debian packaging
- to debian/
+  holders
+  to debian/
+License: UNKNOWN
+ FIXME
+
+Files: NEWS
+Copyright: holders
 License: UNKNOWN
  FIXME
 

-- 
toonloop packaging



More information about the pkg-multimedia-commits mailing list