[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

Maximiliano Curia maxy at moszumanska.debian.org
Fri Aug 1 09:05:21 UTC 2014 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=eef18be

The following commit has been merged in the master branch:
commit eef18be93a72378f36e1e607022413a987dc6d90
Author: Alessandro Ghersi <alessandro-ghersi at kubuntu.org>
Date:   Sun Oct 17 07:34:21 2010 +0200

    kdeplasma-addons (4:4.5.2-1ubuntu1) UNRELEASED; urgency=low
    
      [ Alessandro Ghersi ]
      * Merge with Debian git remaining changes:
        - Keep our patch
        - Add debian/xinput folder
        - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
          plasma-widget-kimpanel-backend-ibus
        - Keep plasma-widget-kimpanel-backend-scim package commented
        - Keep rules to install plasma-widget-kimpanel-backend-ibus
        - Keep plasma-widget-kimpanel-backend-ibus.{postinst, prerm}
        - Don't install kimpanel in plasma-widget-addons
        - Build against libboost1.42-dev
        - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
          kdewallpapers, kdebase-workspace-wallpapers
        - plasma-widget-addons suggests plasma-widget-lancelot instead of
          recommends
        - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
          plasma-widget-addons (<< 4:4.4.60)
    
      [ Jonathan Riddell ]
      * New upstream release
       - kubuntu_01_fix_plasma_crash_when_editing_activity.diff
       - kubuntu_05_fix_exif_rotation.diff
       - kubuntu_06_fix_weatherlocation.diff
       - kubuntu_07_lancelot_fixes.diff
       - kubuntu_08_fix_comic_widget.diff
       - kubuntu_09_personservice_ptr.diff
---
 debian/README.source                            |  6 --
 debian/changelog                                | 80 ++++++++++++++++++++++++-
 debian/control                                  | 53 ++++++++--------
 debian/not-installed                            | 53 ++++++++--------
 debian/plasma-runners-addons.install            |  4 +-
 debian/plasma-widget-lancelot.install           | 17 +++---
 debian/plasma-widget-lancelot.lintian-overrides |  1 +
 debian/source/lintian-overrides                 |  1 -
 8 files changed, 145 insertions(+), 70 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 2a0f246..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package uses quilt for upstream source code patch management. Please read
-/usr/share/doc/quilt/README.source for more information how to apply, unapply,
-add, modify or remove patches.
-
-Please note that /usr/share/doc/quilt/README.source is only available in quilt
-version 0.46-4.1 or later.
diff --git a/debian/changelog b/debian/changelog
index 4b28cd4..1d0a7ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,24 @@
-kdeplasma-addons (4:4.5.2-0ubuntu1) maverick; urgency=low
+kdeplasma-addons (4:4.5.2-1ubuntu1) UNRELEASED; urgency=low
 
+  [ Alessandro Ghersi ]
+  * Merge with Debian git remaining changes:
+    - Keep our patch
+    - Add debian/xinput folder
+    - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
+      plasma-widget-kimpanel-backend-ibus
+    - Keep plasma-widget-kimpanel-backend-scim package commented
+    - Keep rules to install plasma-widget-kimpanel-backend-ibus
+    - Keep plasma-widget-kimpanel-backend-ibus.{postinst, prerm}
+    - Don't install kimpanel in plasma-widget-addons
+    - Build against libboost1.42-dev
+    - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
+      kdewallpapers, kdebase-workspace-wallpapers
+    - plasma-widget-addons suggests plasma-widget-lancelot instead of
+      recommends
+    - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
+      plasma-widget-addons (<< 4:4.4.60)
+
+  [ Jonathan Riddell ]
   * New upstream release
    - kubuntu_01_fix_plasma_crash_when_editing_activity.diff
    - kubuntu_05_fix_exif_rotation.diff
@@ -8,7 +27,29 @@ kdeplasma-addons (4:4.5.2-0ubuntu1) maverick; urgency=low
    - kubuntu_08_fix_comic_widget.diff
    - kubuntu_09_personservice_ptr.diff
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 05 Oct 2010 00:09:38 +0000
+ -- Alessandro Ghersi <alessandro-ghersi at kubuntu.org>  Sun, 17 Oct 2010 07:29:38 +0200
+
+kdeplasma-addons (4:4.5.1-0r2) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * Point debian/control Vcs fields to the new Git repository.
+
+  [ Pino Toscano ]
+  * Fix typo in description of plasma-widget-lancelot. (Closes: #591216)
+
+  [ George Kiagiadakis ]
+  * Change my email address in uploaders.
+  * Bump kdelibs5-dev, kdepimlibs5-dev, kdebase-workspace-dev
+    and libmarble-dev build dependencies to version 4.5.
+  * Update installed files.
+  * Remove build dependency on libxml2-dev, not needed anymore.
+  * Update lintian overrides.
+  * Drop replaces/conflicts against liblancelot0/0a from
+    plasma-widget-lancelot, as they no longer have any common files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Aug 2010 23:04:29 +0200
 
 kdeplasma-addons (4:4.5.1-0ubuntu4) maverick; urgency=low
 
@@ -132,6 +173,41 @@ kdeplasma-addons (4:4.4.80-0ubuntu1) maverick; urgency=low
 
  -- Jonathan Thomas <echidnaman at kubuntu.org>  Tue, 25 May 2010 09:50:14 -0400
 
+kdeplasma-addons (4:4.4.5-1) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * New upstream release.
+  * Bump kde-sc-dev-latest build dependency to 4:4.4.5.
+
+  [ Sune Vuorela ]
+  * Update descriptions
+  * Update email address
+  * Add qca2 to build deps
+
+ -- Sune Vuorela <sune at debian.org>  Sun, 18 Jul 2010 13:41:40 +0200
+
+kdeplasma-addons (4:4.4.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * 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.
+  * Bump pkg-kde-tools build dependency to (>= 0.9) for HTML_INSTALL_DIR
+    switch and 3.0 (quilt) source format support.
+  * Switch to 3.0 (quilt) source package format and original tar.bz2
+    tarballs.
+  * Drop quilt from Build-Depends, no longer needed for 3.0 (quilt).
+  * Remove debian/README.source. Patch support is part of source format
+    now.
+  * Drop debian/source/lintian-overrides, quilt-build-dep-but-no-series-file no
+    longer relevant.
+  * Bump kde-sc-dev-latest build dependency to 4:4.4.4.
+  * Update install files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 01 Jun 2010 01:15:18 +0300
+
 kdeplasma-addons (4:4.4.3-1ubuntu4) maverick; urgency=low
 
   * Add missing build-deps on shared-mime-info and libglib2.0-dev
diff --git a/debian/control b/debian/control
index 74351c0..a612925 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: utils
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
- Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
+Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
+ Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>
 Build-Depends: kde-sc-dev-latest (>= 4:4.4.92),
- cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), quilt, pkg-kde-tools (>= 0.6.4),
+ cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.9),
  kdelibs5-dev (>= 4:4.5), kdepimlibs5-dev (>= 4:4.5), kdebase-workspace-dev (>= 4:4.5),
  libqt4-opengl-dev, libboost1.42-dev, libkexiv2-dev (>= 4:4.5), python, libmarble-dev (>= 4:4.5),
  libqimageblitz-dev, libeigen2-dev, libxrender-dev, shared-desktop-ontologies, libattica-dev,
- libxtst-dev, libqalculate-dev, libxml2-dev, libqwt5-qt4-dev, shared-mime-info, libglib2.0-dev, libqca2-dev
+ libxtst-dev, libqalculate-dev, libqwt5-qt4-dev, shared-mime-info, libglib2.0-dev, libqca2-dev
 #libscim-dev
 Standards-Version: 3.8.4
 Homepage: http://plasma.kde.org/
@@ -24,10 +24,10 @@ Depends: ${misc:Depends}, plasma-widgets-addons (>= ${source:Version}),
  plasma-runners-addons (>= ${source:Version}),
  plasma-widget-lancelot (>= ${source:Version}),
  plasma-wallpapers-addons (>= ${source:Version})
-Description: addons for KDE 4 Plasma - metapackage
+Description: addons for Plasma
  The KDE Plasma addons module is a collection of additional Plasma
  data engines, widgets and krunner plugins. It is part of
- the official KDE 4 distribution.
+ the official KDE distribution.
  .
  This package is a metapackage that installs all the widgets, data
  engines and krunner plugins from the KDE Plasma addons module.
@@ -40,36 +40,37 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
 Suggests: plasma-widget-lancelot
 Replaces: plasma-widget-system-status
 Breaks: plasma-widget-system-status
-Description: addons for KDE 4 Plasma - widgets
- This package contains additional Plasma widgets shipped in the KDE 4 plasma
- addons module. Install it if you want a variety of widgets on your plasma
+Description: additional widgets for Plasma
+ This package contains additional Plasma widgets shipped in the Plasma
+ addons module. Install it if you want a variety of widgets on your Plasma
  desktop.
  .
- This package is part of the KDE 4 plasma addons module.
+ This package is part of the KDE Plasma addons module.
 
 Package: plasma-dataengines-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdeplasma-addons (<< 4:4.4.60), plasma-widget-addons (<< 4:4.4.60)
-Description: addons for KDE 4 Plasma - data engines
- This package contains additional Plasma data engines shipped in KDE 4 plasma
- addons module. These engines are needed by some KDE 4 plasma addons
+Description: additional data engines for Plasma
+ This package contains additional Plasma data engines shipped in Plasma
+ addons module. These engines are needed by some plasma widgets
  Plasma widgets, but they may be useful for any other Plasma widget too.
  .
- This package is part of the KDE 4 Plasma addons module.
+ This package is part of the KDE Plasma addons module.
 
 Package: plasma-runners-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1)
