rev 16928 - in trunk/packages/kdelibs/debian: . patches

Modestas Vainius modax at alioth.debian.org
Sat Feb 13 17:32:21 UTC 2010 

Author: modax
Date: 2010-02-13 17:32:18 +0000 (Sat, 13 Feb 2010)
New Revision: 16928

Removed:
   trunk/packages/kdelibs/debian/kdelibs-bin.lintian-overrides
   trunk/packages/kdelibs/debian/kdelibs5.lintian-overrides
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs5-dev.install
   trunk/packages/kdelibs/debian/kdelibs5-plugins.install
   trunk/packages/kdelibs/debian/libkdecore5.preinst
   trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
   trunk/packages/kdelibs/debian/rules
Log:
Fixes there and there. Build -0r5.

* Clean up lintian-overrides and add a couple of new ones.
* Make /usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd.sh
  from kdelibs5-data executable.
* Drop obsolete libplasma-dev provides from kdelibs5-dev.
* Move kdewidgets.so and kde3supportwidgets.so to kdelibs5-dev.

I have never thought kde4libs may come close to being lintian clean.
The only warnings which remain are binary-without-manpage ones.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-02-13 17:25:13 UTC (rev 16927)
+++ trunk/packages/kdelibs/debian/changelog	2010-02-13 17:32:18 UTC (rev 16928)
@@ -1,4 +1,4 @@
-kde4libs (4:4.4.0-0r4) UNRELEASED; urgency=low
+kde4libs (4:4.4.0-0r5) UNRELEASED; urgency=low
 
   * New upstream release. The „Kalastria Highborn“ release.
 
@@ -37,6 +37,11 @@
   * Move "unsafe upgrade from KDE << 4.2.2" templates and handling to the
     libkdecore5 package since kdelibs5 is no longer the first package to
     be upgraded.
+  * Clean up lintian-overrides and add a couple of new ones.
+  * Make /usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd.sh
+    from kdelibs5-data executable.
+  * Drop obsolete libplasma-dev provides from kdelibs5-dev.
+  * Move kdewidgets.so and kde3supportwidgets.so to kdelibs5-dev.
 
   [ Kai Wasserbäch ]
   * debian/patches:

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2010-02-13 17:25:13 UTC (rev 16927)
+++ trunk/packages/kdelibs/debian/control	2010-02-13 17:32:18 UTC (rev 16928)
@@ -458,11 +458,9 @@
  ${sameVersionDep:libqt4-dev:kdelibs5-plugins}, ${sameVersionDep:libsoprano-dev:libnepomuk4},
  ${sameVersionDep:libphonon-dev:libkhtml5}
 Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}
-Suggests: kdelibs5-apidocs (= ${source:Version})
 Replaces: kdebase-runtime-data (<< 4:4.2.90), kdelibs5-data (<< 4:4.0.80-1), libplasma-dev (<< 4:4.1.96),
- kdebase-workspace-dev (<< 4:4.4.0)
+ kdebase-workspace-dev (<< 4:4.4.0), kdelibs5 (<< 4:4.4.0)
 Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439), libplasma-dev (<< 4:4.1.96)
-Provides: libplasma-dev
 Description: development files for the KDE Development Platform libraries
  This package contains development files for building KDE Applications and
  other software that uses the KDE Development Platform libraries.

Modified: trunk/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5-dev.install	2010-02-13 17:25:13 UTC (rev 16927)
+++ trunk/packages/kdelibs/debian/kdelibs5-dev.install	2010-02-13 17:32:18 UTC (rev 16928)
@@ -1749,6 +1749,7 @@
 usr/include/threadweaver/WeaverObserver.h
 usr/include/threadweaver/threadweaver_export.h
 usr/lib/kde4/libexec/kauth-policy-gen
+usr/lib/kde4/plugins/designer/kde3supportwidgets.so
 usr/lib/kde4/plugins/script/libkrossqtsplugin.so
 usr/lib/libkde3support.so
 usr/lib/libkdecore.so
@@ -1782,6 +1783,7 @@
 usr/lib/libplasma.so
 usr/lib/libsolid.so
 usr/lib/libthreadweaver.so
+usr/lib/qt4/plugins/designer/kdewidgets.so
 usr/share/dbus-1/interfaces/org.freedesktop.PowerManagement.Inhibit.xml
 usr/share/dbus-1/interfaces/org.freedesktop.PowerManagement.xml
 usr/share/dbus-1/interfaces/org.kde.JobView.xml

Modified: trunk/packages/kdelibs/debian/kdelibs5-plugins.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5-plugins.install	2010-02-13 17:25:13 UTC (rev 16927)
+++ trunk/packages/kdelibs/debian/kdelibs5-plugins.install	2010-02-13 17:32:18 UTC (rev 16928)
@@ -44,7 +44,6 @@
 usr/lib/kde4/libkhtmlpart.so
 usr/lib/kde4/libkmultipart.so
 usr/lib/kde4/notepadpart.so
