Hi, I've prepared a QA upload of cdtool that fixes some bugs and updates the package to current standards. The full changelog is below. Is it ok to increase the Debian version?
cdtool (2.1.5-5) unstable; urgency=low * Debian QA upload * Updated to Standards Version 3.6.1 * Changed Maintainer to Debian QA * Fixed typo in a cdown.c error message. (Closes: #139402) * Updated the license path to common-licenses/GPL-2 * Changed postinst to ask with debconf. (Closes: #186445) * Moved cdtool binary to /usr/lib/cdtool. (Closes: #197912) * Tell dpkg-gencontrol to generate Priority and Section * Strip .note and .comment from the binaries -- Max Vozeler <[EMAIL PROTECTED]> Wed, 20 Jan 2004 23:19:59 +0100 There are some other bugs against cdtool that could be closed but I'm unsure what to do about: A proposed NMU diff that has been uploaded for a year now (#130417), the same with some other NMU bugs (#53347, #57817, #82977, #105578) Any reason to leave these open? Some users reported problems using cdtool on 2.2 kernels. This is not caused by cdtool but by the kernel and fixed in 2.2.18 (#67216, #71527, #76316). Note sure if this merits a note in the documentation or should just be closed. A diff with my changes against 2.1.5-4.1 is attached. I would need someone to sponsor this upload.. Cheers Max -- Max Vozeler <[EMAIL PROTECTED]> http://hinterhof.net/~max GnuPG B7CDA2DC : 308E 81E7 B979 63BC A0E6 ED88 9D5B D511 B7CD A2DC
diff -ruN cdtool-2.1.5/cdown.c cdtool-2.1.5-fixed/cdown.c --- cdtool-2.1.5/cdown.c 2004-01-21 02:09:06.000000000 +0100 +++ cdtool-2.1.5-fixed/cdown.c 2004-01-31 20:45:35.000000000 +0100 @@ -277,7 +277,7 @@ /* make the connection */ if (connect(sock, (struct sockaddr *)&iaddr, sizeof(iaddr)) == -1) { - fprintf (stderr, "%s: error: Oonnecting to host %s port %d\n", + fprintf (stderr, "%s: error: Connecting to host %s port %d\n", progname, hostname, port); perror(" error"); close(sock); diff -ruN cdtool-2.1.5/debian/changelog cdtool-2.1.5-fixed/debian/changelog --- cdtool-2.1.5/debian/changelog 2004-01-21 02:09:06.000000000 +0100 +++ cdtool-2.1.5-fixed/debian/changelog 2004-01-31 20:45:35.000000000 +0100 @@ -1,3 +1,17 @@ +cdtool (2.1.5-5) unstable; urgency=low + + * Debian QA upload + * Updated to Standards Version 3.6.1 + * Changed Maintainer to Debian QA + * Fixed typo in a cdown.c error message. (Closes: #139402) + * Updated the license path to common-licenses/GPL-2 + * Changed postinst to ask with debconf. (Closes: #186445) + * Moved cdtool binary to /usr/lib/cdtool. (Closes: #197912) + * Tell dpkg-gencontrol to generate Priority and Section + * Strip .note and .comment from the binaries + + -- Max Vozeler <[EMAIL PROTECTED]> Wed, 20 Jan 2004 23:19:59 +0100 + cdtool (2.1.5-4.1) unstable; urgency=low * Non-maintainer upload diff -ruN cdtool-2.1.5/debian/config cdtool-2.1.5-fixed/debian/config --- cdtool-2.1.5/debian/config 1970-01-01 01:00:00.000000000 +0100 +++ cdtool-2.1.5-fixed/debian/config 2004-01-31 20:47:57.000000000 +0100 @@ -0,0 +1,16 @@ +#! /bin/bash + +. /usr/share/debconf/confmodule + +if [ ! -e /dev/cdrom ]; then + fdev=$(awk '$2 ~ "/cdrom" && $1 !~ /^#/ { print $1 }' < /etc/fstab|head -1) + if [ $fdev ] && [ -b $fdev ]; then + db_set cdtool/unknown_audiocd_device $fdev + else + # resort to asking the user + db_fset cdtool/unknown_audiocd_device seen false + db_input high cdtool/unknown_audiocd_device || true + db_go + fi +fi + diff -ruN cdtool-2.1.5/debian/control cdtool-2.1.5-fixed/debian/control --- cdtool-2.1.5/debian/control 2004-01-21 02:09:06.000000000 +0100 +++ cdtool-2.1.5-fixed/debian/control 2004-01-31 20:45:35.000000000 +0100 @@ -1,12 +1,12 @@ Source: cdtool Section: sound Priority: optional -Maintainer: Martin Mitchell <[EMAIL PROTECTED]> -Standards-Version: 3.0.1 +Maintainer: Debian QA <[EMAIL PROTECTED]> +Standards-Version: 3.6.1 Package: cdtool Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, debconf (>= 0.5.00) Description: some text-based commands for managing a CD cdtool contains cdplay, cdeject, cdstop, cdpause, and several other utilities that let you control your CD-ROM drive from a command diff -ruN cdtool-2.1.5/debian/copyright cdtool-2.1.5-fixed/debian/copyright --- cdtool-2.1.5/debian/copyright 2004-01-21 02:09:06.000000000 +0100 +++ cdtool-2.1.5-fixed/debian/copyright 2004-01-31 20:45:35.000000000 +0100 @@ -10,4 +10,4 @@ Copyright: This program is copyrighted under the GNU General Public License -version 2. A copy can be found in /usr/doc/copyright/GPL. +version 2. A copy can be found in /usr/share/common-licenses/GPL-2. diff -ruN cdtool-2.1.5/debian/postinst cdtool-2.1.5-fixed/debian/postinst --- cdtool-2.1.5/debian/postinst 2004-01-21 02:09:06.000000000 +0100 +++ cdtool-2.1.5-fixed/debian/postinst 2004-01-31 20:47:56.000000000 +0100 @@ -1,5 +1,11 @@ -#! /bin/sh -if [ ! -e /dev/cdrom ] -then -changeaudiocddev +#! /bin/bash + +. /usr/share/debconf/confmodule + +if [ ! -e /dev/cdrom ]; then + db_get cdtool/unknown_audiocd_device + if [ $RET ] && [ -b $RET ]; then + ln -s $RET /dev/cdrom + fi fi + diff -ruN cdtool-2.1.5/debian/rules cdtool-2.1.5-fixed/debian/rules --- cdtool-2.1.5/debian/rules 2004-01-21 02:09:06.000000000 +0100 +++ cdtool-2.1.5-fixed/debian/rules 2004-01-31 20:45:35.000000000 +0100 @@ -30,12 +30,19 @@ # generated by this package. If there were any they would be # made here. +LINKS = cdplay cdpause cdstop cdeject cdir cdinfo cdreset cdvolume cdshuffle binary-arch: checkroot build $(checkdir) -rm -rf debian/tmp - install -d debian/tmp/usr/bin debian/tmp/usr/sbin debian/tmp/usr/share/doc/cdtool debian/tmp/usr/share/man/man1 debian/tmp/usr/share/man/man8 debian/tmp/DEBIAN + install -d debian/tmp/usr/bin debian/tmp/usr/sbin debian/tmp/usr/share/doc/cdtool debian/tmp/usr/lib/cdtool debian/tmp/usr/share/man/man1 debian/tmp/usr/share/man/man8 debian/tmp/DEBIAN make install DESTDIR=`pwd`/debian/tmp - $(STRIP) debian/tmp/usr/bin/cdtool debian/tmp/usr/bin/cdctrl debian/tmp/usr/bin/cdown + mv debian/tmp/usr/bin/cdtool debian/tmp/usr/lib/cdtool/cdtool + cd debian/tmp/usr/bin && rm -f $(LINKS) + for l in $(LINKS); do \ + rm -f debian/tmp/usr/bin/$$l; \ + ln -s ../lib/cdtool/cdtool debian/tmp/usr/bin/$$l; \ + done + $(STRIP) -R .note -R .comment debian/tmp/usr/lib/cdtool/cdtool debian/tmp/usr/bin/cdctrl debian/tmp/usr/bin/cdown install -m 0755 changeaudiocddev debian/tmp/usr/sbin install -m 0644 README debian/tmp/usr/share/doc/cdtool install -m 0644 debian/changelog debian/tmp/usr/share/doc/cdtool/changelog.Debian @@ -57,8 +64,10 @@ cd debian/tmp/usr/share/man/man1 && ln -s cdtool.1.gz cdshuffle.1.gz cd debian/tmp/usr/share/man/man1 && ln -s cdtool.1.gz cdvolume.1.gz install -m 0755 debian/postinst debian/tmp/DEBIAN - dpkg-shlibdeps debian/tmp/usr/bin/cdtool debian/tmp/usr/bin/cdctrl debian/tmp/usr/bin/cdown - dpkg-gencontrol + install -m 0755 debian/config debian/tmp/DEBIAN + install -m 0644 debian/templates debian/tmp/DEBIAN + dpkg-shlibdeps debian/tmp/usr/lib/cdtool/cdtool debian/tmp/usr/bin/cdctrl debian/tmp/usr/bin/cdown + dpkg-gencontrol -isp chown -R root.root debian/tmp chmod -R go=rX debian/tmp dpkg --build debian/tmp .. diff -ruN cdtool-2.1.5/debian/templates cdtool-2.1.5-fixed/debian/templates --- cdtool-2.1.5/debian/templates 1970-01-01 01:00:00.000000000 +0100 +++ cdtool-2.1.5-fixed/debian/templates 2004-01-31 20:45:35.000000000 +0100 @@ -0,0 +1,6 @@ +Template: cdtool/unknown_audiocd_device +Type: string +Description: Please enter the audio CD device or leave empty + cdtools needs to know which device to use for playing audio CDs. It + tried to determine that automatically but failed. You can enter + the correct device below or leave the field empty.