[SCM] hydrogen packaging branch, master, updated. b932e87c6695bf7b436fcb94b3810feaa6436733
js at users.alioth.debian.org
js at users.alioth.debian.org
Fri Mar 12 03:24:38 UTC 2010
The following commit has been merged in the master branch:
commit b932e87c6695bf7b436fcb94b3810feaa6436733
Author: Jonas Smedegaard <dr at jones.dk>
Date: Fri Mar 12 04:24:01 2010 +0100
Update changelog, control file and copyright hints.
diff --git a/debian/changelog b/debian/changelog
index f74d895..837a63b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+hydrogen (0.9.4-3) UNRELEASED; urgency=low
+
+ * Add TODO on generating manpage using help2man.
+ * Drop most local copyright-check.mk, and shrink package-relations.mk
+ to only contain binary relations not yet included in main cdbs.
+ * Adjust CDBS includes to both use very newest features and be
+ backports-friendly. Stop build-depending on devscripts.
+ * Sync scons.mk with HEAD of mainline cdbs.
+ * Add patch 1001 to use system-installed TinyXml. Build-depend on
+ libtinyxml-dev.
+
+ -- Jonas Smedegaard <dr at jones.dk> Fri, 12 Mar 2010 04:22:29 +0100
+
hydrogen (0.9.4-2) unstable; urgency=low
* Update local CDBS snippets:
diff --git a/debian/control b/debian/control
index ded7787..ee8fbe1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: cdbs, devscripts (>= 2.10.7), scons, debhelper (>= 6), dh-buildinfo, docbook-utils, libqt4-dev, libz-dev, pkg-config, libarchive-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-dev, libflac++-dev, libflac-dev (>= 1.1.1-3), portaudio19-dev, libportmidi-dev, liblash-dev, librsvg2-bin, netpbm
+Build-Depends: cdbs, scons, debhelper (>= 6), docbook-utils, libqt4-dev, libz-dev, pkg-config, libarchive-dev, libtinyxml-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-dev, libflac++-dev, libflac-dev (>= 1.1.1-3), portaudio19-dev, libportmidi-dev, liblash-dev, librsvg2-bin, netpbm
Standards-Version: 3.8.4
Homepage: http://www.hydrogen-music.org/
Vcs-Git: git://git.debian.org/git/pkg-multimedia/hydrogen.git
diff --git a/debian/copyright_hints b/debian/copyright_hints
index b227ebd..b2a208a 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -413,6 +413,7 @@ Files: ./AUTHORS,
./data/new_tutorial/img_tutorial/warn.png,
./data/new_tutorial/tutorial_en.html,
./debian/README.source,
+ ./debian/TODO,
./debian/compat,
./debian/control,
./debian/control.in,
@@ -426,6 +427,7 @@ Files: ./AUTHORS,
./debian/patches/07_gcc44.patch,
./debian/patches/08_550303_kbsd.patch,
./debian/patches/09_portaudio_v2.patch,
+ ./debian/patches/1001_use_system_tinyxml.patch,
./debian/patches/10_portmidi_v2.patch,
./debian/patches/README,
./debian/patches/series,
@@ -721,17 +723,6 @@ Copyright:
License: UNKNOWN
FIXME
-Files: ./debian/cdbs/1/rules/buildinfo.mk,
- ./debian/cdbs/1/rules/package-relations.mk,
- ./debian/cdbs/1/rules/upstream-tarball.mk,
- ./debian/rules
-Copyright: 2004-2007, Jonas Smedegaard <dr at jones.dk>
- 2007-2010, Jonas Smedegaard <dr at jones.dk>
- 2008-2010, Jonas Smedegaard <dr at jones.dk>
- 2010, Jonas Smedegaard <dr at jones.dk>
-License: GPL
- FIXME
-
Files: ./COPYING.TinyXML,
./libs/hydrogen/src/xml/tinyxml.h,
./libs/hydrogen/src/xml/tinyxmlerror.cpp,
@@ -740,9 +731,17 @@ Copyright: 2000-2002, Lee Thomason (www.grinninglizard.com)
License: zlib/libpng
FIXME
+Files: ./debian/cdbs/1/rules/package-relations.mk,
+ ./debian/rules
+Copyright: 2008-2010, Jonas Smedegaard <dr at jones.dk>
+ 2010, Jonas Smedegaard <dr at jones.dk>
+License: GPL
+ FIXME
+
Files: ./debian/cdbs/1/class/scons-vars.mk,
./debian/cdbs/1/class/scons.mk
Copyright: 2005, Matthew A. Nicholson <matt at matt-land.com>
+ 2008,2010, Jonas Smedegaard <dr at jones.dk>
License: GPL
FIXME
@@ -782,14 +781,6 @@ Copyright: *No copyright*
License: zlib/libpng
FIXME
-Files: ./debian/cdbs/1/rules/copyright-check.mk
-Copyright: ", join("\n\t", @ownerlines_unique), "\n";'\
- 2005-2010, Jonas Smedegaard <dr at jones.dk>
- notices found - assuming no news is good news...'; \
- notices...'
-License: GPL
- FIXME
-
Files: ./data/i18n/hydrogen.it.ts
Copyright: </span></p></body></html></source>
</span></p></body></html></translation>
--
hydrogen packaging
More information about the pkg-multimedia-commits
mailing list