tags 402317 + patch
tags 402317 + pending
thanks

Dear maintainer,

I've prepared an NMU for lha (versioned as 1.14i-10.4) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u lha-1.14i/debian/rules lha-1.14i/debian/rules
--- lha-1.14i/debian/rules
+++ lha-1.14i/debian/rules
@@ -64,7 +64,7 @@
 	# $(MAKE) install BINDIR=$(CURDIR)/debian/lha/usr/bin \
 	#		MANDIR=$(CURDIR)/debian/lha/usr/share/man \
 	#		MANSECT=1
-	install -m 755 src/lha $(CURDIR)/debian/lha/usr/bin
+	install -m 755 src/lha $(CURDIR)/debian/lha/usr/bin/lha.bin
 
 	# Copy the filenames without the .euc extension
 	cp MACHINES.euc MACHINES 
@@ -75,8 +75,8 @@
 
 	gzip -9 -c man/lha.n > debian/lha.euc.1.gz
 	gzip -9 -c debian/lha.1 > debian/lha.1.gz
-	install -m 644 debian/lha.euc.1.gz $(CURDIR)/debian/lha/usr/share/man/ja/man1/lha.1.gz
-	install -m 644 debian/lha.1.gz $(CURDIR)/debian/lha/usr/share/man/man1/lha.1.gz
+	install -m 644 debian/lha.euc.1.gz $(CURDIR)/debian/lha/usr/share/man/ja/man1/lha.bin.1.gz
+	install -m 644 debian/lha.1.gz $(CURDIR)/debian/lha/usr/share/man/man1/lha.bin.1.gz
 
 # Build architecture-independent files here.
 binary-indep: build install
diff -u lha-1.14i/debian/control lha-1.14i/debian/control
--- lha-1.14i/debian/control
+++ lha-1.14i/debian/control
@@ -8,6 +8,7 @@
 Package: lha
 Architecture: any
 Depends: ${shlibs:Depends}
+Provides: lzh-archiver
 Description: lzh archiver
  The famous lzh archiver, known from DOS.  When mixing DOS and Unix
  you might need it.  (Especially for fido <--> rfc conversions.)
diff -u lha-1.14i/debian/changelog lha-1.14i/debian/changelog
--- lha-1.14i/debian/changelog
+++ lha-1.14i/debian/changelog
@@ -1,3 +1,11 @@
+lha (1.14i-10.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use alternatives for /usr/bin/lha, to play nice with others.
+    Thanks Ying-Chun Liu (PaulLiu). Closes: #402317.
+
+ -- Jon Dowland <j...@debian.org>  Mon, 14 May 2012 13:54:01 +0100
+
 lha (1.14i-10.3) unstable; urgency=medium
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- lha-1.14i.orig/debian/lha.prerm
+++ lha-1.14i/debian/lha.prerm
@@ -0,0 +1,23 @@
+#! /bin/sh
+# prerm script for lha
+#
+set -e
+case "$1" in
+    remove|upgrade|deconfigure)
+        update-alternatives --quiet --remove lha /usr/bin/lha.bin
+        update-alternatives --quiet --remove lzh-archiver /usr/bin/lha.bin
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm 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
only in patch2:
unchanged:
--- lha-1.14i.orig/debian/lha.postinst
+++ lha-1.14i/debian/lha.postinst
@@ -0,0 +1,30 @@
+#! /bin/sh
+# postinst script for lha
+#
+set -e
+case "$1" in
+    configure)
+        update-alternatives --quiet --install /usr/bin/lha lha /usr/bin/lha.bin 60 \
+            --slave /usr/share/man/man1/lha.1.gz lha.1.gz /usr/share/man/man1/lha.bin.1.gz \
+            --slave /usr/share/man/ja/man1/lha.1.gz lha.eucjp.1.gz /usr/share/man/ja/man1/lha.bin.1.gz
+        update-alternatives --quiet --install /usr/bin/lzh-archiver lzh-archiver /usr/bin/lha.bin 60 \
+            --slave /usr/share/man/man1/lzh-archiver.1.gz lzh-archiver.1.gz /usr/share/man/man1/lha.bin.1.gz \
+            --slave /usr/share/man/ja/man1/lzh-archiver.1.gz lzh-archiver.eucjp.1.gz /usr/share/man/ja/man1/lha.bin.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

Reply via email to