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

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

The following commit has been merged in the master branch:
commit e52d87fd1a3e3662d029067a01f27e0e3999cb6a
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Fri Nov 25 01:50:57 2011 +0000

    * New upstream release
    * Merge from debian. Remaining changes:
      - Keep our patch
      - Add debian/xinput folder
      - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
        plasma-widget-kimpanel-backend-ibus
      - Keep rules to install plasma-widget-kimpanel-backend-ibus
      - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
        kde-wallpapers
      - Add plasma-widget-kimpanel-backend-ibus.{install, postinst, prerm}
      - Don't install kimpanel in plasma-widget-addons.install
      - Build against libboost1.46-dev
      - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
        plasma-widgets-addons (<< 4:4.4.60)
      - plasma-widgets-addons suggests plasma-widget-lancelot instead of
        recommends
      - plasma-widgets-addons Breaks/Replaces plasma-widget-system-status
      - Do not build-dep on libscim-dev
      - Add build-dep on libqwt-dev
      - kubuntu_04_kimpanel_disable_scim.diff to build kimpanel without scim
    * Drop build-depends on shared-mime-info, libglib2.0-dev, unused
    * kdeplasma-addons-dbg dependency kdebase-workspace-dbg -> kde-workspace-dbg
    * New upstream release.
    [ José Manuel Santamaría Lema ]
    * Update build depends:
      - Bump kde-sc-dev-latest build dependency to 4:4.7.2.
      - Bump the rest of the KDE SC build depends to 4:4.7.
    * Update installed files.
    
    [ Eshat Cakar ]
    * Add myself to uploaders
    * New upstream release.
    [ Felix Geyer ]
    * Fix name of the clean override target.
    [ José Manuel Santamaría Lema ]
    * Bump kde-sc-dev-latest build dependency to 4:4.6.5.
---
 debian/.gitattributes                    |  1 +
 debian/KUBUNTU-DEBIAN-DIFFERENCES        | 15 ---------
 debian/changelog                         | 52 ++++++++++++++++++++++++++++++--
 debian/control                           | 27 +++++++++--------
 debian/plasma-dataengines-addons.install |  3 ++
 debian/plasma-widget-lancelot.install    | 52 ++++++++++++++++----------------
 debian/source/local-options              |  1 +
 7 files changed, 95 insertions(+), 56 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/KUBUNTU-DEBIAN-DIFFERENCES