-Description: addons for KDE 4 Plasma - krunner plugins
- This package contains additional plasma runners that are used in krunner
- (the "run command" dialog of KDE 4) to reveal special search results.
+Conflicts: kdeplasma-addons-data, kdeplasma-addons-libs4
+Description: additional runners for Plasma and Krunner
+ This package contains additional Plasma runners that are used in krunner
+ (the "run command" dialog of Plasma) to reveal special search results.
  If you use krunner a lot, you will probably like this package.
  .
- This package is part of the KDE 4 Plasma addons module.
+ This package is part of the KDE Plasma addons module.
 
 Package: plasma-wallpapers-addons
 Architecture: any
@@ -77,22 +78,22 @@ Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
  plasma-dataengines-addons (= ${binary:Version}), kdewallpapers,
  kdebase-workspace-wallpapers
-Description: addons for KDE 4 Plasma - wallpaper plugins
- This package contains additional plasma wallpaper plugins that are used in 
- the plasma desktop to give marble, mandelbrot and other such wallpapers.
- This package is part of the KDE 4 Plasma addons module.
+Description: additional wallpaper plugins for Plasma
+ This package contains additional Plasma wallpaper plugins that are used in 
+ the Plasma desktop to give marble, mandelbrot and other such wallpapers.
+ This package is part of the KDE Plasma addons module.
 
 Package: plasma-widget-lancelot
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), liblancelot0a, liblancelot0
-Description: addons for KDE 4 Plasma - lancelot widget
- Lancelot is an application launcher menu (or ALI) for KDE 4 designed to
+Description: lancelot widget for Plasma
+ Lancelot is an application launcher menu (or ALI) for Plasma 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.
+ This package is part of the KDE Plasma addons module.
 
 Package: plasma-widget-kimpanel
 Architecture: any
