[Pkg-cli-libs-commits] r3739 - in /packages/sublib/trunk/debian: libsublib0.9-cil.install patches/01_fix_sublib.pc.dpatch rules

[zadig-guest at users.alioth.debian.org]

Author: zadig-guest
Date: Mon May 26 13:28:42 2008
New Revision: 3739

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3739
Log:
fixing patch 01 and minor issues in rules

Modified:
    packages/sublib/trunk/debian/libsublib0.9-cil.install
    packages/sublib/trunk/debian/patches/01_fix_sublib.pc.dpatch
    packages/sublib/trunk/debian/rules

Modified: packages/sublib/trunk/debian/libsublib0.9-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/sublib/trunk/debian/libsublib0.9-cil.install?rev=3739&op=diff
==============================================================================
--- packages/sublib/trunk/debian/libsublib0.9-cil.install (original)
+++ packages/sublib/trunk/debian/libsublib0.9-cil.install Mon May 26 13:28:42 2008
@@ -1,1 +1,2 @@
 build/sublib.dll /usr/lib/cli/sublib-0.9/
+data/sublib.pc /usr/lib/pkgconfig/

Modified: packages/sublib/trunk/debian/patches/01_fix_sublib.pc.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/sublib/trunk/debian/patches/01_fix_sublib.pc.dpatch?rev=3739&op=diff
==============================================================================
--- packages/sublib/trunk/debian/patches/01_fix_sublib.pc.dpatch (original)
+++ packages/sublib/trunk/debian/patches/01_fix_sublib.pc.dpatch Mon May 26 13:28:42 2008
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad trunk~/data/sublib.pc.in trunk/data/sublib.pc.in
---- trunk~/data/sublib.pc.in	2008-05-25 18:27:12.000000000 -0300
-+++ trunk/data/sublib.pc.in	2008-05-25 19:07:19.990157650 -0300
+--- trunk~/data/sublib.pc.in	2008-05-25 22:07:08.435624775 -0300
++++ trunk/data/sublib.pc.in	2008-05-25 22:08:29.764327806 -0300
 @@ -1,10 +1,10 @@
  prefix=@prefix@
 -exec_prefix=@exec_prefix@
@@ -16,10 +16,11 @@
 +libdir=${prefix}/lib/cli/sublib-#PACKAGE_ABI_VERSION#
  includedir=@includedir@
 -Libraries=@libdir@/sublib/sublib.dll
-+Libraries=@libdir@/sublib.dll
++Libraries=${libdir}/sublib.dll
  
  Name: sublib
  Description: sublib - Subtitle Library
- Version: @VERSION@
+-Version: @VERSION@
 -Libs: -r:@libdir@/sublib/sublib.dll
-+Libs: -r:@libdir@/sublib.dll
++Version: #PACKAGE_UPSTREAM_VERSION#
++Libs: -r:${libdir}/sublib.dll

Modified: packages/sublib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/sublib/trunk/debian/rules?rev=3739&op=diff
==============================================================================
--- packages/sublib/trunk/debian/rules (original)
+++ packages/sublib/trunk/debian/rules Mon May 26 13:28:42 2008
@@ -4,15 +4,22 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
+UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
+ABIVERSION = 0.9
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+	./configure --prefix=/usr
 	touch configure-stamp
 
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
+	sed -i 's,#PACKAGE_UPSTREAM_VERSION#,$(UPVERSION),' data/sublib.pc
+	sed -i 's,#PACKAGE_ABI_VERSION#,$(ABIVERSION),' data/sublib.pc
 	make
 	touch build-stamp
 
@@ -23,12 +30,6 @@
 	rm -f build-stamp configure-stamp
 	rm -rf $(CURDIR)/.wapi build
 	dh_clean 
-
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	dpatch cat-all >patch-stamp
-
 unpatch:
 	dpatch deapply-all
 	rm -rf patch-stamp debian/patched