[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:39 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=1fd5070
The following commit has been merged in the master branch:
commit 1fd5070fcb7a3f79a07238d773080b9ad9893da6
Author: Rohan Garg <rohangarg at kubuntu.org>
Date: Wed Jun 19 11:05:56 2013 +0100
Update install files
Switch to libqwt5-qt4-dev in Build-Depends, kdeobservatory needs it
Drop kubuntu_02_random_password_generator.diff, applied upstream
---
debian/changelog | 3 +
debian/control | 2 +-
.../kubuntu_02_random_password_generator.diff | 75 ----------------------
debian/patches/series | 1 -
debian/plasma-dataengines-addons.install | 2 +
debian/plasma-widgets-addons.install | 2 +-
6 files changed, 7 insertions(+), 78 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6bef93e..7847550 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
kdeplasma-addons (4:4.10.80-0ubuntu1) UNRELEASED; urgency=low
* New upstream release
+ - Update install files
+ - Switch to libqwt5-qt4-dev in Build-Depends, kdeobservatory needs it
+ - Drop kubuntu_02_random_password_generator.diff, applied upstream
-- Rohan Garg <rohangarg at kubuntu.org> Thu, 13 Jun 2013 09:09:45 +0100
diff --git a/debian/control b/debian/control
index b3179b2..effd99d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
libqt4-opengl-dev, libboost1.53-dev, libqimageblitz-dev, libeigen2-dev, libxrender-dev,
shared-desktop-ontologies, libattica-dev, libxtst-dev, libqalculate-dev,
libqca2-dev, libqtwebkit-dev, libdbusmenu-qt-dev, libibus-1.0-dev (>= 1.4.2),
- libqwt-dev, libglib2.0-dev, shared-mime-info, libqjson-dev, libqoauth-dev
+ libqwt5-qt4-dev, libglib2.0-dev, shared-mime-info, libqjson-dev, libqoauth-dev,
Standards-Version: 3.9.3
Homepage: http://plasma.kde.org/
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons
diff --git a/debian/patches/kubuntu_02_random_password_generator.diff b/debian/patches/kubuntu_02_random_password_generator.diff
deleted file mode 100644
index efcef28..0000000
--- a/debian/patches/kubuntu_02_random_password_generator.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-commit 36a1fe49cb70f717c4a6e9eeee2c9186503a8dce
-Author: Aaron Seigo <aseigo at kde.org>
-Date: Mon Jun 3 19:16:32 2013 +0200
-
- use KRandom, avoid modulo bias
-
-diff --git a/applets/paste/pastemacroexpander.cpp b/applets/paste/pastemacroexpander.cpp
-index ea6163f..d0a8b49 100644
---- a/applets/paste/pastemacroexpander.cpp
-+++ b/applets/paste/pastemacroexpander.cpp
-@@ -27,6 +27,7 @@
- #include <KDebug>
- #include <KLocale>
- #include <KMessageBox>
-+#include <KRandom>
-
- class PasteMacroExpanderSingleton
- {
-@@ -142,35 +143,49 @@ QString PasteMacroExpander::password(const QString& args)
- << "01234567890"
- << "!\"#$%&'()*+,-./:;<=>?@[\]^_`{|}~";
-
-- int charCount;
-+ int charCount = 8;
- QString chars;
- QString result;
-
- if (a.count() > 0) {
-- charCount = qMax(a[0].trimmed().toInt(), 1);
-- } else {
-- charCount = 8;
-+ charCount = qMax(a[0].trimmed().toInt(), 8);
- }
-+
- if (a.count() < 2) {
- chars = characterSets.join("");
- }
-+
- if (a.count() > 1) {
- chars += (a[1].trimmed() == "true") ? characterSets[0] : "";
- }
-+
- if (a.count() > 2) {
- chars += (a[2].trimmed() == "true") ? characterSets[1] : "";
- }
-+
- if (a.count() > 3) {
- chars += (a[3].trimmed() == "true") ? characterSets[2] : "";
- }
-+
- if (a.count() > 4) {
- chars += (a[4].trimmed() == "true") ? characterSets[3] : "";
- }
-
-- QDateTime now = QDateTime::currentDateTime();
-- qsrand(now.toTime_t() / now.time().msec());
-+ const int setSize = chars.count();
-+ const int top = (RAND_MAX / setSize) * setSize;
-+ kDebug() << "topping out at " << setSize << RAND_MAX << top;
- for (int i = 0; i < charCount; ++i) {
-- result += chars[qrand() % chars.count()];
-+ // to prevent modulo bias, discard random numbers at the
-+ // 'top end' of INT_MAX
-+ int rand = -1;
-+ do {
-+ if (rand > 0) {
-+ kDebug() << "Ha!" << rand;
-+ }
-+ rand = KRandom::random();
-+ } while (rand >= top);
-+
-+ result += chars[rand % setSize];
- }
- //kDebug() << result;
- return result;
diff --git a/debian/patches/series b/debian/patches/series
index d069241..203c746 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
kubuntu_01_news_applet_name.diff
marble-4.7-compat.diff
-kubuntu_02_random_password_generator.diff
diff --git a/debian/plasma-dataengines-addons.install b/debian/plasma-dataengines-addons.install
index 60ff2bf..ff2547e 100644
--- a/debian/plasma-dataengines-addons.install
+++ b/debian/plasma-dataengines-addons.install
@@ -11,6 +11,7 @@ usr/lib/kde4/plasma_packagestructure_comic.so
usr/lib/kde4/plasma_potd_apodprovider.so
usr/lib/kde4/plasma_potd_epodprovider.so
usr/lib/kde4/plasma_potd_flickrprovider.so
+usr/lib/kde4/plasma_potd_natgeoprovider.so
usr/lib/kde4/plasma_potd_oseiprovider.so
usr/lib/kde4/plasma_potd_wcpotdprovider.so
usr/lib/libplasmacomicprovidercore.so.1
@@ -33,6 +34,7 @@ usr/share/kde4/config/plasmaweather.knsrc
usr/share/kde4/services/apodprovider.desktop
usr/share/kde4/services/epodprovider.desktop
usr/share/kde4/services/flickrprovider.desktop
+usr/share/kde4/services/natgeoprovider.desktop
usr/share/kde4/services/oseiprovider.desktop
usr/share/kde4/services/plasma-dataengine-comic.desktop
usr/share/kde4/services/plasma-dataengine-konqprofiles.desktop
diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index 547be41..30155d9 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -140,7 +140,7 @@ usr/share/kde4/apps/plasma/plasmoids/konsoleprofiles/contents/ui/konsoleprofiles
usr/share/kde4/apps/plasma/plasmoids/konsoleprofiles/metadata.desktop
usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/code/service.js
usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/config/main.xml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/images/nocover.svgz
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/theme/nowplaying/nocover.svgz
usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/AlbumArt.qml
usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/CompactLayout.qml
usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/Controls.qml
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list