-usr/lib/kde4/plugins/designer/kde3supportwidgets.so
 usr/lib/kde4/plugins/imageformats/kimg_dds.so
 usr/lib/kde4/plugins/imageformats/kimg_eps.so
 usr/lib/kde4/plugins/imageformats/kimg_exr.so
@@ -61,4 +60,3 @@
 usr/lib/libkdeinit4_kconf_update.so
 usr/lib/libkdeinit4_kio_http_cache_cleaner.so
 usr/lib/libkdeinit4_klauncher.so
-usr/lib/qt4/plugins/designer/kdewidgets.so

Modified: trunk/packages/kdelibs/debian/libkdecore5.preinst
===================================================================
--- trunk/packages/kdelibs/debian/libkdecore5.preinst	2010-02-13 17:25:13 UTC (rev 16927)
+++ trunk/packages/kdelibs/debian/libkdecore5.preinst	2010-02-13 17:32:18 UTC (rev 16928)
@@ -45,11 +45,11 @@
 
 # Check if upgrading from << kdelibs5 4:4.2.2-1
 kdelibs5_ver=`dpkg-query -f='${Version}\n' -W kdelibs5 2>/dev/null`
-if [ "$1" = "install" -a -n "$kdelibs5_ver" -a -e '/usr/lib/libkdecore.so.5' ] &&
+if [ "$1" = "install" -a -n "$kdelibs5_ver" -a -e '/usr/lib/libkdecore.so.5' ] && \
     dpkg --compare-versions "$kdelibs5_ver" lt "4:4.2.2-1"; then
 
     # Are there any KDE 4 applications running?
-    kde4apps=`lib_users '/usr/lib/libkdecore.so.5' 6` || { kde4apps="" }
+    kde4apps=`lib_users '/usr/lib/libkdecore.so.5' 6` || kde4apps=""
     if [ -n "$kde4apps" ]; then
         # Ask whether to stop upgrading
         db_settitle libkdecore5/upgrade_kdehome_running_title
@@ -64,7 +64,7 @@
         # Just display a note about configuration change
         db_settitle libkdecore5/upgrade_kdehome_info_title
         db_fset libkdecore5/upgrade_kdehome_info seen false
-        db_input medium libkdecore5/upgrade_kdehome_info || true
+        db_input ${_prio:-medium} libkdecore5/upgrade_kdehome_info || true
     fi
 
     # If either note was displayed successfully...

Modified: trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff	2010-02-13 17:25:13 UTC (rev 16927)
+++ trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff	2010-02-13 17:32:18 UTC (rev 16928)
@@ -19,3 +19,21 @@
     endif (APPLE)
  endif (UNIX)
  
+--- a/kdewidgets/CMakeLists.txt
++++ b/kdewidgets/CMakeLists.txt
+@@ -51,7 +51,6 @@
+                                    INSTALL_RPATH_USE_LINK_PATH TRUE
+                                    SKIP_BUILD_RPATH TRUE
+                                    BUILD_WITH_INSTALL_RPATH TRUE
+-                                   INSTALL_RPATH ${LIB_INSTALL_DIR}
+                        )
+ endif(NOT WIN32)
+ 
+@@ -86,7 +85,6 @@
+                                    INSTALL_RPATH_USE_LINK_PATH TRUE
+                                    SKIP_BUILD_RPATH TRUE
+                                    BUILD_WITH_INSTALL_RPATH TRUE
+-                                   INSTALL_RPATH ${LIB_INSTALL_DIR}
+                            )
+    endif(NOT WIN32)
+ 

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2010-02-13 17:25:13 UTC (rev 16927)
+++ trunk/packages/kdelibs/debian/rules	2010-02-13 17:32:18 UTC (rev 16928)
@@ -18,7 +18,7 @@
 DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime -xphonon
 
 # Libraries stuff
-DEB_KDE43_LIBRARY_PACKAGES := libkde3support4 libkdecore5 libkdesu5 libkdeui5 libkdnssd4 \
+DEB_KDE43_LIBRARY_PACKAGES := libkdecore5 libkdeui5 libkde3support4 libkdesu5 libkdnssd4 \
     libkfile4 libkhtml5 libkimproxy4 libkio5 libkjsapi4 libkjsembed4 libkmediaplayer4 \
     libknewstuff2-4 libknotifyconfig4 libkntlm4 libkparts4 libkpty4 libkrosscore4 libkrossui4 \
     libktexteditor4 libkutils4 libnepomuk4 libsolid4 libthreadweaver4
@@ -29,5 +29,8 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk
 
+binary-post-install/kdelibs5-data::
+	chmod a+x debian/kdelibs5-data/usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd.sh
+
 #binary-predeb/libplasma3::
 #	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma3.substvars

More information about the pkg-kde-commits mailing list