[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:12 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=a820bed
The following commit has been merged in the master branch:
commit a820bed532210ded05a76f5cbc3dfd955fd11558
Author: unknown <michal.zajac at gmail.com>
Date: Sat Dec 5 23:13:49 2009 +0100
New upstream beta. Bump on build-depends. Changes in install files. Dropped plasma-dataengines-dev since no files are produced.
---
debian/changelog | 8 +++++
debian/control | 12 ++------
debian/liblancelot0.install | 2 +-
.../patches/99_fix_ftbfs_on_marble_wallpaper.diff | 13 ++++++++
debian/patches/kubuntu_04_netbook_runners.diff | 35 ----------------------
debian/patches/series | 4 +--
debian/plasma-dataengines-addons-dev.install | 6 ----
debian/plasma-dataengines-addons.install | 14 +++++----
debian/plasma-runners-addons.install | 12 ++++++--
debian/plasma-wallpapers-addons.install | 18 ++++++++++-
debian/plasma-widget-lancelot.install | 3 +-
debian/plasma-widgets-addons.install | 16 +++++++++-
12 files changed, 79 insertions(+), 64 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f47daac..44d1e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kdeplasma-addons (4:4.3.80-0ubuntu1~ppa1) lucid; urgency=low
+
+ * New upstream beta
+ * Dropped netbook patch, already implemented upstream
+ * Commented out social from the start patch, needs rewriting, it causes FTBFS
+
+ -- Michał Zając <michal.zajac at gmail.com> Sat, 05 Dec 2009 21:02:13 +0100
+
kdeplasma-addons (4:4.3.4-0ubuntu1) UNRELEASED; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 8c90063..73e197e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pus
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2),
kdelibs5-dev (>= 4:4.3.4), kdepimlibs5-dev (>= 4:4.3.4), libqt4-opengl-dev,
kdebase-workspace-dev (>= 4:4.3.4), libboost1.38-dev, libkexiv2-7-dev, python, libmarble-dev (>> 4:4.3.0),
- libqimageblitz-dev, libeigen2-dev, libxrender-dev
+ libqimageblitz-dev, libeigen2-dev, libxrender-dev, libattica-dev, libxtst-dev,
+ libmarble-dev
Standards-Version: 3.8.3
Homepage: http://plasma.kde.org/
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu
@@ -58,15 +59,6 @@ Description: addons for KDE 4 Plasma - data engines
.
This package is part of the KDE 4 Plasma addons module.
-Package: plasma-dataengines-addons-dev
-Architecture: any
-Section: kde
-Depends: plasma-dataengines-addons (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:plasma-dataengines-addons}
-Description: addons for KDE 4 Plasma - data engine development headers
- This package contains the development headers that are needed to compile
- plasma widgets that use the extra libraries provides by plasma-addons. It is
- part of the KDE 4 plasma addons module.
-
Package: plasma-runners-addons
Architecture: any
Section: kde
diff --git a/debian/liblancelot0.install b/debian/liblancelot0.install
index b709b40..face569 100644
--- a/debian/liblancelot0.install
+++ b/debian/liblancelot0.install
@@ -1,2 +1,2 @@
usr/lib/liblancelot.so.0
-usr/lib/liblancelot.so.0.7.0
+usr/lib/liblancelot.so.1.7.0
diff --git a/debian/patches/99_fix_ftbfs_on_marble_wallpaper.diff b/debian/patches/99_fix_ftbfs_on_marble_wallpaper.diff
new file mode 100644
index 0000000..db638c2
--- /dev/null
+++ b/debian/patches/99_fix_ftbfs_on_marble_wallpaper.diff
@@ -0,0 +1,13 @@
+Index: kdeplasma-addons-4.3.80/wallpapers/marble/marble.cpp
+===================================================================
+--- kdeplasma-addons-4.3.80.orig/wallpapers/marble/marble.cpp 2009-12-05 22:13:12.958174158 +0100
++++ kdeplasma-addons-4.3.80/wallpapers/marble/marble.cpp 2009-12-05 22:13:35.018798637 +0100
+@@ -98,7 +98,7 @@
+ m_positionLon = config.readEntry(POSITION_LON_KEY, home_lon);
+ m_positionLat = config.readEntry(POSITION_LAT_KEY, home_lat);
+ m_projection = static_cast<Projection>(config.readEntry(PROJECTION_KEY, static_cast<int>(Spherical)));
+- m_quality = static_cast<MapQuality>(config.readEntry(QUALITY_KEY, static_cast<int>(NormalQuality)));
++ m_quality = static_cast<MapQuality>(config.readEntry(QUALITY_KEY, static_cast<int>(Normal)));
+ m_rotationLat = config.readEntry(ROTATION_LAT_KEY, 0.0);
+ m_rotationLon = config.readEntry(ROTATION_LON_KEY, 0.025);
+ m_rotationTimeout = config.readEntry(ROTATION_TIMEOUT_KEY, 10000);
diff --git a/debian/patches/kubuntu_04_netbook_runners.diff b/debian/patches/kubuntu_04_netbook_runners.diff
deleted file mode 100644
index 21dd840..0000000
--- a/debian/patches/kubuntu_04_netbook_runners.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: contacts/contactsrunner.cpp
-===================================================================
---- kdeplasma-addons-4.3.0/runners/contacts/contactsrunner.cpp (revision 979287)
-+++ kdeplasma-addons-4.3.0/runners/contacts/contactsrunner.cpp (working copy)
-@@ -47,6 +47,7 @@
- setIgnoredTypes(Plasma::RunnerContext::Directory | Plasma::RunnerContext::File |
- Plasma::RunnerContext::NetworkLocation);
- addSyntax(Plasma::RunnerSyntax(":q:", i18n("Finds people in your address book matching :q:.")));
-+ addSyntax(Plasma::RunnerSyntax(i18nc("list of all people in address book", "list contacts"), i18n("List all people in your address book.")));
- }
-
- ContactsRunner::~ContactsRunner()
-@@ -69,10 +69,18 @@
- return;
- }
-
-- const bool matchedName = a.realName().contains(term, Qt::CaseInsensitive);
-- bool matchedMail = false;
--
-- if (!matchedName) {
-+ bool matchedName;
-+ bool matchedMail;
-+
-+ if (term.compare(i18nc("list of all people in address book", "list contacts"), Qt::CaseInsensitive) == 0) {
-+ matchedName = true;
-+ matchedMail = true;
-+ } else {
-+ matchedName = a.realName().contains(term, Qt::CaseInsensitive);
-+ matchedMail = false;
-+ }
-+
-+ if (!matchedName && !matchedMail) {
- // Name didn't match, so lets try the name portion of the email address
- const int indexOf = a.preferredEmail().indexOf(term, Qt::CaseInsensitive);
- matchedMail = indexOf > -1 && indexOf < a.preferredEmail().indexOf('@');
diff --git a/debian/patches/series b/debian/patches/series
index 03cb340..fcdec85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-kubuntu_02_microblog_default_configuration.diff
+#kubuntu_02_microblog_default_configuration.diff
#kubuntu_03_opendestop_setup.diff
-kubuntu_04_netbook_runners.diff
+99_fix_ftbfs_on_marble_wallpaper.diff
diff --git a/debian/plasma-dataengines-addons-dev.install b/debian/plasma-dataengines-addons-dev.install
deleted file mode 100644
index 379200e..0000000
--- a/debian/plasma-dataengines-addons-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/include/conversion/converter.h
-usr/include/conversion/plasmaconversion_export.h
-usr/include/conversion/unitcategory.h
-usr/include/conversion/unit.h
-usr/include/conversion/value.h
-usr/share/kde4/apps/cmake/modules/FindConversion.cmake
diff --git a/debian/plasma-dataengines-addons.install b/debian/plasma-dataengines-addons.install
index 5fc6232..ddd21db 100644
--- a/debian/plasma-dataengines-addons.install
+++ b/debian/plasma-dataengines-addons.install
@@ -10,20 +10,23 @@ usr/lib/kde4/plasma_potd_epodprovider.so
usr/lib/kde4/plasma_potd_flickrprovider.so
usr/lib/kde4/plasma_potd_oseiprovider.so
usr/lib/kde4/plasma_potd_wcpotdprovider.so
-usr/lib/libocsclient.so.4
-usr/lib/libocsclient.so.4.3.0
+usr/lib/kde4/plasma_engine_pastebin.so
+#usr/lib/libocsclient.so.4
+#usr/lib/libocsclient.so.4.3.0
usr/lib/libplasmacomicprovidercore.so.1
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.3.0
+usr/lib/libplasmaweather.so.4.4.0
usr/lib/librtm.so.4
-usr/lib/librtm.so.4.3.0
+usr/lib/librtm.so.4.4.0
usr/share/kde4/apps/plasma/services/rtmauth.operations
usr/share/kde4/apps/plasma/services/rtmtask.operations
usr/share/kde4/apps/plasma/services/rtmtasks.operations
usr/share/kde4/apps/plasma/services/tweet.operations
+usr/share/kde4/apps/plasma/services/ocsPerson.operations
+usr/share/kde4/apps/plasma/services/pastebin.operations
usr/share/kde4/services/apodprovider.desktop
usr/share/kde4/services/epodprovider.desktop
usr/share/kde4/services/flickrprovider.desktop
@@ -33,7 +36,8 @@ 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-rtm.desktop
+usr/share/kde4/services/plasma-engine-pastebin.desktop
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/share/kde4/servicetypes/plasma_potdprovider.desktop
\ No newline at end of file
diff --git a/debian/plasma-runners-addons.install b/debian/plasma-runners-addons.install
index 90fb661..7c66609 100644
--- a/debian/plasma-runners-addons.install
+++ b/debian/plasma-runners-addons.install
@@ -6,6 +6,10 @@ usr/lib/kde4/krunner_katesessions.so
usr/lib/kde4/krunner_konquerorsessions.so
usr/lib/kde4/krunner_konsolesessions.so
usr/lib/kde4/krunner_spellcheckrunner.so
+usr/lib/kde4/kcm_krunner_audioplayercontrol.so
+usr/lib/kde4/krunner_audioplayercontrol.so
+usr/lib/kde4/krunner_kopete.so
+usr/lib/kde4/krunner_mediawiki.so
usr/share/kde4/services/browserhistory.desktop
usr/share/kde4/services/katesessions.desktop
usr/share/kde4/services/konquerorsessions.desktop
@@ -14,5 +18,9 @@ usr/share/kde4/services/plasma-runner-contacts.desktop
usr/share/kde4/services/plasma-runner-converter.desktop
usr/share/kde4/services/plasma-runner-spellchecker_config.desktop
usr/share/kde4/services/plasma-runner-spellchecker.desktop
-usr/lib/libconversion.so.4
-usr/lib/libconversion.so.4.3.0
+usr/share/kde4/services/plasma-runner-audioplayercontrol.desktop
+usr/share/kde4/services/plasma-runner-audioplayercontrol_config.desktop
+usr/share/kde4/services/plasma-runner-kopete.desktop
+usr/share/kde4/services/plasma-runner-techbase.desktop
+usr/share/kde4/services/plasma-runner-wikipedia.desktop
+usr/share/kde4/services/plasma-runner-wikitravel.desktop
\ No newline at end of file
diff --git a/debian/plasma-wallpapers-addons.install b/debian/plasma-wallpapers-addons.install
index 6dc4eee..7e334f9 100644
--- a/debian/plasma-wallpapers-addons.install
+++ b/debian/plasma-wallpapers-addons.install
@@ -19,9 +19,25 @@ usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/triangles.desktop
usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/triangles.png
usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/xeroxstar.desktop
usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/xeroxstar.png
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/bees.desktop
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/bees.png
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/celtic.desktop
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/celtic.png
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/eastern_blues.desktop
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/eastern_blues.png
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/french.desktop
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/french.png
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/ivory_coast.desktop
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/ivory_coast.png
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/lineage.desktop
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/lineage.png
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/persism.desktop
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/persism.png
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/stars.desktop
+usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/stars.png
usr/share/kde4/config/virus_wallpaper.knsrc
usr/share/kde4/services/plasma-wallpaper-mandelbrot.desktop
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/share/kde4/services/plasma-wallpaper-weather.desktop
\ No newline at end of file
diff --git a/debian/plasma-widget-lancelot.install b/debian/plasma-widget-lancelot.install
index cd958fa..746b8a8 100644
--- a/debian/plasma-widget-lancelot.install
+++ b/debian/plasma-widget-lancelot.install
@@ -60,7 +60,7 @@ usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-items-extende
usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-items.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/extender-button-icon.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/inner-background.svgz
-usr/share/kde4/apps/desktoptheme/default/lancelot/main-background.svgz
+#usr/share/kde4/apps/desktoptheme/default/lancelot/main-background.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-buttons-extender.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-buttons.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-inactivebuttons.svgz
@@ -68,6 +68,7 @@ usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-spacer.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/section-buttons.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/system-buttons-extender.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/system-buttons.svgz
+usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-drop-indicator.svgz
usr/share/kde4/apps/desktoptheme/default/lancelot/theme.config
usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-categories-applet.svgz
usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-categories-extender.svgz
diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index 279a8cd..ee1d0aa 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -36,6 +36,12 @@ usr/lib/kde4/plasma_applet_timer.so
usr/lib/kde4/plasma_applet_unitconverter.so
usr/lib/kde4/plasma_applet_weather.so
usr/lib/kde4/plasma_applet_weatherstation.so
+usr/lib/kde4/plasma_applet_blackboard.so
+usr/lib/kde4/plasma_applet_knowledgebase.so
+usr/lib/kde4/plasma_applet_opendesktop_activities.so
+usr/lib/kde4/plasma_applet_plasmaboard.so
+usr/lib/kde4/plasma_applet_spellcheck.so
+usr/lib/kde4/plasma_applet_webslice.so
usr/share/icons/hicolor/128x128/apps/bball.png
usr/share/icons/hicolor/128x128/apps/previewer.png
usr/share/icons/hicolor/16x16/apps/bball.png
@@ -54,7 +60,7 @@ usr/share/kde4/apps/bball/bball.svgz
usr/share/kde4/apps/bball/bounce.ogg
usr/share/kde4/apps/bball/football.svgz
usr/share/kde4/apps/desktoptheme/default/bubblemon/bubble.svg
-usr/share/kde4/apps/desktoptheme/default/fifteenPuzzle/greensquare.svgz
+usr/share/kde4/apps/desktoptheme/default/fifteenPuzzle/blanksquare.svg
usr/share/kde4/apps/desktoptheme/default/rssnow/background.svgz
usr/share/kde4/apps/desktoptheme/default/rssnow/left.svgz
usr/share/kde4/apps/desktoptheme/default/rssnow/right.svgz
@@ -73,8 +79,10 @@ usr/share/kde4/apps/desktoptheme/default/widgets/timer.svgz
usr/share/kde4/apps/plasma-applet-frame/picture-frame-default.jpg
usr/share/kde4/apps/plasma-applet-opendesktop/user.css
usr/share/kde4/apps/plasma_pastebin/plasma_pastebin.notifyrc
+usr/share/kde4/apps/plasma-applet-opendesktop-activities/plasma-applet-opendesktop-activities.notifyrc
usr/share/kde4/apps/rssnow/feeds
usr/share/kde4/config/comic.knsrc
+usr/share/kde4/config/plasmaweather.knsrc
usr/share/kde4/services/ServiceMenus/preview.desktop
usr/share/kde4/services/plasma-applet-bball.desktop
usr/share/kde4/services/plasma-applet-binaryclock.desktop
@@ -114,3 +122,9 @@ usr/share/kde4/services/plasma-fileWatcher-default.desktop
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-blackboard.desktop
+usr/share/kde4/services/plasma-applet-knowledgebase.desktop
+usr/share/kde4/services/plasma-applet-opendesktop-activities.desktop
+usr/share/kde4/services/plasma-applet-spellcheck.desktop
+usr/share/kde4/services/plasma-applet-webslice.desktop
+usr/share/kde4/services/plasma_applet_plasmaboard.desktop
\ No newline at end of file
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list