@@ -138,6 +139,8 @@ Package: kdeplasma-addons-dbg
 Section: debug
 Architecture: any
 Priority: extra
+Conflicts: kdeplasmoid-dbg
+Replaces: kdeplasmoid-dbg
 Depends: ${misc:Depends}, plasma-widgets-addons (= ${binary:Version}), plasma-dataengines-addons (= ${binary:Version}),
  plasma-runners-addons (= ${binary:Version}), plasma-widget-lancelot (= ${binary:Version}),
  plasma-wallpapers-addons (= ${binary:Version}), kdebase-workspace-dbg
diff --git a/debian/not-installed b/debian/not-installed
index 886da21..3f38ee2 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,9 +3,33 @@
 ./usr/lib/libplasmapotdprovidercore.so
 ./usr/lib/libplasmaweather.so
 ./usr/lib/librtm.so
-./usr/lib/liblancelot.so
+./usr/lib/libkimpanelruntime.so
+./usr/share/dbus-1/interfaces/org.kde.impanel.xml
 
-#Liblancelot broke ABI without an .so version bump, so we aren't shipping -dev
+# 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
 ./usr/include/KDE/Lancelot/ActionListModel
 ./usr/include/KDE/Lancelot/ActionListView
 ./usr/include/KDE/Lancelot/ActionTreeModel
@@ -74,31 +98,10 @@
 ./usr/include/lancelot-datamodels/SystemActions.h
 ./usr/include/lancelot-datamodels/SystemServices.h
 ./usr/include/lancelot-datamodels/XbelModel.h
-./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/layouts/FlipLayout.h
 ./usr/include/lancelot/layouts/FullBorderLayout.h
 ./usr/include/lancelot/layouts/NodeLayout.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/TabBar.h
-./usr/include/lancelot/widgets/Widget.h
-./usr/share/kde4/apps/cmake/modules/FindLancelot-Datamodels.cmake
+./usr/lib/liblancelot-datamodels.so
 ./usr/share/kde4/apps/cmake/modules/FindLancelot.cmake