deleted file mode 100644
index 3f2de65..0000000
--- a/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ /dev/null
@@ -1,15 +0,0 @@
-    - Keep our patch
-    - Add debian/xinput folder
-    - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
-      plasma-widget-kimpanel-backend-ibus
-    - Add plasma-widget-kimpanel-backend-ibus.{install, postinst, prerm}
-    - Don't install kimpanel in plasma-widget-addons
-    - Build against libboost1.46-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)
-    - plasma-widgets-addons Breaks/Replaces plasma-widget-system-status
-    - Build-depend on shared-mime-info and libglib2.0-dev
diff --git a/debian/changelog b/debian/changelog
index 39d6622..c8e172a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,56 @@
-kdeplasma-addons (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
+kdeplasma-addons (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
+  * Merge from debian. Remaining changes:
+    - Keep our patch
+    - Add debian/xinput folder
+    - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
+      plasma-widget-kimpanel-backend-ibus
+    - Keep rules to install plasma-widget-kimpanel-backend-ibus
+    - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
+      kde-wallpapers
+    - Add plasma-widget-kimpanel-backend-ibus.{install, postinst, prerm}
+    - Don't install kimpanel in plasma-widget-addons.install
+    - Build against libboost1.46-dev
+    - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
+      plasma-widgets-addons (<< 4:4.4.60)
+    - plasma-widgets-addons suggests plasma-widget-lancelot instead of
+      recommends
+    - plasma-widgets-addons Breaks/Replaces plasma-widget-system-status
+    - Do not build-dep on libscim-dev
+    - Add build-dep on libqwt-dev
+    - kubuntu_04_kimpanel_disable_scim.diff to build kimpanel without scim
+  * Drop build-depends on shared-mime-info, libglib2.0-dev, unused
+  * kdeplasma-addons-dbg dependency kdebase-workspace-dbg -> kde-workspace-dbg
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:46:45 +0000
+
+kdeplasma-addons (4:4.7.2-0r0) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+  [ José Manuel Santamaría Lema ]
+  * Update build depends:
+    - Bump kde-sc-dev-latest build dependency to 4:4.7.2.
+    - Bump the rest of the KDE SC build depends to 4:4.7.
+  * Update installed files.
+  
+  [ Eshat Cakar ]
+  * Add myself to uploaders
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2011 00:17:34 +0200
+
+kdeplasma-addons (4:4.6.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ Felix Geyer ]
+  * Fix name of the clean override target.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump kde-sc-dev-latest build dependency to 4:4.6.5.
 
- -- Philip Muškovac <yofel at kubuntu.org>  Tue, 01 Nov 2011 18:20:23 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 Jul 2011 21:53:59 +0300
 
 kdeplasma-addons (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
 
diff --git a/debian/control b/debian/control
index 62cf0c0..15f51fb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,20 @@ 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 <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>,
- José Manuel Santamaría Lema <panfaust at gmail.com>
-Build-Depends: kde-sc-dev-latest (>= 4:4.7.3),
+ José Manuel Santamaría Lema <panfaust at gmail.com>, Eshat Cakar <info at eshat.de>
+Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), kde-workspace-dev (>= 4:4.6),
- libkexiv2-dev (>= 4:4.6), libmarble-dev (>= 4:4.6), shared-mime-info, libglib2.0-dev,
+ kdelibs5-dev (>= 4:4.7), kdepimlibs5-dev (>= 4:4.7), kde-workspace-dev (>= 4:4.7),
+ 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, libqwt-dev, libqalculate-dev,
- libqca2-dev, libqtwebkit-dev
+ shared-desktop-ontologies, libattica-dev, libxtst-dev, libqalculate-dev,
+ libqca2-dev, libqtwebkit-dev, libqwt-dev
 Standards-Version: 3.9.2
 Homepage: http://plasma.kde.org/
-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons
-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kdeplasma-addons/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kdeplasma-addons/ubuntu
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdeplasma-addons.git
 
 Package: kdeplasma-addons
 Architecture: all
@@ -38,7 +40,7 @@ Package: plasma-widgets-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
- plasma-dataengines-addons (= ${binary:Version})
+ plasma-dataengines-addons (= ${binary:Version}),
 Suggests: plasma-widget-lancelot
 Replaces: plasma-widget-system-status
 Breaks: plasma-widget-system-status
@@ -90,8 +92,7 @@ Package: plasma-wallpapers-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
- plasma-dataengines-addons (= ${binary:Version}), kdewallpapers,
- kde-wallpapers
+ plasma-dataengines-addons (= ${binary:Version}), kde-wallpapers
 Replaces: plasma-dataengines-addons (<= 4:4.3.0-1)
 Description: additional wallpaper plugins for Plasma
  This package contains additional Plasma wallpaper plugins that are used in 
@@ -118,7 +119,7 @@ Depends: ${shlibs:Depends}, plasma-widget-kimpanel-backend-ibus
 Description: addons for KDE 4 Plasma - universal input method widget
  Kimpanel is a a Plasma widget for the ibus input method.
  .
- 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-backend-ibus
 Architecture: all
@@ -138,7 +139,7 @@ Description: addons for KDE 4 Plasma - KDE development tracking tool
  KDE project as a whole, including commit counts, Krazy2 report numbers for
  various KDE modules, and other statistics.
  .
- This package is part of the KDE 4 plasma addons module.
+ This package is part of the KDE plasma addons module.
 
 Package: kdeplasma-addons-dbg
 Section: debug
diff --git a/debian/plasma-dataengines-addons.install b/debian/plasma-dataengines-addons.install
index 4e75d8a..6575055 100644
--- a/debian/plasma-dataengines-addons.install
+++ b/debian/plasma-dataengines-addons.install
@@ -1,5 +1,6 @@
 usr/lib/kde4/plasma_comic_krossprovider.so
 usr/lib/kde4/plasma_engine_comic.so
+usr/lib/kde4/plasma_engine_kdeobservatory.so
 usr/lib/kde4/plasma_engine_microblog.so
 usr/lib/kde4/plasma_engine_ocs.so
 usr/lib/kde4/plasma_engine_potd.so
@@ -18,6 +19,7 @@ usr/lib/libplasmaweather.so.4
 usr/lib/libplasmaweather.so.4.7.0
 usr/lib/librtm.so.4
 usr/lib/librtm.so.4.7.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
 usr/share/kde4/apps/plasma/services/rtmtask.operations
@@ -32,6 +34,7 @@ usr/share/kde4/services/plasma-dataengine-comic.desktop
 usr/share/kde4/services/plasma-dataengine-microblog.desktop
 usr/share/kde4/services/plasma-dataengine-ocs.desktop
 usr/share/kde4/services/plasma-dataengine-potd.desktop
+usr/share/kde4/services/plasma-engine-kdeobservatory.desktop
 usr/share/kde4/services/plasma-engine-rtm.desktop
 usr/share/kde4/services/plasma-packagestructure-comic.desktop
 usr/share/kde4/services/wcpotdprovider.desktop
diff --git a/debian/plasma-widget-lancelot.install b/debian/plasma-widget-lancelot.install
index 5d442df..6a3b3b3 100644
--- a/debian/plasma-widget-lancelot.install
+++ b/debian/plasma-widget-lancelot.install
@@ -47,6 +47,32 @@ usr/share/kde4/apps/desktoptheme/Aya/lancelot/section-buttons.svgz
 usr/share/kde4/apps/desktoptheme/Aya/lancelot/system-buttons-extender.svgz
 usr/share/kde4/apps/desktoptheme/Aya/lancelot/system-buttons.svgz
 usr/share/kde4/apps/desktoptheme/Aya/lancelot/theme.config
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/action-list-view-headers.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/category-triangle.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/inner-background.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/lancelot-context-extender.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/lancelot-context.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons-extender.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-inactivebuttons.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-spacer.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/section-buttons.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/system-buttons-extender.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/system-buttons.svgz
+usr/share/kde4/apps/desktoptheme/Produkt/lancelot/theme.config
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/action-list-view-drop-indicator.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/action-list-view-headers.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/category-triangle.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/extender-button-icon.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/inner-background.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons-extender.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-inactivebuttons.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-spacer.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/section-buttons.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/system-buttons-extender.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/system-buttons.svgz
+usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/theme.config
 usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-drop-indicator.svgz
 usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-headers.svgz
 usr/share/kde4/apps/desktoptheme/default/lancelot/category-triangle.svgz
@@ -73,19 +99,6 @@ usr/share/kde4/apps/desktoptheme/oxygen/lancelot/section-buttons.svgz
 usr/share/kde4/apps/desktoptheme/oxygen/lancelot/system-buttons-extender.svgz
 usr/share/kde4/apps/desktoptheme/oxygen/lancelot/system-buttons.svgz
 usr/share/kde4/apps/desktoptheme/oxygen/lancelot/theme.config
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/action-list-view-headers.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/category-triangle.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/inner-background.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/lancelot-context-extender.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/lancelot-context.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-inactivebuttons.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-spacer.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/section-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/system-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/system-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/theme.config
 usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/action-list-view-headers.svgz
 usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/category-triangle.svgz
 usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/inner-background.svgz
@@ -99,19 +112,6 @@ usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/section-buttons.svgz
 usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/system-buttons-extender.svgz
 usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/system-buttons.svgz
 usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/theme.config
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/action-list-view-drop-indicator.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/action-list-view-headers.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/category-triangle.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/extender-button-icon.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/inner-background.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-inactivebuttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-spacer.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/section-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/system-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/system-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/theme.config
 usr/share/kde4/apps/lancelot/lancelot.notifyrc
 usr/share/kde4/services/lancelot.desktop
 usr/share/kde4/services/plasma-applet-lancelot-launcher.desktop
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
KDE Plasma Addons module packaging

More information about the pkg-kde-commits mailing list