[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:28 UTC 2014 

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

The following commit has been merged in the master branch:
commit 582c85603351c9a20b35d00196a222d0444e7cbf
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Tue Dec 20 23:39:21 2011 +0000

    4.7.90 packaging
---
 debian/.gitattributes                              |  1 -
 debian/changelog                                   | 10 ++++++++
 debian/control                                     | 19 +++++++--------
 .../patches/kubuntu_04_kimpanel_disable_scim.diff  | 27 ----------------------
 debian/patches/series                              |  1 -
 debian/plasma-containments-addons.install          |  2 +-
 debian/plasma-dataengines-addons.install           |  7 ++++--
 debian/plasma-wallpapers-addons.install            |  2 ++
 debian/plasma-widget-kimpanel.install              |  2 --
 debian/plasma-widgets-addons.install               |  8 +++++++
 debian/rules                                       | 10 ++++----
 debian/source/local-options                        |  1 -
 12 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index c68f3c7..74d7c47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kdeplasma-addons (4:4.7.90-0ubuntu1) precise; urgency=low
+
+  * new upstream beta release
+  * Remove kubuntu_04_kimpanel_disable_scim.diff now scim applet has gone
+  * Remove ibus bits from debian/rules
+  * Remove kimpanel packages
+  * Add build-dep on libdbusmenu-qt-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 15 Dec 2011 14:17:52 +0000
+
 kdeplasma-addons (4:4.7.3-0ubuntu3) precise; urgency=low
 
   * Add build-dep on shared-mime-info, also needed
diff --git a/debian/control b/debian/control
index db4a43c..17cc99c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
  libkexiv2-dev (>= 4:4.7), libmarble-dev (>= 4:4.7),
  libqt4-opengl-dev, libboost1.46-dev, libqimageblitz-dev, libeigen2-dev, libxrender-dev,
  shared-desktop-ontologies, libattica-dev, libxtst-dev, libqalculate-dev,
- libqca2-dev, libqtwebkit-dev, libqwt-dev, libglib2.0-dev, shared-mime-info
+ libqca2-dev, libqtwebkit-dev, libqwt-dev, libglib2.0-dev, shared-mime-info,
+ libdbusmenu-qt-dev
 Standards-Version: 3.9.2
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kdeplasma-addons/ubuntu
@@ -121,14 +122,14 @@ Description: addons for KDE 4 Plasma - universal input method widget
  .
  This package is part of the KDE plasma addons module.
 
-Package: plasma-widget-kimpanel-backend-ibus
-Architecture: all
-Section: kde
-Depends: ${shlibs:Depends}, ibus-qt4, python
-Description: addons for KDE 4 Plasma - universal input method widget
- Kimpanel is a a Plasma widget for the ibus input method.
- .
- This package contains the ibus backend for kimpanel.
+#Package: plasma-widget-kimpanel-backend-ibus
+#Architecture: all
+#Section: kde
+#Depends: ${shlibs:Depends}, ibus-qt4, python
+#Description: addons for KDE 4 Plasma - universal input method widget
+# Kimpanel is a a Plasma widget for the ibus input method.
+# .
+# This package contains the ibus backend for kimpanel.
 
 Package: plasma-widget-kdeobservatory
 Architecture: any
diff --git a/debian/patches/kubuntu_04_kimpanel_disable_scim.diff b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
deleted file mode 100644
index 4d6c9f2..0000000
--- a/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: kdeplasma-addons-4.7.1/applets/CMakeLists.txt
-===================================================================
---- kdeplasma-addons-4.7.1.orig/applets/CMakeLists.txt	2011-05-20 22:37:49.000000000 +0200
-+++ kdeplasma-addons-4.7.1/applets/CMakeLists.txt	2011-09-04 11:29:14.000000000 +0200
-@@ -87,11 +87,11 @@
- if (Q_WS_X11)
-    if (X11_Xrender_FOUND)
-       set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/kimpanel/cmake)
--      macro_optional_find_package(SCIM)
--      macro_log_feature(SCIM_FOUND "SCIM headers" "Multibyte input widget" "http://www.scim-im.org" FALSE "1.4" "Needed for the kimpanel multibyte input Plasmoid")
--      if (SCIM_FOUND)
-+#      macro_optional_find_package(SCIM)
-+#      macro_log_feature(SCIM_FOUND "SCIM headers" "Multibyte input widget" "http://www.scim-im.org" FALSE "1.4" "Needed for the kimpanel multibyte input Plasmoid")
-+#      if (SCIM_FOUND)
-          add_subdirectory(kimpanel)
--      endif ( SCIM_FOUND)
-+#      endif ( SCIM_FOUND)
-    endif (X11_Xrender_FOUND)
- endif (Q_WS_X11)
- 
-Index: kdeplasma-addons-4.7.1/applets/kimpanel/backend/CMakeLists.txt
-===================================================================
---- kdeplasma-addons-4.7.1.orig/applets/kimpanel/backend/CMakeLists.txt	2011-05-20 22:37:49.000000000 +0200
-+++ kdeplasma-addons-4.7.1/applets/kimpanel/backend/CMakeLists.txt	2011-09-04 11:29:14.000000000 +0200
-@@ -1 +1 @@
--macro_optional_add_subdirectory(scim)
-+#macro_optional_add_subdirectory(scim)
diff --git a/debian/patches/series b/debian/patches/series
index fc93edc..28f7671 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-kubuntu_04_kimpanel_disable_scim.diff
 #kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
