[Pkg-jed-commit] r466 - slang-slirp/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2006-12-25 21:04:16 +0100 (Mon, 25 Dec 2006)
New Revision: 466

Added:
   slang-slirp/trunk/debian/README.Debian
Modified:
   slang-slirp/trunk/debian/changelog
   slang-slirp/trunk/debian/rules
Log:
Debian release slang-slirp_1.9.0.3-2

Added: slang-slirp/trunk/debian/README.Debian
===================================================================
--- slang-slirp/trunk/debian/README.Debian	2006-12-18 10:43:40 UTC (rev 465)
+++ slang-slirp/trunk/debian/README.Debian	2006-12-25 20:04:16 UTC (rev 466)
@@ -0,0 +1,7 @@
+slang-slirp for Debian
+----------------------
+
+The slirp program has been renamed slang-slirp in order to avoid
+name conflicts with the slirp package.
+   
+ -- Rafael Laboissiere <rafael at debian.org>, Fri, 22 Dec 2004 10:22:01 +0200

Modified: slang-slirp/trunk/debian/changelog
===================================================================
--- slang-slirp/trunk/debian/changelog	2006-12-18 10:43:40 UTC (rev 465)
+++ slang-slirp/trunk/debian/changelog	2006-12-25 20:04:16 UTC (rev 466)
@@ -1,3 +1,11 @@
+slang-slirp (1.9.0.3-2) unstable; urgency=low
+
+  * debian/rules: Rename slirp program and man page to slang-slirp,
+    avoiding the conflicts with the slirp package (closes: #404009)
+  * debian/README.Debian: Document the change above  
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 25 Dec 2006 18:51:32 +0100
+
 slang-slirp (1.9.0.3-1) unstable; urgency=low
 
   * New upstream release

Modified: slang-slirp/trunk/debian/rules
===================================================================
--- slang-slirp/trunk/debian/rules	2006-12-18 10:43:40 UTC (rev 465)
+++ slang-slirp/trunk/debian/rules	2006-12-25 20:04:16 UTC (rev 466)
@@ -11,7 +11,11 @@
 DEB_MAKE_CHECK_TARGET := test
 DEB_INSTALL_CHANGELOGS_ALL = CHANGELOG
 
-debexp := $(CURDIR)/debian/examples
+debdir := $(CURDIR)/debian
+debexp := $(debdir)/examples
+debusr := $(debdir)/slang-slirp/usr
+debbin := $(debusr)/bin
+debman := $(debusr)/share/man/man1
 
 build/slang-slirp::
 	cp -a examples debian
@@ -21,6 +25,11 @@
 		$(MAKE) -C $(debexp)/$$d distclean ;	\
 	done
 
+# Rename slirp program to avoid conflict with the slirp package
+install/slang-slirp::
+	mv $(debbin)/slirp $(debbin)/slang-slirp
+	mv $(debman)/slirp.1 $(debman)/slang-slirp.1
+
 clean::
 	rm -rf $(debexp)
 	find examples -name ignored.txt | xargs rm -f