[Pkg-cli-libs-commits] [SCM] semweb branch, master, updated. debian/1.05+dfsg-4-4-g0581089

Chow Loong Jin hyperair at debian.org
Fri Jan 20 18:23:34 UTC 2012


The following commit has been merged in the master branch:
commit 17253c9b39977e074826aab71b244efac4b6b2fe
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat Jan 21 02:17:41 2012 +0800

    Merge -arch and -indep things together
    
    There are only Arch: all packages here, so there's no point in having all that
    cruft.

diff --git a/debian/control b/debian/control
index 0361ea6..a889932 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 7.0.50)
-Build-Depends-Indep: cli-common-dev (>= 0.5.7),
+Build-Depends: debhelper (>= 7.0.50),
+ cli-common-dev (>= 0.5.7),
  sharutils,
  mono-devel (>= 2.4.3),
  pkg-config,
  monodoc-base,
  libmysql-cil-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Homepage: http://razor.occams.info/code/semweb/
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/semweb.git
 Vcs-Git: git://git.debian.org/pkg-cli-libs/packages/semweb.git
diff --git a/debian/rules b/debian/rules
index 216646d..82a3e47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,25 +25,6 @@ override_dh_auto_build:
 		sn -R $$LIB debian/semweb.snk; \
 	done
 
-override_dh_auto_install:
-	# pkg-config
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
-	cp debian/semweb.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
-	mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb.pc \
-	   $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
-	perl -pe 's/#VERSION#/$(VERSION)/' -i \
-	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
-	perl -pe 's/#DEB_CLI_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
-	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
-	dh_auto_install
-
-override_dh_makeclilibs:
-	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh build
-
 	# build API docs
 	#for LIB in $(LIBS); do \
 	#	mdoc update -i $$LIB -o $(CURDIR)/bin_generics/monodocer; \
@@ -53,25 +34,31 @@ build-stamp: $(QUILT_STAMPFN)
 	mdoc assemble -o $(CURDIR)/bin_generics/SemWeb \
 	  -f ecma $(CURDIR)/bin_generics/monodocer
 
-	touch $@
+debian/semweb-$(DEB_CLI_ABI_VERSION).pc: debian/semweb.pc
+	cat $< | sed -e 's/#VERSION#/$(VERSION)/;' | \
+		sed -e 's/#DEB_CLI_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' > \
+		$@
 
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
+override_dh_auto_install: debian/semweb-$(DEB_CLI_ABI_VERSION).pc
+	# pkg-config
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
+	install -m644 debian/semweb-$(DEB_CLI_ABI_VERSION).pc \
+		debian/tmp/usr/lib/pkgconfig/
+	dh_auto_install
 
-binary: binary-indep
-binary-indep: install
-	dh $@
+override_dh_makeclilibs:
+	dh_makeclilibs -m $(DEB_CLI_API_VERSION)
 
-clean: unpatch
+override_dh_auto_clean:
 	# clean up our signing key
 	rm -f debian/semweb.snk
+	# clean up our .pc file
+	rm -f debian/semweb-$(DEB_CLI_ABI_VERSION).pc
 	# clean up our API docs
 	rm -f bin_generics/SemWeb.tree \
 	      bin_generics/SemWeb.zip
 	rm -rf bin_generics/monodocer
-	
+
 	# workaround for broken "make clean"
 	[ -d bin_generics/ ] || mkdir bin_generics/
 	for FILE in $(LIBS) \
@@ -82,7 +69,7 @@ clean: unpatch
 		touch $$FILE; \
 	done
 
-	dh $@
+	dh_auto_clean
 
 %:
 	dh $@

-- 
semweb



More information about the Pkg-cli-libs-commits mailing list