[SCM] morituri/master: Prepare release: Update changelog, control file and copyright hints.

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Jun 5 17:35:22 UTC 2011


The following commit has been merged in the master branch:
commit d1d781e1c1ffdea23957a36077937acf5c142d78
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 5 19:28:40 2011 +0200

    Prepare release: Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 8336add..a79d8a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+morituri (0.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Drop patch 0001: Applied upstream.
+  * Reflect upstream requirement changes:
+    + Tighten (build-)dependency on gstreamer0.10-plugins-good.
+    + Depend on python-cddb.
+  * Fix depend on python-pkg-resources due to morituri/rip/cd.py cdrdao
+    version check.
+    Closes: bug#583286. Thanks to Elie De Brauwer.
+  * Ease building with git-buildpackage:
+    + Git-ignore quilt .pc dir.
+    + Add dpkg-source local-options hints.
+  * Update copyright file:
+    + Bump format to draft 174 of DEP-5.
+    + Quote license names in License field comments, and rewrap at 72
+      chars.
+    + Extend copyright years.
+  * Update control file:
+    + Bump policy compliance to standards-version 3.9.2.
+    + Shorten Vcs-* URLs.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sun, 05 Jun 2011 19:28:37 +0200
+
 morituri (0.1.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 9190c66..38c8bd0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,21 +4,21 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
 Build-Depends: devscripts (>= 2.10.7~),
- dh-buildinfo,
  python-central,
  cdbs (>= 0.4.75~),
  python-dev (>= 2.3.5-7),
  debhelper (>= 6),
+ dh-buildinfo,
  python-epydoc,
  pychecker,
  python-twisted-core,
  python-gtk2,
  python-gobject,
  python-gst0.10,
- gstreamer0.10-plugins-good
-Standards-Version: 3.8.4
-Vcs-Git: git://git.debian.org/git/pkg-multimedia/morituri.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/morituri.git;a=summary
+ gstreamer0.10-plugins-good (>= 0.10.22)
+Standards-Version: 3.9.2
+Vcs-Git: git://git.debian.org/git/pkg-multimedia/morituri
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/morituri.git
 Homepage: http://thomas.apestaart.org/morituri/trac/
 XS-Python-Version: all
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 55efdb1..1154bd5 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,239 +1,244 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-X-Draft: Autogenerated by CDBS snippet copyright-check.mk
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Upstream-Name: FIXME
+Upstream-Contact: FIXME
+Source: FIXME
+Disclaimer: Autogenerated by CDBS
 
-Files: ./AUTHORS,
-	./HACKING,
-	./Makefile.am,
-	./NEWS,
-	./README,
-	./RELEASE,
-	./TODO,
-	./bin/Makefile.am,
-	./bin/rip.in,
-	./configure.ac,
-	./debian/README.source,
-	./debian/compat,
-	./debian/control,
-	./debian/control.in,
-	./debian/gbp.conf,
-	./debian/patches/0001_fix_support_non-utf-8_console.patch,
-	./debian/patches/README,
-	./debian/patches/series,
-	./debian/pycompat,
-	./debian/source/format,
-	./debian/watch,
-	./doc/Makefile.am,
-	./doc/morituri.ics,
-	./doc/morituri.rss2,
-	./doc/rip.1,
-	./etc/Makefile.am,
-	./etc/bash_completion.d/Makefile.am,
-	./etc/bash_completion.d/bash-compgen,
-	./m4/Makefile.am,
-	./m4/as-ac-expand.m4,
-	./m4/as-python.m4,
-	./m4/as-version.m4,
-	./m4/pychecker.mk,
-	./misc/Makefile.am,
-	./misc/morituri-uninstalled,
-	./misc/pycheckerrc,
-	./misc/show-coverage.py,
-	./morituri.doap,
-	./morituri.spec,
-	./morituri.spec.in,
-	./morituri/Makefile.am,
-	./morituri/common/Makefile.am,
-	./morituri/configure/Makefile.am,
-	./morituri/configure/configure.py,
-	./morituri/configure/installed.py,
-	./morituri/configure/installed.py.in,
-	./morituri/configure/uninstalled.py,
-	./morituri/configure/uninstalled.py.in,
-	./morituri/extern/Makefile.am,
-	./morituri/extern/asyncsub.py,
-	./morituri/extern/command/command.py,
-	./morituri/extern/log/log.py,
-	./morituri/image/Makefile.am,
-	./morituri/program/Makefile.am,
-	./morituri/result/Makefile.am,
-	./morituri/rip/Makefile.am,
-	./morituri/rip/main.py,
-	./morituri/test/Makefile.am,
-	./morituri/test/bloc.cue,
-	./morituri/test/bloc.toc,
-	./morituri/test/breeders.cue,
-	./morituri/test/breeders.toc,
-	./morituri/test/capital.1.toc,
-	./morituri/test/capital.2.toc,
-	./morituri/test/capital.fast.toc,
-	./morituri/test/cdparanoia.progress,
-	./morituri/test/common.py,
-	./morituri/test/cure.cue,
-	./morituri/test/cure.toc,
-	./morituri/test/dBAR-011-0010e284-009228a3-9809ff0b.bin,
-	./morituri/test/dBAR-020-002e5023-029d8e49-040eaa14.bin,
-	./morituri/test/jose.toc,
-	./morituri/test/kanye.cue,
-	./morituri/test/kings-separate.cue,
-	./morituri/test/kings-single.cue,
-	./morituri/test/ladyhawke.toc,
-	./morituri/test/silentalarm.result.pickle,
-	./morituri/test/test_common_accurip.py,
-	./morituri/test/test_common_checksum.py,
-	./morituri/test/test_common_program.py,
-	./morituri/test/test_common_renamer.py,
-	./morituri/test/test_image_cue.py,
-	./morituri/test/test_image_image.py,
-	./morituri/test/test_image_table.py,
-	./morituri/test/test_image_toc.py,
-	./morituri/test/test_program_cdparanoia.py,
-	./morituri/test/test_program_cdrdao.py,
-	./morituri/test/track-separate.cue,
-	./morituri/test/track-single.cue,
-	./morituri/test/track.flac
+Files: AUTHORS
+ HACKING
+ Makefile.am
+ NEWS
+ README
+ RELEASE
+ TODO
+ bin/Makefile.am
+ bin/rip.in
+ configure.ac
+ debian/README.source
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/gbp.conf
+ debian/pycompat
+ debian/source/format
+ debian/watch
+ doc/Makefile.am
+ doc/morituri.ics
+ doc/morituri.rss2
+ doc/rip.1
+ etc/Makefile.am
+ etc/bash_completion.d/Makefile.am
+ etc/bash_completion.d/bash-compgen
+ m4/Makefile.am
+ m4/as-ac-expand.m4
+ m4/as-python.m4
+ m4/as-version.m4
+ m4/pychecker.mk
+ misc/Makefile.am
+ misc/morituri-uninstalled
+ misc/pycheckerrc
+ misc/show-coverage.py
+ morituri.doap
+ morituri.spec
+ morituri.spec.in
+ morituri/Makefile.am
+ morituri/common/Makefile.am
+ morituri/configure/Makefile.am
+ morituri/configure/configure.py
+ morituri/configure/installed.py
+ morituri/configure/installed.py.in
+ morituri/configure/uninstalled.py
+ morituri/configure/uninstalled.py.in
+ morituri/extern/Makefile.am
+ morituri/extern/asyncsub.py
+ morituri/extern/command/command.py
+ morituri/extern/log/log.py
+ morituri/image/Makefile.am
+ morituri/program/Makefile.am
+ morituri/result/Makefile.am
+ morituri/rip/Makefile.am
+ morituri/rip/main.py
+ morituri/test/Makefile.am
+ morituri/test/bloc.cue
+ morituri/test/bloc.toc
+ morituri/test/breeders.cue
+ morituri/test/breeders.toc
+ morituri/test/capital.1.toc
+ morituri/test/capital.2.toc
+ morituri/test/capital.fast.toc
+ morituri/test/cdparanoia.progress
+ morituri/test/cdparanoia.progress.error
+ morituri/test/common.py
+ morituri/test/cure.cue
+ morituri/test/cure.toc
+ morituri/test/dBAR-011-0010e284-009228a3-9809ff0b.bin
+ morituri/test/dBAR-020-002e5023-029d8e49-040eaa14.bin
+ morituri/test/jose.toc
+ morituri/test/kanye.cue
+ morituri/test/kings-separate.cue
+ morituri/test/kings-single.cue
+ morituri/test/ladyhawke.toc
+ morituri/test/silentalarm.result.pickle
+ morituri/test/test_common_accurip.py
+ morituri/test/test_common_checksum.py
+ morituri/test/test_common_program.py
+ morituri/test/test_common_renamer.py
+ morituri/test/test_image_cue.py
+ morituri/test/test_image_image.py
+ morituri/test/test_image_table.py
+ morituri/test/test_image_toc.py
+ morituri/test/test_program_cdparanoia.py
+ morituri/test/test_program_cdrdao.py
+ morituri/test/track-separate.cue
+ morituri/test/track-single.cue
+ morituri/test/track.flac
 Copyright: *No copyright*
 License: UNKNOWN
  FIXME
 
-Files: ./misc/header.py,
-	./morituri/common/accurip.py,
-	./morituri/common/checksum.py,
-	./morituri/common/common.py,
-	./morituri/common/drive.py,
-	./morituri/common/encode.py,
-	./morituri/common/log.py,
-	./morituri/common/logcommand.py,
-	./morituri/common/program.py,
-	./morituri/common/renamer.py,
-	./morituri/common/task.py,
-	./morituri/common/taskgtk.py,
-	./morituri/image/cue.py,
-	./morituri/image/image.py,
-	./morituri/image/table.py,
-	./morituri/image/toc.py,
-	./morituri/program/cdparanoia.py,
-	./morituri/program/cdrdao.py,
-	./morituri/result/logger.py,
-	./morituri/result/result.py,
-	./morituri/rip/cd.py,
-	./morituri/rip/drive.py,
-	./morituri/rip/image.py,
-	./morituri/rip/offset.py
+Files: misc/header.py
+ morituri/common/accurip.py
+ morituri/common/checksum.py
+ morituri/common/common.py
+ morituri/common/drive.py
+ morituri/common/encode.py
+ morituri/common/gstreamer.py
+ morituri/common/log.py
+ morituri/common/logcommand.py
+ morituri/common/program.py
+ morituri/common/renamer.py
+ morituri/common/task.py
+ morituri/common/taskgtk.py
+ morituri/image/cue.py
+ morituri/image/image.py
+ morituri/image/table.py
+ morituri/image/toc.py
+ morituri/program/cdparanoia.py
+ morituri/program/cdrdao.py
+ morituri/result/logger.py
+ morituri/result/result.py
+ morituri/rip/accurip.py
+ morituri/rip/cd.py
+ morituri/rip/debug.py
+ morituri/rip/drive.py
+ morituri/rip/image.py
+ morituri/rip/offset.py
 Copyright: 2009, Thomas Vander Stichele
+ 2009-2011, Thomas Vander Stichele
 License: GPL-3+
  FIXME
 
-Files: ./INSTALL,
-	./Makefile.in,
-	./bin/Makefile.in,
-	./doc/Makefile.in,
-	./etc/Makefile.in,
-	./etc/bash_completion.d/Makefile.in,
-	./m4/Makefile.in,
-	./misc/Makefile.in,
-	./morituri/Makefile.in,
-	./morituri/common/Makefile.in,
-	./morituri/configure/Makefile.in,
-	./morituri/extern/Makefile.in,
-	./morituri/image/Makefile.in,
-	./morituri/program/Makefile.in,
-	./morituri/result/Makefile.in,
-	./morituri/rip/Makefile.in,
-	./morituri/test/Makefile.in
+Files: INSTALL
+ Makefile.in
+ bin/Makefile.in
+ doc/Makefile.in
+ etc/Makefile.in
+ etc/bash_completion.d/Makefile.in
+ m4/Makefile.in
+ misc/Makefile.in
+ morituri/Makefile.in
+ morituri/common/Makefile.in
+ morituri/configure/Makefile.in
+ morituri/extern/Makefile.in
+ morituri/image/Makefile.in
+ morituri/program/Makefile.in
+ morituri/result/Makefile.in
+ morituri/rip/Makefile.in
+ morituri/test/Makefile.in
 Copyright: 1994-1996, 1999-2002, 2004-2005
-	1994-2002
+ 1994-2002
 License: UNKNOWN
  FIXME
 
-Files: ./aclocal.m4,
-	./configure
+Files: aclocal.m4
+ configure
 Copyright: 1992-1996, 1998-2001
-	1996, 1998, 2000-2005, 2008
-	1996-1997, 2000-2001, 2003, 2005, 2008
-	1996-2004,
-	1997, 1999-2001, 2003-2005, 2008
-	1997, 2000-2001, 2003-2006, 2008
-	2001, 2003, 2005, 2008 Free Software Foundation, Inc
-	2001, 2003, 2005, Free Software Foundation, Inc
-	2001-2003, 2005, 2008, 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-2005, Free Software Foundation, Inc
-	2006, 2008 Free Software Foundation, Inc
-	2008, Free Software Foundation, Inc
+ 1996, 1998, 2000-2005, 2008
+ 1996-1997, 2000-2001, 2003, 2005, 2008
+ 1996-2004,
+ 1997, 1999-2001, 2003-2005, 2008
+ 1997, 2000-2001, 2003-2006, 2008
+ 2001, 2003, 2005, 2008 Free Software Foundation, Inc
+ 2001, 2003, 2005, Free Software Foundation, Inc
+ 2001-2003, 2005, 2008, 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-2005, Free Software Foundation, Inc
+ 2006, 2008 Free Software Foundation, Inc
+ 2010, Free Software Foundation, Inc
 License: UNKNOWN
  FIXME
 
-Files: ./missing
+Files: missing
 Copyright: 1996-1997, 1999-2000, 2002-2006
 License: GPL
  FIXME
 
-Files: ./py-compile
+Files: py-compile
 Copyright: 2000-2001, 2003-2005, 2008-2009, Free Software
 License: GPL
  FIXME
 
-Files: ./debian/rules
+Files: debian/rules
 Copyright: 2009-2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL
  FIXME
 
-Files: ./morituri/extern/command/test_command.py
+Files: morituri/extern/command/test_command.py
 Copyright: 2006-2007, Thomas Vander Stichele <thomas at apestaart dot org>
 License: GPL-2+
  FIXME
 
-Files: ./COPYING
+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
 
-Files: ./install-sh
+Files: install-sh
 Copyright: 1994, X Consortium
 License: MIT/X11 (BSD like)
  FIXME
 
-Files: ./morituri/test/cdrdao.readtoc.progress
+Files: morituri/test/cdrdao.readtoc.progress
 Copyright: Andreas Mueller <andreas at daneb.de>
-	Joerg Schilling
-	Monty
+ Joerg Schilling
+ Monty
 License: UNKNOWN
  FIXME
 
-Files: ./morituri/extern/log/test_log.py
+Files: morituri/extern/log/test_log.py
 Copyright: 2004-2007, Fluendo, S.L. (www.fluendo.com)
 License: UNKNOWN
  FIXME
 
-Files: ./ChangeLog
+Files: ChangeLog
 Copyright: González.toc (added):
-	González.toc (deleted):
+ González.toc (deleted):
 License: UNKNOWN
  FIXME
 
-Files: ./morituri/extern/command/help2man.py
+Files: morituri/extern/command/help2man.py
 Copyright: 2009, Thomas Vander Stichele
 License: UNKNOWN
  FIXME

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list