diff --git a/debian/plasma-containments-addons.install b/debian/plasma-containments-addons.install
index 69cc469..e97fbcb 100644
--- a/debian/plasma-containments-addons.install
+++ b/debian/plasma-containments-addons.install
@@ -2,7 +2,7 @@ usr/lib/kde4/plasma_containment_griddesktop.so
 usr/lib/kde4/plasma_containment_groupingdesktop.so
 usr/lib/kde4/plasma_containment_groupingpanel.so
 usr/lib/libplasma_groupingcontainment.so.4
-usr/lib/libplasma_groupingcontainment.so.4.7.0
+usr/lib/libplasma_groupingcontainment.so.4.8.0
 usr/share/kde4/services/plasma-containment-griddesktop.desktop
 usr/share/kde4/services/plasma-containment-groupingdesktop.desktop
 usr/share/kde4/services/plasma-containment-groupingpanel.desktop
diff --git a/debian/plasma-dataengines-addons.install b/debian/plasma-dataengines-addons.install
index 6575055..c7dd623 100644
--- a/debian/plasma-dataengines-addons.install
+++ b/debian/plasma-dataengines-addons.install
@@ -16,9 +16,9 @@ usr/lib/libplasmacomicprovidercore.so.1.0.0
 usr/lib/libplasmapotdprovidercore.so.1
 usr/lib/libplasmapotdprovidercore.so.1.0.0
 usr/lib/libplasmaweather.so.4
-usr/lib/libplasmaweather.so.4.7.0
+usr/lib/libplasmaweather.so.4.8.0
 usr/lib/librtm.so.4
-usr/lib/librtm.so.4.7.0
+usr/lib/librtm.so.4.8.0
 usr/share/kde4/apps/plasma/services/kdeobservatory.operations
 usr/share/kde4/apps/plasma/services/ocsPerson.operations
 usr/share/kde4/apps/plasma/services/rtmauth.operations
@@ -40,3 +40,6 @@ usr/share/kde4/services/plasma-packagestructure-comic.desktop
 usr/share/kde4/services/wcpotdprovider.desktop
 usr/share/kde4/servicetypes/plasma_comicprovider.desktop
 usr/share/kde4/servicetypes/plasma_potdprovider.desktop
+usr/lib/kde4/plasma_engine_kimpanel.so
+usr/share/kde4/services/plasma-dataengine-kimpanel.desktop
+usr/share/kde4/apps/plasma/services/kimpanel.operations
diff --git a/debian/plasma-wallpapers-addons.install b/debian/plasma-wallpapers-addons.install
index bd5f02e..8e7c915 100644
--- a/debian/plasma-wallpapers-addons.install
+++ b/debian/plasma-wallpapers-addons.install
@@ -41,3 +41,5 @@ usr/share/kde4/services/plasma-wallpaper-marble.desktop
 usr/share/kde4/services/plasma-wallpaper-pattern.desktop
 usr/share/kde4/services/plasma-wallpaper-virus.desktop
 usr/share/kde4/services/plasma-wallpaper-weather.desktop
+usr/lib/kde4/plasma_wallpaper_potd.so
+usr/share/kde4/services/plasma-wallpaper-potd.desktop
diff --git a/debian/plasma-widget-kimpanel.install b/debian/plasma-widget-kimpanel.install
index af9b04c..2f18710 100644
--- a/debian/plasma-widget-kimpanel.install
+++ b/debian/plasma-widget-kimpanel.install
@@ -1,6 +1,4 @@
-usr/bin/kimpanel
 usr/lib/kde4/plasma_applet_kimpanel.so
-usr/lib/libkimpanelruntime.so.0
 usr/share/kde4/config.kcfg/kimpanelconfig.kcfg
 usr/share/kde4/services/plasma-applet-kimpanel.desktop
 
diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index f8cb700..1705784 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -160,3 +160,11 @@ usr/share/kde4/services/plasma-frame-default.desktop
 usr/share/kde4/services/plasma-kolourpicker-default.desktop
 usr/share/kde4/services/plasma-notes-default.desktop
 usr/share/kde4/services/plasma_applet_plasmaboard.desktop
+usr/lib/kde4/plasma_applet_icontasks.so
+usr/share/kde4/services/plasma-applet-icontasks.desktop
+usr/share/kde4/apps/desktoptheme/default/icontasks/indicators.svgz
+usr/share/kde4/apps/desktoptheme/default/icontasks/dropindicators.svgz
+usr/share/kde4/apps/desktoptheme/default/icontasks/progress.svgz
+usr/share/kde4/apps/desktoptheme/default/icontasks/badge.svgz
+usr/share/kde4/apps/desktoptheme/default/icontasks/launcherseparator.svgz
+usr/share/kde4/apps/kdeplasma-addons/mediabuttonsrc
diff --git a/debian/rules b/debian/rules
index 1e08a7d..ad9852a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,11 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 override_dh_strip:
 	$(overridden_command) --dbg-package=kdeplasma-addons-dbg
 
-override_dh_install:
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/ibus/
-	cp $(CURDIR)/applets/kimpanel/backend/ibus/panel.py \
-		$(CURDIR)/debian/tmp/usr/lib/ibus/ibus-ui-kde
-	$(overridden_command)
+#override_dh_install:
+#	mkdir -p $(CURDIR)/debian/tmp/usr/lib/ibus/
+#	cp $(CURDIR)/applets/kimpanel/backend/ibus/panel.py \
+#		$(CURDIR)/debian/tmp/usr/lib/ibus/ibus-ui-kde
+#	$(overridden_command)
 
 override_dh_auto_clean:
 	$(overridden_command)
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
KDE Plasma Addons module packaging

More information about the pkg-kde-commits mailing list