rev 17312 - trunk/packages/kdebase/debian

Thu Mar 4 00:42:40 UTC 2010

Author: modax
Date: 2010-03-04 00:42:40 +0000 (Thu, 04 Mar 2010)
New Revision: 17312

Added:
   trunk/packages/kdebase/debian/libkonqsidebarplugin-dev.install
   trunk/packages/kdebase/debian/libkonqsidebarplugin4a.install
   trunk/packages/kdebase/debian/libkonqsidebarplugin4a.lintian-overrides
   trunk/packages/kdebase/debian/libkonqsidebarplugin4a.symbols
Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/konqueror.install
   trunk/packages/kdebase/debian/konqueror.lintian-overrides
   trunk/packages/kdebase/debian/not-installed
Log:
Partially revert my previous commit and more changes.

* Rename libkonqsidebarplugin4 to libkonqsidebarplugin4a, it broke API/ABI
  without bumping a soname.
* Rename libkonqsidebarplugin4-dev to libkonqsidebarplugin-dev, adjust its
  dependencies for libkonqsidebarplugin4a.
* Add a symbol file for libkonqsidebarplugin4a: based on 4.4.1 amd64/i386.

Modified: trunk/packages/kdebase/debian/changelog
===================================================================

--- trunk/packages/kdebase/debian/changelog	2010-03-04 00:20:51 UTC (rev 17311)
+++ trunk/packages/kdebase/debian/changelog	2010-03-04 00:42:40 UTC (rev 17312)
@@ -1,4 +1,4 @@
-kdebase (4:4.4.1-0r3) UNRELEASED; urgency=low
+kdebase (4:4.4.1-0r4) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #568776):
     - does no more close the window when entering a new adblock filter and
@@ -22,8 +22,11 @@
   * Bump pkg-kde-tools build dependency to 0.6.4.
   * Add a symbol file for libkonq5: based on 4.3.4, update for 4.4.1 on
     amd64/i386.
-  * Merge libkonqsidebarplugin4 into konqueror package, kill
-    libkonqsidebarplugin4-dev.
+  * Rename libkonqsidebarplugin4 to libkonqsidebarplugin4a, it broke API/ABI
+    without bumping a soname.
+  * Rename libkonqsidebarplugin4-dev to libkonqsidebarplugin-dev, adjust its
+    dependencies for libkonqsidebarplugin4a.
+  * Add a symbol file for libkonqsidebarplugin4a: based on 4.4.1 amd64/i386.
 
   [ George Kiagiadakis ]
   * Refresh patches.

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2010-03-04 00:20:51 UTC (rev 17311)
+++ trunk/packages/kdebase/debian/control	2010-03-04 00:42:40 UTC (rev 17312)
@@ -122,8 +122,7 @@
 Provides: info-browser, man-browser, www-browser
 Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-data (= ${source:Version}),
  kdebase-bin (= ${binary:Version}), install-info
-Conflicts: libkonqsidebarplugin4
-Replaces: dolphin (<< 4:4.1.80), libkonqsidebarplugin4
+Replaces: dolphin (<< 4:4.1.80)
 Suggests: konq-plugins (>= 4:4.1~)
 Recommends: konqueror-nsplugins (= ${binary:Version}), dolphin
 Description: KDE 4's advanced file manager, web browser and document viewer
@@ -210,6 +209,30 @@
  .
  This package is part of the KDE 4 base applications module.
 
+Package: libkonqsidebarplugin4a
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libkonqsidebarplugin4
+Replaces: konqueror (<< 4:4.1.80), libkonqsidebarplugin4
+Description: Konqueror sidebar plugin library
+ This package contains base library for Konqueror sidebar plugins.
+ .
+ This package is part of the KDE 4 base applications module.
+
+Package: libkonqsidebarplugin-dev
+Section: libdevel
+Architecture: any
+Depends: libkonqsidebarplugin4a (= ${binary:Version}),
+ ${sameVersionDep:kdelibs5-dev:libkonqsidebarplugin4a}, ${misc:Depends}
+Replaces: konqueror (<< 4:4.1.80), kdebase-dev
+Conflicts: kdebase-dev
+Description: Konqueror sidebar plugin library development files
+ This package contains development headers for the Konqueror sidebar plugin
+ library.
+ .
+ This package is part of the KDE 4 base applications module.
+
 Package: plasma-widget-folderview
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

