[Pkg-cli-libs-commits] [SCM] poppler-sharp branch, master, updated. debian/0.0.1-1-9-gcb89ba6

Chow Loong Jin hyperair at ubuntu.com
Wed Jul 6 06:32:37 UTC 2011


The following commit has been merged in the master branch:
commit 88a94981891ce064c43761f06bf29c16abc09f2e
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Wed Jul 6 11:56:19 2011 +0800

    Revert "Autogenerate soname in .dll.config"
    
    .dll.config should not be auto-generated, since the gapi files need to be
    updated if the ABI breaks.
    
    This reverts commit 80d20cb8ffcb50fa9b8a187dd183d719625edf50.

diff --git a/debian/poppler-sharp.dll.config b/debian/poppler-sharp.dll.config
new file mode 100644
index 0000000..0c36bb9
--- /dev/null
+++ b/debian/poppler-sharp.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+    <dllmap dll="poppler-glib" target="libpoppler-glib.so.4"/>
+</configuration>
diff --git a/debian/poppler-sharp.dll.config.in b/debian/poppler-sharp.dll.config.in
deleted file mode 100644
index 901f4fb..0000000
--- a/debian/poppler-sharp.dll.config.in
+++ /dev/null
@@ -1,3 +0,0 @@
-<configuration>
-    <dllmap dll="poppler-glib" target="@SONAME@"/>
-</configuration>
diff --git a/debian/rules b/debian/rules
index 6026668..6eca1c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@
 
 include /usr/share/cli-common/cli.make
 
-SONAME ?= $(shell objdump -p /usr/lib/libpoppler-glib.so | \
-	sed -n 's/ *SONAME *//p')
-
 override_dh_auto_configure:
 	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
@@ -25,15 +22,5 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf poppler.zip poppler.tree monodoc
 
-override_dh_install: debian/poppler-sharp.dll.config
-	dh_install
-
-debian/poppler-sharp.dll.config: debian/poppler-sharp.dll.config.in
-	sed -e 's/@SONAME@/$(SONAME)/' $< > $@
-
-clean:
-	rm -f debian/poppler-sharp.dll.config
-	dh $@
-
 %:
 	dh $@

-- 
poppler-sharp



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