[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. debian/7.4.121.14026+dfsg-2

[Jo Shields]

The following commit has been merged in the master branch:
commit f3a1bc1abcaa1ef6267342992207cce17762fae9
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Jul 25 12:18:59 2010 +0100

    Make sure regualr expression dealing with ABI versioning in db4o.pc is greedy

diff --git a/debian/changelog b/debian/changelog
index 899e5e8..167c0d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ db4o (7.4.121.14026+dfsg-2) UNRELEASED; urgency=low
   * debian/db4o.pc:
     + Include all four db4o assemblies in the pkgconfig file's references,
       not just the main db4o assembly.
+  * debian/rules:
+    + Ensure regular expression dealing with ABI versioning in db4o.pc is
+      greedy, since we have multiple substitutions per line now.
 
  -- Jo Shields <directhex at apebox.org>  Sun, 25 Jul 2010 12:09:58 +0100
 
diff --git a/debian/rules b/debian/rules
index 38934fd..fa98d9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
 	cp debian/db4o.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
 
-	perl -pe 's/#PACKAGE_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
+	perl -pe 's/#PACKAGE_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/g' -i \
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o.pc
 	dh_auto_install
 

-- 
db4o