Package: hpoj
Version: 0.91-14.1
Severity: wishlist
Tags: patch
This is the patch used in my NMU.
diff -u hpoj-0.91/debian/changelog hpoj-0.91/debian/changelog
--- hpoj-0.91/debian/changelog
+++ hpoj-0.91/debian/changelog
@@ -1,3 +1,20 @@
+hpoj (0.91-14.1) unstable; urgency=low
+
+ * Non-maintainer upload to solve release goal.
+ * Corrected init.d script runlevels and dependency information and
+ updated postinst to recover incorrect installations (Closes:
+ #544346).
+ * Dropped build dependency on removed package ttf2pt1, and stop
+ generating manual pages from HTML because of this (Closes:
+ #543133).
+ * Made sure init.d script do nothing when package is removed but not
+ purged (Closes: #518074).
+ * Updated Standards-Version from 3.8.0 to 3.8.3. No change needed.
+ * Updated to use debhelper version 7. Use dh_prep instead of
+ dh_clean -k, and use dh_lintian instead of install.
+
+ -- Petter Reinholdtsen <p...@debian.org> Mon, 14 Sep 2009 11:21:57 +0200
+
hpoj (0.91-14) unstable; urgency=low
* Ack NMUs: Thanks Petter & Luk
diff -u hpoj-0.91/scripts/ptal-init.in hpoj-0.91/scripts/ptal-init.in
--- hpoj-0.91/scripts/ptal-init.in
+++ hpoj-0.91/scripts/ptal-init.in
@@ -1,12 +1,12 @@
#!/usr/bin/perl
### BEGIN INIT INFO
# Provides: hpoj
-# Required-Start: $remote_fs
-# Required-Stop: $remote_fs
-# X-Start-Before: cupsys
-# X-Stop-after: cupsys
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# X-Start-Before: cups lpd lprng
+# X-Stop-after: cups lpd lprng
# Default-Start: 2 3 4 5
-# Default-Stop: 0
+# Default-Stop: 0 1 6
# Short-Description: Start daemon at boot time
# Description: Enable service provided by daemon.
### END INIT INFO
@@ -38,6 +38,10 @@
use strict;
+# Do nothing if the package is removed but not purged
+if ( ! -x "/usr/sbin/ptal-mlcd" ) {
+ exit 0;
+}
###########################################################################
# In case of difficulty you might need to modify the following definitions.
diff -u hpoj-0.91/debian/postinst hpoj-0.91/debian/postinst
--- hpoj-0.91/debian/postinst
+++ hpoj-0.91/debian/postinst
@@ -71,6 +71,15 @@
;;
esac
+# Those using dependency based boot sequencing with sysv-rc and installing
+# hpoj before version 0.91-14.1 would miss the runlevel 1 and 6 symlinks.
+# Recover from this.
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "0.91-14.1" \
+ && [ -f /etc/rc0.d/K[0-9][0-9]hpoj ] && [ ! -f /etc/rc1.d/K[0-9][0-9]hpoj ]
+then
+ update-rc.d -f hpoj remove
+fi
+
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
diff -u hpoj-0.91/debian/compat hpoj-0.91/debian/compat
--- hpoj-0.91/debian/compat
+++ hpoj-0.91/debian/compat
@@ -1 +1 @@
-4
+7
diff -u hpoj-0.91/debian/control hpoj-0.91/debian/control
--- hpoj-0.91/debian/control
+++ hpoj-0.91/debian/control
@@ -2,9 +2,9 @@
Section: utils
Priority: optional
Maintainer: Mark Purcell <m...@debian.org>
-Build-Depends: debhelper (>> 3.0.0), libqt3-mt-dev, libsane-dev, libcups2-dev,
libssl-dev, ttf2pt1, libusb-dev
+Build-Depends: debhelper (>> 7.0.0), libqt3-mt-dev, libsane-dev, libcups2-dev,
libssl-dev, libusb-dev
Build-Conflicts: libsnmp-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
Homepage: http://hpoj.sourceforge.net
Vcs-Svn: svn://svn.debian.org/pkg-hpijs/hpoj/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-hpijs/hpoj/?op=log
diff -u hpoj-0.91/debian/hpoj-xojpanel.files
hpoj-0.91/debian/hpoj-xojpanel.files
--- hpoj-0.91/debian/hpoj-xojpanel.files
+++ hpoj-0.91/debian/hpoj-xojpanel.files
@@ -3 +2,0 @@
-/usr/share/man/man1/xojpanel.1
diff -u hpoj-0.91/debian/rules hpoj-0.91/debian/rules
--- hpoj-0.91/debian/rules
+++ hpoj-0.91/debian/rules
@@ -31,17 +31,17 @@
# Add here commands to compile the package.
$(MAKE)
- /usr/share/ttf2pt1/scripts/html2man 1 < doc/ptal-hp.html
- /usr/share/ttf2pt1/scripts/html2man 1 < doc/xojpanel.html
- /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-init.html
- /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-mlcd.html
- /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-printd.html
- /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-photod.html
- /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-devid.html
- /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-connect.html
- /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-pml.html
- /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-device.html
- /usr/share/ttf2pt1/scripts/html2man 3 < doc/libptal.html
+# /usr/share/ttf2pt1/scripts/html2man 1 < doc/ptal-hp.html
+# /usr/share/ttf2pt1/scripts/html2man 1 < doc/xojpanel.html
+# /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-init.html
+# /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-mlcd.html
+# /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-printd.html
+# /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-photod.html
+# /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-devid.html
+# /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-connect.html
+# /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-pml.html
+# /usr/share/ttf2pt1/scripts/html2man 8 < doc/ptal-device.html
+# /usr/share/ttf2pt1/scripts/html2man 3 < doc/libptal.html
touch build-stamp
@@ -53,7 +53,7 @@
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
rm -f scripts/ptal-cups
- rm -f ptal-hp.1 xojpanel.1 ptal-init.1 ptal-mlcd.1 ptal-printd.1
ptal-photod.1 ptal-devid.1 ptal-connect.1 ptal-pml.1 ptal-device.1 libptal.1
+# rm -f ptal-hp.1 xojpanel.1 ptal-init.1 ptal-mlcd.1 ptal-printd.1
ptal-photod.1 ptal-devid.1 ptal-connect.1 ptal-pml.1 ptal-device.1 libptal.1
rm -f apps/xojpanel/Makefile
dh_clean
@@ -61,12 +61,12 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/hpoj.
$(MAKE) user_install prefix=$(CURDIR)/debian/hpoj/usr
- install -D -o root -g root -m 0644 debian/lintian
$(CURDIR)/debian/hpoj/usr/share/lintian/overrides/hpoj
+ dh_lintian
# Build architecture-independent files here.
binary-indep: build install
@@ -88,8 +88,8 @@
cp scripts/ptal-init debian/hpoj.init
dh_installinit -- defaults 19
rm debian/hpoj.init
- dh_installman ptal-hp.1 xojpanel.1 ptal-init.1 ptal-mlcd.1
ptal-printd.1 ptal-photod.1 ptal-devid.1 ptal-connect.1 ptal-pml.1
ptal-device.1 libptal.1
- dh_link usr/share/man/man8/ptal-connect.8
usr/share/man/man8/ptal-print.8
+# dh_installman ptal-hp.1 xojpanel.1 ptal-init.1 ptal-mlcd.1
ptal-printd.1 ptal-photod.1 ptal-devid.1 ptal-connect.1 ptal-pml.1
ptal-device.1 libptal.1
+# dh_link usr/share/man/man8/ptal-connect.8
usr/share/man/man8/ptal-print.8
dh_installchangelogs ChangeLog
dh_movefiles --sourcedir=debian/hpoj
dh_strip
reverted:
--- hpoj-0.91/debian/lintian
+++ hpoj-0.91.orig/debian/lintian
@@ -1,9 +0,0 @@
-# libptal.so & libhpojip.so are not 'proper' shared library
-# but are only used within the hpoj package
-#
-hpoj: non-dev-pkg-with-shlib-symlink
-hpoj: package-name-doesnt-match-sonames
-#
-# doc/hpoj/LICENSE.OpenSSL.gz is necessary to permit
-# linking between OpenSSL and GPL components
-hpoj: extra-license-file
only in patch2:
unchanged:
--- hpoj-0.91.orig/debian/hpoj.lintian-overrides
+++ hpoj-0.91/debian/hpoj.lintian-overrides
@@ -0,0 +1,9 @@
+# libptal.so & libhpojip.so are not 'proper' shared library
+# but are only used within the hpoj package
+#
+hpoj: non-dev-pkg-with-shlib-symlink
+hpoj: package-name-doesnt-match-sonames
+#
+# doc/hpoj/LICENSE.OpenSSL.gz is necessary to permit
+# linking between OpenSSL and GPL components
+hpoj: extra-license-file
Happy hacking,
--
Petter Reinholdtsen
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