Modified: trunk/packages/kdebase/debian/konqueror.install
===================================================================
--- trunk/packages/kdebase/debian/konqueror.install	2010-03-04 00:20:51 UTC (rev 17311)
+++ trunk/packages/kdebase/debian/konqueror.install	2010-03-04 00:42:40 UTC (rev 17312)
@@ -13,8 +13,6 @@
 usr/lib/kde4/konqsidebar_web.so
 usr/lib/libkdeinit4_kfmclient.so
 usr/lib/libkdeinit4_konqueror.so
-usr/lib/libkonqsidebarplugin.so.4
-usr/lib/libkonqsidebarplugin.so.4.4.0
 usr/lib/libkonquerorprivate.so.4
 usr/lib/libkonquerorprivate.so.4.4.0
 usr/share/applications/kde4/Home.desktop

Modified: trunk/packages/kdebase/debian/konqueror.lintian-overrides
===================================================================
--- trunk/packages/kdebase/debian/konqueror.lintian-overrides	2010-03-04 00:20:51 UTC (rev 17311)
+++ trunk/packages/kdebase/debian/konqueror.lintian-overrides	2010-03-04 00:42:40 UTC (rev 17312)
@@ -1 +1 @@
-konqueror: package-name-doesnt-match-sonames libkonqsidebarplugin4 libkonquerorprivate4
+konqueror: package-name-doesnt-match-sonames libkonquerorprivate4

Added: trunk/packages/kdebase/debian/libkonqsidebarplugin-dev.install
===================================================================
--- trunk/packages/kdebase/debian/libkonqsidebarplugin-dev.install	                        (rev 0)
+++ trunk/packages/kdebase/debian/libkonqsidebarplugin-dev.install	2010-03-04 00:42:40 UTC (rev 17312)
@@ -0,0 +1,2 @@
+usr/include/konqsidebarplugin.h
+usr/lib/libkonqsidebarplugin.so

Added: trunk/packages/kdebase/debian/libkonqsidebarplugin4a.install
===================================================================
--- trunk/packages/kdebase/debian/libkonqsidebarplugin4a.install	                        (rev 0)
+++ trunk/packages/kdebase/debian/libkonqsidebarplugin4a.install	2010-03-04 00:42:40 UTC (rev 17312)
@@ -0,0 +1,2 @@
+usr/lib/libkonqsidebarplugin.so.4
+usr/lib/libkonqsidebarplugin.so.4.4.0

Added: trunk/packages/kdebase/debian/libkonqsidebarplugin4a.lintian-overrides
===================================================================
--- trunk/packages/kdebase/debian/libkonqsidebarplugin4a.lintian-overrides	                        (rev 0)
+++ trunk/packages/kdebase/debian/libkonqsidebarplugin4a.lintian-overrides	2010-03-04 00:42:40 UTC (rev 17312)
@@ -0,0 +1 @@
+libkonqsidebarplugin4a: package-name-doesnt-match-sonames libkonqsidebarplugin4