+./usr/share/kde4/apps/cmake/modules/FindLancelot-Datamodels.cmake
diff --git a/debian/plasma-runners-addons.install b/debian/plasma-runners-addons.install
index 8e5861f..0f040d3 100644
--- a/debian/plasma-runners-addons.install
+++ b/debian/plasma-runners-addons.install
@@ -13,12 +13,12 @@ usr/lib/kde4/krunner_kopete.so
 usr/lib/kde4/krunner_mediawiki.so
 usr/lib/kde4/krunner_spellcheckrunner.so
 usr/lib/kde4/plasma_runner_datetime.so
+usr/share/kde4/services/CharRunner_config.desktop
+usr/share/kde4/services/CharacterRunner.desktop
 usr/share/kde4/services/browserhistory.desktop
 usr/share/kde4/services/katesessions.desktop
 usr/share/kde4/services/konquerorsessions.desktop
 usr/share/kde4/services/konsolesessions.desktop
-usr/share/kde4/services/CharRunner_config.desktop
-usr/share/kde4/services/CharacterRunner.desktop
 usr/share/kde4/services/plasma-runner-audioplayercontrol.desktop
 usr/share/kde4/services/plasma-runner-audioplayercontrol_config.desktop
 usr/share/kde4/services/plasma-runner-contacts.desktop
diff --git a/debian/plasma-widget-lancelot.install b/debian/plasma-widget-lancelot.install
index 256d5b1..bbbb7c9 100644
--- a/debian/plasma-widget-lancelot.install
+++ b/debian/plasma-widget-lancelot.install
@@ -1,29 +1,28 @@
 usr/bin/lancelot
 usr/lib/kde4/plasma_applet_lancelot_launcher.so
 usr/lib/kde4/plasma_applet_lancelot_part.so
-usr/lib/liblancelot.so.1
-usr/lib/liblancelot.so.1.9.0
 usr/lib/liblancelot-datamodels.so
-usr/lib/liblancelot-datamodels.so.0
 usr/lib/liblancelot-datamodels.so.1.7.0
+usr/lib/liblancelot.so.1
+usr/lib/liblancelot.so.1.9.0
 usr/share/dbus-1/services/org.kde.lancelot.service
-usr/share/icons/hicolor/128x128/apps/lancelot.png
 usr/share/icons/hicolor/128x128/apps/lancelot-start.png
+usr/share/icons/hicolor/128x128/apps/lancelot.png
 usr/share/icons/hicolor/128x128/apps/plasmaapplet-shelf.png
-usr/share/icons/hicolor/16x16/apps/lancelot.png
 usr/share/icons/hicolor/16x16/apps/lancelot-start.png
+usr/share/icons/hicolor/16x16/apps/lancelot.png
 usr/share/icons/hicolor/16x16/apps/plasmaapplet-shelf.png
-usr/share/icons/hicolor/22x22/apps/lancelot.png
 usr/share/icons/hicolor/22x22/apps/lancelot-start.png
+usr/share/icons/hicolor/22x22/apps/lancelot.png
 usr/share/icons/hicolor/22x22/apps/plasmaapplet-shelf.png
-usr/share/icons/hicolor/32x32/apps/lancelot.png
 usr/share/icons/hicolor/32x32/apps/lancelot-start.png
+usr/share/icons/hicolor/32x32/apps/lancelot.png
 usr/share/icons/hicolor/32x32/apps/plasmaapplet-shelf.png
-usr/share/icons/hicolor/48x48/apps/lancelot.png
 usr/share/icons/hicolor/48x48/apps/lancelot-start.png
+usr/share/icons/hicolor/48x48/apps/lancelot.png
 usr/share/icons/hicolor/48x48/apps/plasmaapplet-shelf.png
-usr/share/icons/hicolor/64x64/apps/lancelot.png
 usr/share/icons/hicolor/64x64/apps/lancelot-start.png
+usr/share/icons/hicolor/64x64/apps/lancelot.png
 usr/share/icons/hicolor/64x64/apps/plasmaapplet-shelf.png
 usr/share/kde4/apps/desktoptheme/Aya/lancelot/action-list-view-headers.svgz
 usr/share/kde4/apps/desktoptheme/Aya/lancelot/category-triangle.svgz
diff --git a/debian/plasma-widget-lancelot.lintian-overrides b/debian/plasma-widget-lancelot.lintian-overrides
new file mode 100644
index 0000000..0a6795c
--- /dev/null
+++ b/debian/plasma-widget-lancelot.lintian-overrides
@@ -0,0 +1 @@
+plasma-widget-lancelot: package-name-doesnt-match-sonames liblancelot-datamodels0 liblancelot1
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 1bcab5c..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kdeplasma-addons source: quilt-build-dep-but-no-series-file

-- 
KDE Plasma Addons module packaging

More information about the pkg-kde-commits mailing list