tag 348715 +patch
thanks

Hi!

Here is a patch that fixes tihs bug, and a couple of other similar issues in 
the new traceroute package.

I also fixed one lintian warning in the patch. Feel free to use it.


/Sune


-- 
Do you know how can I do for inserting the button of the printer?

You cannot telnet to the board, so that from the control panel inside Mac you 
either should load from a controller, or need to open a Fast memory over a 
3-inch LCD shell to the kernel and from X-Windows or from DOS 97 you either 
can never unmount a PCI shell, or must debug the USB ISA hard disk of the 
parallel port 92 over the device but you have to click a head to the 
microprocessor to install the BIOS.
diff -u traceroute-2.0.7/debian/changelog traceroute-2.0.7/debian/changelog
--- traceroute-2.0.7/debian/changelog
+++ traceroute-2.0.7/debian/changelog
@@ -1,3 +1,14 @@
+traceroute (2.0.7-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Implement use of alternatives instead of random conflicts.
+    (Closes: #437815, #436698)
+  * Don't install tcptraceroute. The tcptraceroute in the tcptraceroute
+    package is much better. (Closes: 436804)
+  * Don't ignore errors from make clean.
+
+ -- Sune Vuorela <[EMAIL PROTECTED]>  Tue, 14 Aug 2007 13:52:54 +0200
+
 traceroute (2.0.7-3) unstable; urgency=low
 
   * Added conflicts/replaces to tcptraceroute (Closes: #436648).
diff -u traceroute-2.0.7/debian/rules traceroute-2.0.7/debian/rules
--- traceroute-2.0.7/debian/rules
+++ traceroute-2.0.7/debian/rules
@@ -28,7 +28,7 @@
 	rm -f build-stamp
 
 	# Cleaning package
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
 
@@ -39,21 +39,16 @@
 	dh_installdirs
 
 	# Installing package
-	install -D -m 0755 traceroute/traceroute debian/traceroute/usr/bin/traceroute
-	install -D -m 0755 tcptraceroute debian/traceroute/usr/bin/tcptraceroute
-	install -D -m 0644 traceroute.8 debian/traceroute/usr/share/man/man8/traceroute.8
+	install -D -m 0755 traceroute/traceroute debian/traceroute/usr/bin/traceroute.lbl
+	install -D -m 0644 traceroute.8 debian/traceroute/usr/share/man/man8/traceroute.lbl.8
 
 	install -D -m 0644 libsupp/libsupp.a debian/traceroute/usr/lib/libsupp.a
 	install -D -m 0644 libsupp/clif.h debian/traceroute/usr/include/clif.h
 
-	# Installing symlinks
-	ln -s traceroute debian/traceroute/usr/bin/traceroute6
 	ln -s traceroute debian/traceroute/usr/bin/tracert
 
 	install -d -m 0755 debian/traceroute/usr/share/man/man8
-	ln -s traceroute.8.gz debian/traceroute/usr/share/man/man8/traceroute6.8.gz
-	ln -s traceroute.8.gz debian/traceroute/usr/share/man/man8/tracert.8.gz
-	ln -s traceroute.8.gz debian/traceroute/usr/share/man/man8/tcptraceroute.8.gz
+	ln -s traceroute.lbl.8.gz debian/traceroute/usr/share/man/man8/tracert.8.gz
 
 binary-indep: build install
 
diff -u traceroute-2.0.7/debian/control traceroute-2.0.7/debian/control
--- traceroute-2.0.7/debian/control
+++ traceroute-2.0.7/debian/control
@@ -8,8 +8,6 @@
 Package: traceroute
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: iputils-tracepath, tcptraceroute
-Replaces: iputils-tracepath, tcptraceroute
 Description: Traces the route taken by packets over an IPv4/IPv6 network
  The traceroute utility displays the route used by IP packets on their way to a
  specified network (or Internet) host. Traceroute displays the IP number and
only in patch2:
unchanged:
--- traceroute-2.0.7.orig/debian/prerm
+++ traceroute-2.0.7/debian/prerm
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+case "$1" in
+	remove|upgrade|deconfigure)
+		update-alternatives --remove traceroute /usr/bin/traceroute.lbl
+		update-alternatives --remove traceroute6 /usr/bin/traceroute.lbl
+		;;
+
+	failed-upgrade)
+
+		;;
+
+	*)
+		echo "prerm called with unknown argument \`$1'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
only in patch2:
unchanged:
--- traceroute-2.0.7.orig/debian/postinst
+++ traceroute-2.0.7/debian/postinst
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	configure)
+		update-alternatives --install \
+			/usr/bin/traceroute traceroute /usr/bin/traceroute.lbl 100 \
+			--slave /usr/sbin/traceroute traceroute.sbin \
+				/usr/bin/traceroute.lbl \
+			--slave /usr/share/man/man8/traceroute.8.gz traceroute.8.gz \
+				/usr/share/man/man8/traceroute.lbl.8.gz
+		update-alternatives --install \
+			/usr/bin/traceroute6 traceroute6 /usr/bin/traceroute.lbl 100 \
+			--slave /usr/share/man/man8/traceroute6.8.gz traceroute6.8.gz \
+				/usr/share/man/man8/traceroute.lbl.8.gz
+		;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+
+		;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to