diff -pruN 9:1.1.11-3.1/debian/changelog 9:1.1.11-3.1ubuntu2/debian/changelog --- 9:1.1.11-3.1/debian/changelog 2020-01-09 19:22:43.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/changelog 2020-08-06 14:16:23.000000000 +0000 @@ -1,3 +1,31 @@ +cdrkit (9:1.1.11-3.1ubuntu2) groovy; urgency=medium + + * debian/patches/gcc10.patch: + - fix the build with the new gcc + + -- Sebastien Bacher Thu, 06 Aug 2020 16:16:23 +0200 + +cdrkit (9:1.1.11-3.1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/wodim.preinst: Add "7a4383a7c0995736dee9d646b0724d08" to the + md5sums of unchanged config files (that is the dapper one). + - Introduce alternatives system for the scripts and manpages "cdda2mp3" + and "cdda2ogg". + * Dropped changes, included in Debian: + - debian/genisoimage.links: Add symlink to /usr/bin/mkisofs. + - Add Provides: cdrecord to binary package wodim. + - Add Provides: mkisofs to binary package genisoimage. + - Add Provides: cdda2wav to binary package icedax. + - Remove all version strings from conflicts/replaces in wodim, + genisoimage and icedax for the respective cdrtools binary package + names. + - debian/icedax.links: Add symlink to /usr/bin/cdda2wav. + - debian/wodim.links: Add symlink to /usr/bin/cdrecord. + - Apply Fedora patch by Peter Jones to add EFI boot support. + + -- Steve Langasek Mon, 17 Feb 2020 22:56:30 -0800 + cdrkit (9:1.1.11-3.1) unstable; urgency=medium * Non-maintainer upload (With Steve approval). @@ -10,6 +38,40 @@ cdrkit (9:1.1.11-3.1) unstable; urgency= -- Laurent Bigonville Thu, 09 Jan 2020 20:22:43 +0100 +cdrkit (9:1.1.11-3ubuntu3) eoan; urgency=medium + + * No-change upload with strops.h and sys/strops.h removed in glibc. + + -- Matthias Klose Thu, 05 Sep 2019 10:32:19 +0000 + +cdrkit (9:1.1.11-3ubuntu2) artful; urgency=medium + + * No-change rebuild to pick up -fPIE compiler default in static + libraries + + -- Steve Langasek Fri, 21 Apr 2017 20:46:24 +0000 + +cdrkit (9:1.1.11-3ubuntu1) vivid; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - debian/wodim.links: Add symlink to /usr/bin/cdrecord. + - debian/genisoimage.links: Add symlink to /usr/bin/mkisofs. + - debian/icedax.links: Add symlink to /usr/bin/cdda2wav. + - debian/control: + - Add Provides: cdrecord to binary package wodim. + - Add Provides: mkisofs to binary package genisoimage. + - Add Provides: cdda2wav to binary package icedax. + - Remove all version strings from conflicts/replaces in wodim, + genisoimage and icedax for the respective cdrtools binary package + names. + - debian/wodim.preinst: Add "7a4383a7c0995736dee9d646b0724d08" to the + md5sums of unchanged config files (that is the dapper one). + - Introduce alternatives system for the scripts and manpages "cdda2mp3" + and "cdda2ogg". + - Apply Fedora patch by Peter Jones to add EFI boot support. + + -- Colin Watson Mon, 24 Nov 2014 13:49:10 +0000 + cdrkit (9:1.1.11-3) unstable; urgency=medium * Fix FTBFS on kfreebsd-*. Closes: #754642. kfreebsd-* now includes a @@ -27,6 +89,39 @@ cdrkit (9:1.1.11-2.1) unstable; urgency= -- Stefano Zacchiroli Wed, 18 Jun 2014 12:02:31 +0200 +cdrkit (9:1.1.11-2ubuntu3) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Mon, 01 Oct 2012 16:49:13 +0100 + +cdrkit (9:1.1.11-2ubuntu2) precise; urgency=low + + * Update geteltorito to new upstream version. (LP: #530530) + + -- Soren Hansen Tue, 31 Jan 2012 14:08:36 +0100 + +cdrkit (9:1.1.11-2ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/wodim.links: Add symlink to /usr/bin/cdrecord. + - debian/genisoimage.links: Add symlink to /usr/bin/mkisofs. + - debian/icedax.links: Add symlink to /usr/bin/cdda2wav. + - debian/control: + - Add Provides: cdrecord to binary package wodim. + - Add Provides: mkisofs to binary package genisoimage. + - Add Provides: cdda2wav to binary package icedax. + - Remove all version strings from conflicts/replaces in wodim, + genisoimage and icedax for the respective cdrtools binary package + names. + - debian/wodim.preinst: Add "7a4383a7c0995736dee9d646b0724d08" to the + md5sums of unchanged config files (that is the dapper one). + - Introduce alternatives system for the scripts and manpages "cdda2mp3" + and "cdda2ogg". + - Apply Fedora patch by Peter Jones to add EFI boot support. + + -- Martin Pitt Wed, 19 Oct 2011 11:58:56 +0200 + cdrkit (9:1.1.11-2) unstable; urgency=low * Modify build-dependencies to better support kFreeBSD folks. Thanks to @@ -38,6 +133,33 @@ cdrkit (9:1.1.11-2) unstable; urgency=lo -- Steve McIntyre <93sam@debian.org> Thu, 21 Jul 2011 12:49:12 +0100 +cdrkit (9:1.1.11-1ubuntu2) natty; urgency=low + + * No-change rebuild to reduce changelogs. + + -- Martin Pitt Fri, 03 Dec 2010 09:31:46 +0100 + +cdrkit (9:1.1.11-1ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/wodim.links: Add symlink to /usr/bin/cdrecord. + - debian/genisoimage.links: Add symlink to /usr/bin/mkisofs. + - debian/icedax.links: Add symlink to /usr/bin/cdda2wav. + - debian/control: + - Add Provides: cdrecord to binary package wodim. + - Add Provides: mkisofs to binary package genisoimage. + - Add Provides: cdda2wav to binary package icedax. + - Remove all version strings from conflicts/replaces in wodim, + genisoimage and icedax for the respective cdrtools binary package + names. + - debian/wodim.preinst: Add "7a4383a7c0995736dee9d646b0724d08" to the + md5sums of unchanged config files (that is the dapper one). + - Introduce alternatives system for the scripts and manpages "cdda2mp3" + and "cdda2ogg". + - Apply Fedora patch by Peter Jones to add EFI boot support. + + -- Colin Watson Fri, 22 Oct 2010 12:40:31 +0100 + cdrkit (9:1.1.11-1) unstable; urgency=low * New upstream release. @@ -59,6 +181,41 @@ cdrkit (9:1.1.11-1) unstable; urgency=lo -- Steve McIntyre <93sam@debian.org> Sun, 17 Oct 2010 23:33:48 +0100 +cdrkit (9:1.1.10-1ubuntu3) maverick; urgency=low + + * Backport from svn: + - genisoimage: Fix silly bug in MD5 output in template files. + + -- Colin Watson Mon, 13 Sep 2010 13:26:17 +0100 + +cdrkit (9:1.1.10-1ubuntu2) maverick; urgency=low + + * Apply Fedora patch by Peter Jones to add EFI boot support. + + -- Colin Watson Wed, 25 Aug 2010 14:22:27 +0100 + +cdrkit (9:1.1.10-1ubuntu1) lucid; urgency=low + + * Merge with Debian (LP: #534307); remaining changes: + - debian/wodim.links: added symlink to /usr/bin/cdrecord + - debian/genisoimage.links: added symlink to /usr/bin/mkisofs + - debian/icedax.links: added symlink to /usr/bin/cdda2wav + - debian/control: + - added Provides: cdrecord to binary package wodim + - added Provides: mkisofs to binary package genisoimage + - added Provides: cdda2wav to binary package icedax + - removed all version strings from conflicts/replaces + in wodim, genisoimage and icedax for the respective + cdrtools binary pkg names + - debian/wodim.preinst: add "7a4383a7c0995736dee9d646b0724d08" to the + md5sums of unchanged config files (that is the dapper one). + - introduce alternatives system for the scripts and manpages + "cdda2mp3" and "cdda2ogg". + - no longer provide the dummy packages 'cdrecord', 'mkisofs' and + 'cdda2wav'. + + -- Felix Geyer Fri, 12 Mar 2010 10:34:42 +0100 + cdrkit (9:1.1.10-1) unstable; urgency=low * New upstream release. @@ -68,6 +225,34 @@ cdrkit (9:1.1.10-1) unstable; urgency=lo -- Steve McIntyre <93sam@debian.org> Fri, 27 Nov 2009 23:27:43 +0000 +cdrkit (9:1.1.9-1ubuntu2) karmic; urgency=low + + * Fix FTBFS with glibc 2.10 (LP: #430190) + + -- Felix Geyer Tue, 22 Sep 2009 14:20:09 +0200 + +cdrkit (9:1.1.9-1ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - debian/wodim.links: added symlink to /usr/bin/cdrecord + - debian/genisoimage.links: added symlink to /usr/bin/mkisofs + - debian/icedax.links: added symlink to /usr/bin/cdda2wav + - debian/control: + - added Provides: cdrecord to binary package wodim + - added Provides: mkisofs to binary package genisoimage + - added Provides: cdda2wav to binary package icedax + - removed all version strings from conflicts/replaces + in wodim, genisoimage and icedax for the respective + cdrtools binary pkg names + - debian/wodim.preinst: add "7a4383a7c0995736dee9d646b0724d08" to the + md5sums of unchanged config files (that is the dapper one). + - introduce alternatives system for the scripts and manpages + "cdda2mp3" and "cdda2ogg", in order to avoid file conflicts between + the cdda2wav package from multiverse with icedax from main. + - no longer provide the dummy packages 'cdrecord', 'mkisofs' and + + -- Matthias Klose Wed, 12 Nov 2008 15:01:39 +0100 + cdrkit (9:1.1.9-1) unstable; urgency=low * New upstream release with a couple of important bugfixes: @@ -80,6 +265,29 @@ cdrkit (9:1.1.9-1) unstable; urgency=low -- Steve McIntyre <93sam@debian.org> Sun, 26 Oct 2008 15:43:54 -0700 +cdrkit (9:1.1.8-1ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - debian/wodim.links: added symlink to /usr/bin/cdrecord + - debian/genisoimage.links: added symlink to /usr/bin/mkisofs + - debian/icedax.links: added symlink to /usr/bin/cdda2wav + - debian/control: + - added Provides: cdrecord to binary package wodim + - added Provides: mkisofs to binary package genisoimage + - added Provides: cdda2wav to binary package icedax + - removed all version strings from conflicts/replaces + in wodim, genisoimage and icedax for the respective + cdrtools binary pkg names + - debian/wodim.preinst: add "7a4383a7c0995736dee9d646b0724d08" to the + md5sums of unchanged config files (that is the dapper one). + - introduce alternatives system for the scripts and manpages + "cdda2mp3" and "cdda2ogg", in order to avoid file conflicts between + the cdda2wav package from multiverse with icedax from main. + - no longer provide the dummy packages 'cdrecord', 'mkisofs' and + 'cdda2wav', since we now have cdrtools in multiverse + + -- Matthias Klose Thu, 26 Jun 2008 00:42:24 +0200 + cdrkit (9:1.1.8-1) unstable; urgency=low * New upstream release, lots of changes in genisoimage: @@ -125,6 +333,60 @@ cdrkit (9:1.1.7-1) unstable; urgency=low -- Steve McIntyre <93sam@debian.org> Mon, 17 Mar 2008 20:07:58 +0000 +cdrkit (9:1.1.6-1ubuntu6) hardy; urgency=low + + * genisoimage/tree.c: + - Add patch to fix Joliet filesystem creation. This patch has + been commited to cdrkit svn revno 782 already (LP: #187459) + + -- Mario Limonciello Fri, 29 Feb 2008 22:47:13 -0600 + +cdrkit (9:1.1.6-1ubuntu5) hardy; urgency=low + + * debian/wodim.links: added symlink to /usr/bin/cdrecord + * debian/genisoimage.links: added symlink to /usr/bin/mkisofs + * debian/icedax.links: added symlink to /usr/bin/cdda2wav + * debian/control: + - added Provides: cdrecord to binary package wodim + - added Provides: mkisofs to binary package genisoimage + - added Provides: cdda2wav to binary package icedax + - removed all version strings from conflicts/replaces + in wodim, genisoimage and icedax for the respective + cdrtools binary pkg names + + -- Stephan Hermann Tue, 15 Jan 2008 12:36:22 +0100 + +cdrkit (9:1.1.6-1ubuntu4) hardy; urgency=low + + * debian/wodim.preinst: + - add "7a4383a7c0995736dee9d646b0724d08" to the md5sums + of unchanged config files (that is the dapper one) + (LP: #172851) + + -- Michael Vogt Thu, 29 Nov 2007 18:29:23 +0100 + +cdrkit (9:1.1.6-1ubuntu3) gutsy; urgency=low + + * introduce alternatives system for the scripts and manpages + "cdda2mp3" and "cdda2ogg", in order to avoid file conflicts between + the cdda2wav package from multiverse with icedax from main. + + -- Reinhard Tartler Sun, 16 Sep 2007 19:36:22 +0200 + +cdrkit (9:1.1.6-1ubuntu2) gutsy; urgency=low + + * no longer provide the dummy packages 'cdrecord', 'mkisofs' and + 'cdda2wav', since we now have cdrtools in multiverse + + -- Reinhard Tartler Sat, 15 Sep 2007 18:57:36 +0200 + +cdrkit (9:1.1.6-1ubuntu1) gutsy; urgency=low + + * Always initialise next pointer of jigdo include and exclude list + structures (LP: #130376). + + -- Colin Watson Sat, 04 Aug 2007 16:16:40 +0100 + cdrkit (9:1.1.6-1) unstable; urgency=low * New upstream release diff -pruN 9:1.1.11-3.1/debian/control 9:1.1.11-3.1ubuntu2/debian/control --- 9:1.1.11-3.1/debian/control 2020-01-09 19:19:34.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/control 2020-02-18 06:56:30.000000000 +0000 @@ -1,7 +1,8 @@ Source: cdrkit Priority: optional Section: otherosfs -Maintainer: Joerg Jaspert +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Joerg Jaspert Uploaders: Eduard Bloch , Steve McIntyre <93sam@debian.org> Build-Depends: debhelper (>=5.0.37.3), libbz2-dev, zlib1g-dev, autotools-dev, cmake (>= 2.4.2), libcap2-dev [linux-any], libcam-dev [kfreebsd-any], libmagic-dev Standards-Version: 3.9.2 diff -pruN 9:1.1.11-3.1/debian/icedax.install 9:1.1.11-3.1ubuntu2/debian/icedax.install --- 9:1.1.11-3.1/debian/icedax.install 2020-01-09 16:29:26.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/icedax.install 2020-01-10 21:46:34.000000000 +0000 @@ -1,10 +1,10 @@ debian/tmp/usr/bin/icedax -debian/tmp/usr/bin/cdda2mp3 -debian/tmp/usr/bin/cdda2ogg +debian/tmp/usr/bin/cdrkit.cdda2mp3 +debian/tmp/usr/bin/cdrkit.cdda2ogg debian/tmp/usr/bin/readmult debian/tmp/usr/bin/pitchplay debian/tmp/usr/share/man/man1/icedax.1 -debian/tmp/usr/share/man/man1/cdda2ogg.1 +debian/tmp/usr/share/man/man1/cdrkit.cdda2ogg.1 debian/tmp/usr/share/man/man1/readmult.1 debian/tmp/usr/share/man/man1/pitchplay.1 debian/tmp/usr/share/man/man1/list_audio_tracks.1 diff -pruN 9:1.1.11-3.1/debian/icedax.links 9:1.1.11-3.1ubuntu2/debian/icedax.links --- 9:1.1.11-3.1/debian/icedax.links 2020-01-09 16:29:50.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/icedax.links 2020-02-18 06:56:30.000000000 +0000 @@ -1,4 +1,4 @@ -usr/share/man/man1/cdda2ogg.1.gz usr/share/man/man1/cdda2mp3.1.gz +usr/share/man/man1/cdrkit.cdda2ogg.1.gz usr/share/man/man1/cdrkit.cdda2mp3.1.gz usr/bin/icedax usr/bin/list_audio_tracks usr/bin/icedax usr/bin/cdda2wav usr/share/man/man1/icedax.1.gz usr/share/man/man1/cdda2wav.1.gz diff -pruN 9:1.1.11-3.1/debian/icedax.postinst 9:1.1.11-3.1ubuntu2/debian/icedax.postinst --- 9:1.1.11-3.1/debian/icedax.postinst 1970-01-01 00:00:00.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/icedax.postinst 2020-01-10 21:46:29.000000000 +0000 @@ -0,0 +1,50 @@ +#! /bin/sh + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/share/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + update-alternatives --quiet --install \ + /usr/bin/cdda2ogg cdda2ogg /usr/bin/cdrkit.cdda2ogg 50 \ + --slave /usr/share/man/man1/cdda2ogg.1.gz cdda2ogg.1.gz \ + /usr/share/man/man1/cdrkit.cdda2ogg.1.gz + + update-alternatives --quiet --install \ + /usr/bin/cdda2mp3 cdda2mp3 /usr/bin/cdrkit.cdda2mp3 50 \ + --slave /usr/share/man/man1/cdda2mp3.1.gz cdda2mp3.1.gz \ + /usr/share/man/man1/cdrkit.cdda2mp3.1.gz + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + diff -pruN 9:1.1.11-3.1/debian/icedax.prerm 9:1.1.11-3.1ubuntu2/debian/icedax.prerm --- 9:1.1.11-3.1/debian/icedax.prerm 1970-01-01 00:00:00.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/icedax.prerm 2020-01-10 21:46:29.000000000 +0000 @@ -0,0 +1,31 @@ +#! /bin/sh + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|upgrade|deconfigure) + update-alternatives --quiet --remove cdda2ogg /usr/bin/cdrkit.cdda2ogg + update-alternatives --quiet --remove cdda2mp3 /usr/bin/cdrkit.cdda2mp3 + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 + diff -pruN 9:1.1.11-3.1/debian/patches/gcc10.patch 9:1.1.11-3.1ubuntu2/debian/patches/gcc10.patch --- 9:1.1.11-3.1/debian/patches/gcc10.patch 1970-01-01 00:00:00.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/patches/gcc10.patch 2020-08-06 14:16:23.000000000 +0000 @@ -0,0 +1,16 @@ +# Description: fix the build with gcc-10 +# Copied from fedora +# Upstream: unsure where upstream is nowadays? +diff -up cdrkit-1.1.11/genisoimage/genisoimage.h.me cdrkit-1.1.11/genisoimage/genisoimage.h +--- cdrkit-1.1.11/genisoimage/genisoimage.h.me 2020-02-24 15:10:35.542998992 +0100 ++++ cdrkit-1.1.11/genisoimage/genisoimage.h 2020-02-24 15:10:50.011130450 +0100 +@@ -377,7 +377,7 @@ extern int use_fileversion; + extern int split_SL_component; + extern int split_SL_field; + extern char *trans_tbl; +-char *outfile; ++extern char *outfile; + + #define JMAX 64 /* maximum Joliet file name length (spec) */ + #define JLONGMAX 103 /* out of spec Joliet file name length */ + diff -pruN 9:1.1.11-3.1/debian/patches/series 9:1.1.11-3.1ubuntu2/debian/patches/series --- 9:1.1.11-3.1/debian/patches/series 2020-01-09 17:36:13.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/patches/series 2020-08-06 14:16:23.000000000 +0000 @@ -2,3 +2,4 @@ update_geteltorito.patch fix_typo.patch fix_libcap_detection.patch add-efi-boot.patch +gcc10.patch diff -pruN 9:1.1.11-3.1/debian/rules 9:1.1.11-3.1ubuntu2/debian/rules --- 9:1.1.11-3.1/debian/rules 2020-01-09 18:44:27.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/rules 2020-01-10 21:46:34.000000000 +0000 @@ -62,8 +62,10 @@ build/install-debstamp: install -m 755 3rd-party/geteltorito/geteltorito.pl $(i)/bin/geteltorito install -m 755 3rd-party/zisofs_tools/mkzftree $(i)/bin/ - install -m 755 icedax/cdda2ogg $(i)/bin/ - install -m 755 icedax/cdda2mp3 $(i)/bin/ + install -m 755 icedax/cdda2ogg $(i)/bin/cdrkit.cdda2ogg + install -m 755 icedax/cdda2mp3 $(i)/bin/cdrkit.cdda2mp3 + # XXX hack hack + mv -v $(i)/share/man/man1/cdda2ogg.1 $(i)/share/man/man1/cdrkit.cdda2ogg.1 install -m 755 icedax/readmult $(i)/bin/ install -m 755 icedax/pitchplay $(i)/bin/ touch build/install-debstamp @@ -135,7 +137,7 @@ icedax: install dh_install -p$@ -P$(b)/$@ # cp debian/reportbug.presubj $(b)/$@/usr/share/bug/icedax/presubj dh_strip -p$@ -P$(b)/$@ - chmod 755 $(b)/$@/usr/bin/cdda2* + chmod 755 $(b)/$@/usr/bin/cdrkit.cdda2* dh_link -p$@ -P$(b)/$@ chmod 755 $(b)/$@/usr/bin/readmult chmod 755 $(b)/$@/usr/bin/pitchplay diff -pruN 9:1.1.11-3.1/debian/wodim.preinst 9:1.1.11-3.1ubuntu2/debian/wodim.preinst --- 9:1.1.11-3.1/debian/wodim.preinst 2020-01-09 16:29:26.000000000 +0000 +++ 9:1.1.11-3.1ubuntu2/debian/wodim.preinst 2020-01-10 21:46:34.000000000 +0000 @@ -23,6 +23,7 @@ if [ "$1" = "upgrade" ] || [ "$1" = "in e05fdb0a48542ccbff5b28b100d083e3 |\ e7e6151fe872d56351d04f4c2c3d9722 |\ eff315991af0911ae8c96b9500c1714f |\ + 7a4383a7c0995736dee9d646b0724d08 |\ "") rm -f $CONF ;;