[Pkg-jed-commit] [SCM] slang-slirp branch, master, updated. bf938c5b6f753c0e31010ed919882b35fb3f5260

[Jörg Sommer]

The following commit has been merged in the master branch:
commit 1c6eb8284e8cd6a9c71e0c0bfbe90c720232a7e9
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Tue Feb 23 22:02:21 2010 +0100

    Install arch‐indep files in /usr/share/slang-slirp
    
    Because we had to rename the package, we can't use the directory
    /usr/share/slirp, because the slirp package might use this package for
    its files. To prevent conflicts with this package, the files should be
    installed in /u/s/slang-slirp.

diff --git a/debian/changelog b/debian/changelog
index 6094673..8f2ab30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ slang-slirp (1.9.8-1) UNRELEASED; urgency=low
 
   * Bumped Standards-Version to 3.8.4; no changes needed.
 
+  * Moved /usr/share/slirp to /u/s/slang-slirp, because we have to use
+    the package name to prevent conflicts.
+
  -- Jörg Sommer <joerg at alea.gnuu.de>  Thu, 01 Jan 1970 00:00:00 +0000
 
 slang-slirp (1.9.6-3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 695bd67..5332b97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-warnings
 DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="-fPIC -g -Wall -O2" FCFLAGS="-fPIC -g -O2"
 
 DEB_MAKE_BUILD_TARGET := all installable_slirpsh RPATH= SO_DEP_LIBS=-lc
-DEB_MAKE_INSTALL_TARGET := install RPATH= DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET := install RPATH= DESTDIR=$(DEB_DESTDIR) \
+  install_pkg_dir='$$(DESTDIR)$${datarootdir}/slang-slirp'
 DEB_MAKE_CHECK_TARGET := test
 DEB_INSTALL_CHANGELOGS_ALL = CHANGELOG
 
@@ -24,6 +25,7 @@ build/slang-slirp::
 	for d in $(shell ls $(debexp)) ; do		\
 		$(MAKE) -C $(debexp)/$$d distclean ;	\
 	done
+	sed -i '/^ScriptsDir=/s/slirp$$/slang-slirp/' slirp.ins
 
 install/slang-slirp::
 	# Rename slirp program to avoid conflict with the slirp package

-- 
slang-slirp