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

[SCM] LibreOffice packaging repository branch, master, updated. 30a7b50154aee3d5e8666de29be65d0b6cfd7056



The following commit has been merged in the master branch:
commit 30a7b50154aee3d5e8666de29be65d0b6cfd7056
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Mar 25 13:23:31 2011 +0100

    remove obsolete shlibs.override.kde

diff --git a/changelog b/changelog
index bb9c043..92c0906 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,7 @@ libreoffice (1:3.3.2-2) UNRELEASED; urgency=low
     - add print= for OpenDocument mimetypes (closes: #619569)
   * debian/rules, debian/*.mime:
     - remove obsolete KDE 3 stuff
+  * debian/shlibs.override.kde: remove, obsolete
 
  -- Rene Engelhard <rene@debian.org>  Thu, 24 Mar 2011 09:34:40 +0100
 
diff --git a/rules b/rules
index 412779a..927af1c 100755
--- a/rules
+++ b/rules
@@ -3184,11 +3184,6 @@ endif
 ifneq (,$(filter icu, $(SYSTEM_STUFF)))
 	cat debian/shlibs.override.icu >> debian/shlibs.local
 endif
-ifeq "$(BUILD_KDE)" "y"
-	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
 ifeq "$(INTERNAL_STDLIBS)" "y"
 	cat debian/shlibs.override.stdlibs >> debian/shlibs.local
 endif
diff --git a/shlibs.override.kde b/shlibs.override.kde
deleted file mode 100644
index 225e699..0000000
--- a/shlibs.override.kde
+++ /dev/null
@@ -1,29 +0,0 @@
-libkde3support 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkunittest 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkdeui 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkparts 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkdefakes 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libthreadweaver 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkdesu 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libknotifyconfig 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkhtml 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkjsapi 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkntlm 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkrosscore 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkdnssd 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkpty 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libnepomuk 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkio 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libsolid 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkfile 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkrossui 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkjs 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkjsembed 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkutils 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkdecore 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkrossqtsplugin 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-ktexteditor_python encoding kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkimproxy 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libknewstuff2 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libkmediaplayer 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
-libktexteditor 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)

-- 
LibreOffice packaging repository


Reply to: