rev 18082 - trunk/packages/kdeplasma-addons/debian

[Modestas Vainius]

Author: modax
Date: 2010-05-26 20:48:16 +0000 (Wed, 26 May 2010)
New Revision: 18082

Added:
   trunk/packages/kdeplasma-addons/debian/plasma-widget-lancelot.lintian-overrides
Removed:
   trunk/packages/kdeplasma-addons/debian/liblancelot-dev.install
   trunk/packages/kdeplasma-addons/debian/liblancelot0a.install
   trunk/packages/kdeplasma-addons/debian/liblancelot0a.lintian-overrides
   trunk/packages/kdeplasma-addons/debian/liblancelot0a.symbols
Modified:
   trunk/packages/kdeplasma-addons/debian/changelog
   trunk/packages/kdeplasma-addons/debian/control
   trunk/packages/kdeplasma-addons/debian/not-installed
   trunk/packages/kdeplasma-addons/debian/plasma-widget-lancelot.install
Log:
* Drop liblancelot-dev (popcon 7). Clearly not worth it.
* Merge liblancelot0 into plasma-widget-lancelot. liblancelot.so.0 broke ABI
  without bumping a soname in KDE SC 4.5 again.

Modified: trunk/packages/kdeplasma-addons/debian/changelog
===================================================================
--- trunk/packages/kdeplasma-addons/debian/changelog	2010-05-25 22:31:41 UTC (rev 18081)
+++ trunk/packages/kdeplasma-addons/debian/changelog	2010-05-26 20:48:16 UTC (rev 18082)
@@ -1,3 +1,11 @@
+kdeplasma-addons (4:4.4.3-2) UNRELEASED; urgency=low
+
+  * Drop liblancelot-dev (popcon 7). Clearly not worth it.
+  * Merge liblancelot0 into plasma-widget-lancelot. liblancelot.so.0 broke ABI
+    without bumping a soname in KDE SC 4.5 again.
+
+ -- Modestas Vainius <modax at debian.org>  Wed, 26 May 2010 23:39:25 +0300
+
 kdeplasma-addons (4:4.4.3-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/packages/kdeplasma-addons/debian/control
===================================================================
--- trunk/packages/kdeplasma-addons/debian/control	2010-05-25 22:31:41 UTC (rev 18081)
+++ trunk/packages/kdeplasma-addons/debian/control	2010-05-26 20:48:16 UTC (rev 18082)
@@ -85,8 +85,10 @@
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applet-lancelot
-Conflicts: kdeplasma-addons-data, plasma-applet-lancelot
+Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applet-lancelot,
+ deplasma-addons-libs4, liblancelot0, liblancelot0a
+Conflicts: kdeplasma-addons-data, plasma-applet-lancelot, kdeplasma-addons-libs4,
+ liblancelot0, liblancelot0a
 Description: addons for KDE 4 Plasma - lancelot widget
  Lancelot is an application launcher menu (or ALI) for KDE 4 designed to
  provide a place from which all your jobs begin. It provides quick access
@@ -94,25 +96,6 @@
  .
  This package is part of the KDE 4 plasma addons module.
 
-Package: liblancelot0a
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons-libs4, liblancelot0, liblancelot0-api
-Conflicts: kdeplasma-addons-libs4, liblancelot0, liblancelot0-api
-Provides: liblancelot0-api
-Description: library that contains all UI widgets and layouts used in the Lancelot project
- Liblancelot is a base framework for everything in the world of Lancelot.
- It is built on top of Plasma. It provides a set of custom widgets, layouts
- and has a few more advanced concepts for allowing for quicker development
- of Plasma-based applications.
- .
- Lancelot is an application launcher menu (or ALI) for KDE 4 designed to
- provide a place from which all your jobs begin. It provides quick access
- to applications, places, documents, contacts and system information.
- .
- This package is part of the KDE 4 plasma addons module.
-
 Package: liblancelot-dev
 Architecture: any
 Section: libdevel

Modified: trunk/packages/kdeplasma-addons/debian/not-installed
===================================================================
--- trunk/packages/kdeplasma-addons/debian/not-installed	2010-05-25 22:31:41 UTC (rev 18081)
+++ trunk/packages/kdeplasma-addons/debian/not-installed	2010-05-26 20:48:16 UTC (rev 18082)
@@ -5,3 +5,28 @@
 ./usr/lib/librtm.so
 ./usr/lib/libkimpanelruntime.so
 ./usr/share/dbus-1/interfaces/org.kde.impanel.xml
+
+# lancelot-dev stuff. Do not ship
+./usr/include/lancelot/Global.h
+./usr/include/lancelot/lancelot.h
+./usr/include/lancelot/lancelot_export.h
+./usr/include/lancelot/layouts/CardLayout.h
+./usr/include/lancelot/layouts/ColumnLayout.h
+./usr/include/lancelot/models/ActionListModel.h
+./usr/include/lancelot/models/ActionTreeModel.h
+./usr/include/lancelot/models/ActionTreeModelProxy.h
+./usr/include/lancelot/models/MergedActionListModel.h
+./usr/include/lancelot/models/PlasmaServiceListModel.h
+./usr/include/lancelot/models/StandardActionListModel.h
+./usr/include/lancelot/models/StandardActionTreeModel.h
+./usr/include/lancelot/widgets/ActionListView.h
+./usr/include/lancelot/widgets/BasicWidget.h
+./usr/include/lancelot/widgets/ExtenderButton.h
+./usr/include/lancelot/widgets/HoverIcon.h
+./usr/include/lancelot/widgets/Panel.h
+./usr/include/lancelot/widgets/PassagewayView.h
+./usr/include/lancelot/widgets/PopupList.h
+./usr/include/lancelot/widgets/PopupMenu.h
+./usr/include/lancelot/widgets/ResizeBordersPanel.h
+./usr/include/lancelot/widgets/Widget.h
+./usr/lib/liblancelot.so

Modified: trunk/packages/kdeplasma-addons/debian/plasma-widget-lancelot.install
===================================================================
--- trunk/packages/kdeplasma-addons/debian/plasma-widget-lancelot.install	2010-05-25 22:31:41 UTC (rev 18081)
+++ trunk/packages/kdeplasma-addons/debian/plasma-widget-lancelot.install	2010-05-26 20:48:16 UTC (rev 18082)
@@ -1,6 +1,8 @@
 usr/bin/lancelot
 usr/lib/kde4/plasma_applet_lancelot_launcher.so
 usr/lib/kde4/plasma_applet_lancelot_part.so
+usr/lib/liblancelot.so.0
+usr/lib/liblancelot.so.1.7.0
 usr/share/dbus-1/services/org.kde.lancelot.service
 usr/share/icons/hicolor/128x128/apps/lancelot-part.png
 usr/share/icons/hicolor/128x128/apps/lancelot.png

Added: trunk/packages/kdeplasma-addons/debian/plasma-widget-lancelot.lintian-overrides
===================================================================
--- trunk/packages/kdeplasma-addons/debian/plasma-widget-lancelot.lintian-overrides	                        (rev 0)
+++ trunk/packages/kdeplasma-addons/debian/plasma-widget-lancelot.lintian-overrides	2010-05-26 20:48:16 UTC (rev 18082)
@@ -0,0 +1 @@
+plasma-widget-lancelot: package-name-doesnt-match-sonames liblancelot0