Added: trunk/packages/kdebase/debian/libkonqsidebarplugin4a.symbols
===================================================================
--- trunk/packages/kdebase/debian/libkonqsidebarplugin4a.symbols	                        (rev 0)
+++ trunk/packages/kdebase/debian/libkonqsidebarplugin4a.symbols	2010-03-04 00:42:40 UTC (rev 17312)
@@ -0,0 +1,44 @@
+# SymbolsHelper-Confirmed: 4:4.4.1 amd64 i386
+libkonqsidebarplugin.so.4 libkonqsidebarplugin4a #MINVER#
+ _ZN17KonqSidebarModule10enableCopyEb at Base 4:4.4.1
+ _ZN17KonqSidebarModule10setCaptionERK7QString at Base 4:4.4.1
+ _ZN17KonqSidebarModule11configGroupEv at Base 4:4.4.1
+ _ZN17KonqSidebarModule11enablePasteEb at Base 4:4.4.1
+ _ZN17KonqSidebarModule11openPreviewERK13KFileItemList at Base 4:4.4.1
+ _ZN17KonqSidebarModule11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.4.1
+ _ZN17KonqSidebarModule11qt_metacastEPKc at Base 4:4.4.1
+ _ZN17KonqSidebarModule12enableActionEPS_PKcb at Base 4:4.4.1
+ _ZN17KonqSidebarModule13handlePreviewERK13KFileItemList at Base 4:4.4.1
+ _ZN17KonqSidebarModule13showPopupMenuERK6QPointRK13KFileItemListRKN6KParts16OpenUrlArgumentsERKNS6_16BrowserArgumentsE6QFlagsINS6_16BrowserExtension9PopupFlagEERK4QMapI7QString5QListIP7QActionEE at Base 4:4.4.1
+ _ZN17KonqSidebarModule14openUrlRequestERK4KUrlRKN6KParts16OpenUrlArgumentsERKNS3_16BrowserArgumentsE at Base 4:4.4.1
+ _ZN17KonqSidebarModule15createNewWindowERK4KUrlRKN6KParts16OpenUrlArgumentsERKNS3_16BrowserArgumentsERKNS3_10WindowArgsE at Base 4:4.4.1
+ _ZN17KonqSidebarModule16staticMetaObjectE at Base 4:4.4.1
+ _ZN17KonqSidebarModule17submitFormRequestEPKcRK7QStringRK10QByteArrayS4_S4_S4_ at Base 4:4.4.1
+ _ZN17KonqSidebarModule22openPreviewOnMouseOverERK9KFileItem at Base 4:4.4.1
+ _ZN17KonqSidebarModule24handlePreviewOnMouseOverERK9KFileItem at Base 4:4.4.1
+ _ZN17KonqSidebarModule7openUrlERK4KUrl at Base 4:4.4.1
+ _ZN17KonqSidebarModule7setIconERK7QString at Base 4:4.4.1
+ _ZN17KonqSidebarModule7startedEPN3KIO3JobE at Base 4:4.4.1
+ _ZN17KonqSidebarModule9completedEv at Base 4:4.4.1
+ _ZN17KonqSidebarModule9enableCutEb at Base 4:4.4.1
+ _ZN17KonqSidebarModule9popupMenuEPS_RK6QPointRK13KFileItemListRKN6KParts16OpenUrlArgumentsERKNS7_16BrowserArgumentsE6QFlagsINS7_16BrowserExtension9PopupFlagEERK4QMapI7QString5QListIP7QActionEE at Base 4:4.4.1
+ _ZN17KonqSidebarModuleC1ERK14KComponentDataP7QObjectRK12KConfigGroup at Base 4:4.4.1
+ _ZN17KonqSidebarModuleC2ERK14KComponentDataP7QObjectRK12KConfigGroup at Base 4:4.4.1
+ _ZN17KonqSidebarModuleD0Ev at Base 4:4.4.1
+ _ZN17KonqSidebarModuleD1Ev at Base 4:4.4.1
+ _ZN17KonqSidebarModuleD2Ev at Base 4:4.4.1
+ _ZN17KonqSidebarPlugin11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.4.1
+ _ZN17KonqSidebarPlugin11qt_metacastEPKc at Base 4:4.4.1
+ _ZN17KonqSidebarPlugin16staticMetaObjectE at Base 4:4.4.1
+ _ZNK17KonqSidebarModule10metaObjectEv at Base 4:4.4.1
+ _ZNK17KonqSidebarModule12isCutEnabledEv at Base 4:4.4.1
+ _ZNK17KonqSidebarModule13isCopyEnabledEv at Base 4:4.4.1
+ _ZNK17KonqSidebarModule14isPasteEnabledEv at Base 4:4.4.1
+ _ZNK17KonqSidebarModule19parentComponentDataEv at Base 4:4.4.1
+ _ZNK17KonqSidebarPlugin10metaObjectEv at Base 4:4.4.1
+ _ZTI17KonqSidebarModule at Base 4:4.4.1
+ _ZTI17KonqSidebarPlugin at Base 4:4.4.1
+ _ZTS17KonqSidebarModule at Base 4:4.4.1
+ _ZTS17KonqSidebarPlugin at Base 4:4.4.1
+ _ZTV17KonqSidebarModule at Base 4:4.4.1
+ _ZTV17KonqSidebarPlugin at Base 4:4.4.1

Modified: trunk/packages/kdebase/debian/not-installed
===================================================================
--- trunk/packages/kdebase/debian/not-installed	2010-03-04 00:20:51 UTC (rev 17311)
+++ trunk/packages/kdebase/debian/not-installed	2010-03-04 00:42:40 UTC (rev 17312)
@@ -11,6 +11,3 @@
 ./usr/share/dbus-1/interfaces/org.kde.nsplugins.instance.xml
 ./usr/share/dbus-1/interfaces/org.kde.nsplugins.viewer.xml
 
-# Former libkonqsidebarplugin4-dev, unstable ABI
-./usr/include/konqsidebarplugin.h
-./usr/lib/libkonqsidebarplugin.so


