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

./packages/openofficeorg/3.2/unstable r1921: fix shlib-dependencies to not depend on the kdelibs5 transitional package anymore when built with KDE 4.4



------------------------------------------------------------
revno: 1921
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2010-04-07 21:16:13 +0200
message:
  fix shlib-dependencies to not depend on the kdelibs5 transitional package anymore when built with KDE 4.4
renamed:
  shlibs.local.in => shlibs.override.kde
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2010-04-07 13:57:06 +0000
+++ b/changelog	2010-04-07 19:16:13 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.2.0-7) UNRELEASED; urgency=low
+
+  * debian/rules, debian/shlibs.*: fix shlib-dependencies to not depend
+    on the kdelibs5 transitional package anymore when built with KDE 4.4 
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 07 Apr 2010 18:22:09 +0200
+
 openoffice.org (1:3.2.0-6) unstable; urgency=low
 
   * debian/patches/cws-linuxaxp01.diff: update

=== modified file 'rules'
--- a/rules	2010-04-06 22:27:15 +0000
+++ b/rules	2010-04-07 19:16:13 +0000
@@ -3438,10 +3438,16 @@
 	mv $$TMP debian/uno-libs3/DEBIAN/symbols && \
 	chmod 644 debian/uno-libs3/DEBIAN/symbols
 	dh_installdeb -s
-	cp debian/shlibs.local.in debian/shlibs.local
 ifeq "$(USE_SYSTEM_ICU)" "n"
 	cat debian/shlibs.override.icu >> debian/shlibs.local
 endif
+ifeq "$(BUILD_KDE)" "y"
+  ifeq "$(KDE_VER)" "4"
+	if dpkg --compare-versions `dpkg -l kdelibs5-dev | grep ^ii | awk '{ print $3 }'` le 4:4.4; then \
+		cat debian/shlibs.override.kde >> debian/shlibs.local; \
+	fi
+  endif
+endif
 ifeq "$(INTERNAL_STDLIBS)" "y"
 	cat debian/shlibs.override.stdlibs >> debian/shlibs.local
 endif

=== renamed file 'shlibs.local.in' => 'shlibs.override.kde'

Reply to: