[SCM] Debian packaging for bibutils branch, master, updated. upstream/4.5-81-g6fbbf2b

David Bremner bremner at unb.ca
Fri Dec 10 03:56:24 UTC 2010


The following commit has been merged in the master branch:
commit dd64da5ed970b46e9d45bd2b12c0401296a7e415
Author: David Bremner <bremner at unb.ca>
Date:   Thu Dec 9 20:54:48 2010 -0400

    Simplify overrides for install/config.
    
    replace overrides for dh_auto_(install|config) with empty rules.
    Use dh_install for all installation (including symlinks).
    Install libbibcore.a

diff --git a/debian/libbibutils-dev.install b/debian/libbibutils-dev.install
index 0007131..eccf24d 100644
--- a/debian/libbibutils-dev.install
+++ b/debian/libbibutils-dev.install
@@ -1,3 +1,5 @@
+lib/libbibutils.so usr/lib
+lib/libbibcore.a usr/lib
 lib/libbibutils.a usr/lib
 lib/bibl.h usr/include/bibutils
 lib/bibtexout.h usr/include/bibutils
diff --git a/debian/rules b/debian/rules
index 184a94e..8d4bbf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,18 +11,15 @@ SOMAJOR=2
 SOMINOR=0
 SONAME="libbibutils.so."$(SOMAJOR)
 
-INSTALLDIR=$(CURDIR)/debian/tmp/bin
-DEVLIB=${CURDIR}/debian/libbibutils-dev/usr/lib
+DESTDIR=${CURDIR}/debian/tmp/
+INSTALLDIR=${DESTDIR}/usr/bin
+LIBINSTALLDIR=${DESTDIR}/usr/lib
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	# do the sed ourselves to avoid build dependency on csh
-	sed -e 's/REPLACE_CC/CC="cc -Wall"/' \
-	    -e 's/REPLACE_RANLIB/RANLIB="ranlib"/'  \
-	    -e "s|REPLACE_INSTALLDIR|${INSTALLDIR}|"  \
-	    -e 's/REPLACE_POSTFIX//' < Makefile_start > Makefile
+	@echo Skipping auto_configure
 
 override_dh_auto_build:
 	$(MAKE) -C lib -f Makefile.dynamic SONAME=$(SONAME) SOMINOR=$(SOMINOR) all
@@ -32,7 +29,4 @@ override_dh_auto_build:
 	make -C test test
 
 override_dh_auto_install:
-	mkdir -p ${INSTALLDIR}
-	$(MAKE) SOVERSION=$(SOVERSION) install
-	mkdir -p ${DEVLIB} && ln -s ${SONAME} ${DEVLIB}/libbibutils.so
-
+	@echo Skipping auto_install

-- 
Debian packaging for bibutils



More information about the debian-science-commits mailing list