-
--- 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
-
--- 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 <joerg@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Joerg Jaspert <joerg@debian.org>
Uploaders: Eduard Bloch <blade@debian.org>, 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
-
--- 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:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# 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
+
-
--- 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
;;
-
--- 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
-
--- 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
-
--- 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 */
+
-
--- 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:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# 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
+
-
--- 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