[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/01: add shlibs.override for internal lib{wps, odfgen, mwaw}



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-4.3
in repository libreoffice.

commit 8479ddbcd786ce8be08527ba1fc649014fe87819
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jun 6 21:40:57 2014 +0200

    add shlibs.override for internal lib{wps,odfgen,mwaw}
---
 changelog                 | 4 +++-
 rules                     | 9 +++++++++
 shlibs.override.libmwaw   | 1 +
 shlibs.override.libodfgen | 1 +
 shlibs.override.libwps    | 1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index a0cac79..ef629cc 100644
--- a/changelog
+++ b/changelog
@@ -41,8 +41,10 @@ libreoffice (1:4.3.0~beta2-1) experimental; urgency=low
   * debian/control.*.in:
     - add Replaces: libreoffice-core (= 1:4.3.0~beta1-1) for above file move
       fixes
+  * debian/shlibs.override.lib{wps,odfgen,mwaw}: fix dh_shlibdeps with those
+    libs internal as they are .so.X's (add empty shlibs entry)
 
- -- Rene Engelhard <rene@debian.org>  Wed, 04 Jun 2014 23:23:46 +0200
+ -- Rene Engelhard <rene@debian.org>  Fri, 06 Jun 2014 20:13:59 +0200
 
 libreoffice (1:4.3.0~beta1-1) experimental; urgency=low
 
diff --git a/rules b/rules
index 22631d9..e55a3d8 100755
--- a/rules
+++ b/rules
@@ -3304,6 +3304,15 @@ endif
 ifneq (,$(filter libvisio, $(SYSTEM_STUFF)))
 	cat debian/shlibs.override.libvisio >> debian/shlibs.local
 endif
+ifeq (,$(filter libwps, $(SYSTEM_STUFF)))
+	cat debian/shlibs.override.libwps >> debian/shlibs.local
+endif
+ifeq (,$(filter libodfgen, $(SYSTEM_STUFF)))
+	cat debian/shlibs.override.libodfgen >> debian/shlibs.local
+endif
+ifeq (,$(filter libmwaw, $(SYSTEM_STUFF)))
+	cat debian/shlibs.override.libmwaw >> debian/shlibs.local
+endif
 	# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
 	# /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
 	# and therefore we must not use it for -gcj. But we *do* need it
diff --git a/shlibs.override.libmwaw b/shlibs.override.libmwaw
new file mode 100644
index 0000000..0b7e833
--- /dev/null
+++ b/shlibs.override.libmwaw
@@ -0,0 +1 @@
+libmwaw-0.3	3
diff --git a/shlibs.override.libodfgen b/shlibs.override.libodfgen
new file mode 100644
index 0000000..8caccde
--- /dev/null
+++ b/shlibs.override.libodfgen
@@ -0,0 +1 @@
+libodfgen-0.1	1
diff --git a/shlibs.override.libwps b/shlibs.override.libwps
new file mode 100644
index 0000000..36b5535
--- /dev/null
+++ b/shlibs.override.libwps
@@ -0,0 +1 @@
+libwps-0.3	3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: