[SCM] kamoso packaging branch, master, updated. 1956296da39ee74320db2aa5b244d999ec6c88e8
Diane Trout
diane-guest at moszumanska.debian.org
Thu May 28 03:20:30 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kamoso.git;a=commitdiff;h=64a2dd3
The following commit has been merged in the master branch:
commit 64a2dd33bfba6c927cfa153dc6da6576876ed156
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Tue May 26 20:04:29 2015 -0700
Import released 2.0.2-2 version
---
debian/changelog | 27 +++--
debian/control | 6 +-
debian/patches/about_dialog.diff | 27 +++++
debian/patches/dont_build_plugin_tester.diff | 7 ++
debian/patches/proper_version_kaboutdata.diff | 4 +-
debian/patches/series | 4 +
debian/patches/upstream_add-include.patch | 24 ++++
debian/patches/upstream_libkipi-2.x.diff | 165 ++++++++++++++++++++++++++
debian/patches/upstream_rename-icons.diff | 18 +++
debian/rules | 8 ++
debian/watch | 3 +-
11 files changed, 279 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 62ae0c2..cf8caaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,25 @@
-kamoso (2.0.2+git20130122-0r1) UNRELEASED; urgency=low
+kamoso (2.0.2-2) unstable; urgency=low
- * New upstream release.
- * Remove about_dialog.diff, applied upstream.
- * Refresh proper_version_kaboutdata.diff.
- * Refresh dont_build_plugin_tester.diff.
+ * Team upload.
+
+ [ José Manuel Santamaría Lema ]
* Bump debhelper compatibility level to 9. This enables the hardening flags.
- * Add watch file.
- * Update Vcs-* fields.
- -- José Manuel Santamaría Lema <panfaust at gmail.com> Tue, 22 Jan 2013 16:10:49 +0100
+ [ Pino Toscano ]
+ * Fix the Vcs-* headers.
+ * Backport upstream commit d3c5946f9f48f5d7a5249995424228fc51c84b67 to
+ include a needed header; patch upstream_add-include.patch.
+ * Backport upstream commits a0aec903b36b52bda1a9a5d2e875af1063747a86 and
+ 9f32257a1e930b16e64508e6fbfa9390fc0322ee to fix compatibility with libkipi
+ 2.x; patch upstream_libkipi-2.x.diff.
+ * Backport part of upstream commit b8b03322d58a920deac198c2360d65deddccd610
+ to rename the youtube icon to kipiplugin_youtube; patch
+ upstream_rename-icons.diff. Since renaming sources is not viable, rename
+ the actual icons at installation time.
+ * Bump Standards-Version to 3.9.4, no changes required.
+ * Link in as-needed mode.
+
+ -- Pino Toscano <pino at debian.org> Fri, 19 Jul 2013 15:42:37 +0200
kamoso (2.0.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2a9b40c..e2b128d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,10 @@ Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.5.0),
shared-desktop-ontologies,
libqtgstreamer-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev,
libglib2.0-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Homepage: http://www.kde-apps.org/content/show.php/Kamoso?content=111750
-Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/kamoso.git
-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/kamoso.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kamoso.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kamoso.git;a=summary
Package: kamoso
Architecture: any
diff --git a/debian/patches/about_dialog.diff b/debian/patches/about_dialog.diff
new file mode 100644
index 0000000..b2e4704
--- /dev/null
+++ b/debian/patches/about_dialog.diff
@@ -0,0 +1,27 @@
+commit 990462363724a09cfbc314d7e6451a4000db548e
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Date: Fri Jul 22 20:09:22 2011 +0200
+
+ Make the About dialog work.
+
+diff --git a/src/kamoso.cpp b/src/kamoso.cpp
+index ae4c048..6026bdd 100644
+--- a/src/kamoso.cpp
++++ b/src/kamoso.cpp
+@@ -670,7 +670,8 @@ void Kamoso::settingsMenu(bool )
+ m.addSeparator();
+ }
+ m.addAction(KIcon("configure"), i18n("Settings"), this, SLOT(configuration()));
+- m.addMenu(customHelpMenu());
++ KMenu *help = helpMenu();
++ m.addMenu(help);
+
+ m.exec(mainWidgetUi->configure->parentWidget()->mapToGlobal(mainWidgetUi->configure->geometry().bottomLeft()));
+ }
+@@ -726,4 +727,4 @@ void Kamoso::updateThumbnails(const KUrl::List& urls)
+
+ mainWidgetUi->thumbnailView->update(idx);
+ }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/dont_build_plugin_tester.diff b/debian/patches/dont_build_plugin_tester.diff
index db27e2f..a9da173 100644
--- a/debian/patches/dont_build_plugin_tester.diff
+++ b/debian/patches/dont_build_plugin_tester.diff
@@ -16,3 +16,10 @@ Description: Avoids building the plugin tester.
set(kamoso_SRCS
burstshootmode.cpp
+@@ -58,4 +58,4 @@ endif(HAVE_NEPOMUK)
+
+ install(TARGETS kamoso ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES kamoso.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+-install(FILES kamosoplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+\ No newline at end of file
++install(FILES kamosoplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --git a/debian/patches/proper_version_kaboutdata.diff b/debian/patches/proper_version_kaboutdata.diff
index 77503de..6791e92 100644
--- a/debian/patches/proper_version_kaboutdata.diff
+++ b/debian/patches/proper_version_kaboutdata.diff
@@ -11,8 +11,8 @@ Description: Set the proper number version, used in the bug reporting assistant.
int main(int argc, char *argv[])
{
-- KAboutData about("kamoso", 0, ki18n(("Kamoso")), "2.0.2", ki18n("Webcam picture retriever"),
-+ KAboutData about("kamoso", 0, ki18n(("Kamoso")), "2.0.2+git20130122", ki18n("Webcam picture retriever"),
+- KAboutData about("kamoso", 0, ki18n(("Kamoso")), "1.90", ki18n("Webcam picture retriever"),
++ KAboutData about("kamoso", 0, ki18n(("Kamoso")), "2.0.2", ki18n("Webcam picture retriever"),
KAboutData::License_GPL, ki18n("(C) 2008-2010 Alex Fiestas and Aleix Pol"));
about.addAuthor( ki18n("Aleix Pol Gonzalez"), ki18n("Semaphore hacker"), "aleixpol at kde.org" );
about.addAuthor( ki18n("Alex Fiestas"), ki18n("Coffee drinker"), "alex at eyeos.org" );
diff --git a/debian/patches/series b/debian/patches/series
index 784b8ed..c252ced 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
+about_dialog.diff
proper_version_kaboutdata.diff
dont_build_plugin_tester.diff
+upstream_add-include.patch
+upstream_libkipi-2.x.diff
+upstream_rename-icons.diff
diff --git a/debian/patches/upstream_add-include.patch b/debian/patches/upstream_add-include.patch
new file mode 100644
index 0000000..95d0230
--- /dev/null
+++ b/debian/patches/upstream_add-include.patch
@@ -0,0 +1,24 @@
+From d3c5946f9f48f5d7a5249995424228fc51c84b67 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol at kde.org>
+Date: Wed, 8 Feb 2012 00:39:31 +0100
+Subject: [PATCH] add include
+
+---
+ src/plugins/youtube/kipiplugin_youtube.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/plugins/youtube/kipiplugin_youtube.cpp b/src/plugins/youtube/kipiplugin_youtube.cpp
+index 07fe1c4..7ebabf8 100644
+--- a/src/plugins/youtube/kipiplugin_youtube.cpp
++++ b/src/plugins/youtube/kipiplugin_youtube.cpp
+@@ -36,6 +36,7 @@
+ #include <kwallet.h>
+ #include <KDebug>
+ #include <libkipi/interface.h>
++#include <libkipi/imagecollection.h>
+
+ using KWallet::Wallet;
+
+--
+1.7.10.4
+
diff --git a/debian/patches/upstream_libkipi-2.x.diff b/debian/patches/upstream_libkipi-2.x.diff
new file mode 100644
index 0000000..75b3a28
--- /dev/null
+++ b/debian/patches/upstream_libkipi-2.x.diff
@@ -0,0 +1,165 @@
+Author: Rex Dieter <rdieter at math.unl.edu>
+Author: Sando Mani <manisandro at gmail.com>
+Description: Support for libkipi 2.x
+Origin: upstream, commit:a0aec903b36b52bda1a9a5d2e875af1063747a86, commit:9f32257a1e930b16e64508e6fbfa9390fc0322ee
+
+--- a/src/kamoso.cpp
++++ b/src/kamoso.cpp
+@@ -45,6 +45,7 @@
+ #include <solid/control/powermanager.h>
+ #endif
+
++#include <QItemSelection>
+ #include <QLayout>
+ #include <QPushButton>
+ #include <QToolButton>
+@@ -77,6 +78,7 @@
+
+ #include <libkipi/plugin.h>
+ #include <libkipi/pluginloader.h>
++#include <libkipi/version.h>
+ #include <KPluginInfo>
+
+ const int max_exponential_value = 50;
+@@ -189,7 +191,13 @@
+ connect(mTracker, SIGNAL(urlsChanged(KUrl::List)), SLOT(updateThumbnails(KUrl::List)));
+
+ QMetaObject::invokeMethod(this, "initialize");
++#if (KIPI_VERSION >= 0x020000)
++ mPluginLoader = new KIPI::PluginLoader();
++ mPluginLoader->setInterface(new KIPIInterface(this));
++ mPluginLoader->init();
++#else
+ mPluginLoader = new KIPI::PluginLoader(QStringList(), new KIPIInterface(this), "");
++#endif
+ }
+
+ KUrl::List Kamoso::selectedItems()
+--- a/src/kamoso.h
++++ b/src/kamoso.h
+@@ -36,6 +36,7 @@
+ class WebcamRetriever;
+ class CountdownWidget;
+ class KDirOperator;
++class QItemSelection;
+ class QStackedLayout;
+ class QSplitter;
+ class QPushButton;
+--- a/src/kipiaction.cpp
++++ b/src/kipiaction.cpp
+@@ -19,7 +19,7 @@
+
+ #include "kipiaction.h"
+ #include <libkipi/plugin.h>
+-#include <libkipi/exportinterface.h>
++#include "plugins/exportinterface.h"
+ #include <QDebug>
+ #include "kamoso.h"
+ #include "kamosojobtracker.h"
+@@ -33,7 +33,7 @@
+ void KipiAction::runJob()
+ {
+ KIPI::Plugin* p=pluginInfo->plugin();
+- KIPI::ExportInterface* ep=dynamic_cast<KIPI::ExportInterface*>(p);
++ ExportInterface* ep=dynamic_cast<ExportInterface*>(p);
+
+ KJob* job=ep->exportFiles(i18n("Kamoso"));
+ mKamoso->tracker()->registerJob(job, mKamoso->selectedItems(), icon());
+--- a/src/pluginTester/fakekipiaction.cpp
++++ b/src/pluginTester/fakekipiaction.cpp
+@@ -20,10 +20,10 @@
+ #include "fakekipiaction.h"
+
+ #include <libkipi/plugin.h>
+-#include <libkipi/exportinterface.h>
+ #include <KIO/JobUiDelegate>
+ #include <kjobtrackerinterface.h>
+ #include <KDebug>
++#include "../plugins/exportinterface.h"
+
+ FakeKipiAction::FakeKipiAction(KIPI::PluginLoader::Info* pluginInfo, QObject* parent)
+ : QAction(pluginInfo->icon(), pluginInfo->name(), parent), pluginInfo(pluginInfo)
+@@ -39,7 +39,7 @@
+ void FakeKipiAction::runJob()
+ {
+ KIPI::Plugin* p=pluginInfo->plugin();
+- KIPI::ExportInterface* ep = dynamic_cast<KIPI::ExportInterface*>(p);
++ ExportInterface* ep = dynamic_cast<ExportInterface*>(p);
+
+ m_job = ep->exportFiles(i18n("Kamoso"));
+ KIO::getJobTracker()->registerJob(m_job);
+--- a/src/pluginTester/pluginTester.cpp
++++ b/src/pluginTester/pluginTester.cpp
+@@ -26,6 +26,7 @@
+ #include <KCmdLineArgs>
+ #include <libkipi/plugin.h>
+ #include <libkipi/pluginloader.h>
++#include <libkipi/version.h>
+
+ PluginTester::PluginTester(QObject *parent) : QObject(parent)
+ {
+@@ -41,7 +42,13 @@
+ kurlList.append(KUrl(args->arg(i)));
+ }
+
++#if (KIPI_VERSION >= 0x020000)
++ m_pluginLoader = new KIPI::PluginLoader();
++ m_pluginLoader->setInterface(new FakeKIPIInterface(kurlList));
++ m_pluginLoader->init();
++#else
+ m_pluginLoader = new KIPI::PluginLoader(QStringList(), new FakeKIPIInterface(kurlList), "");
++#endif
+
+ bool found = false;
+ Q_FOREACH(KIPI::PluginLoader::Info *pluginInfo, m_pluginLoader->pluginList()) {
+@@ -58,4 +65,4 @@
+ PluginTester::~PluginTester()
+ {
+ delete m_action;
+-}
+\ No newline at end of file
++}
+--- a/src/plugins/CMakeLists.txt
++++ b/src/plugins/CMakeLists.txt
+@@ -30,5 +30,5 @@
+ # MACRO_OPTIONAL_FIND_PACKAGE(KdepimLibs) # For Calendar (libkcal).
+ # MACRO_OPTIONAL_FIND_PACKAGE(QCA2) # For Shwup.
+
+-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/plugins/youtube)
++include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/plugins ${CMAKE_SOURCE_DIR}/src/plugins/youtube)
+ add_subdirectory(youtube)
+--- /dev/null
++++ b/src/plugins/exportinterface.h
+@@ -0,0 +1,15 @@
++#ifndef EXPORTINTERFACE_H
++#define EXPORTINTERFACE_H
++
++class KJob;
++
++class ExportInterface
++{
++public:
++
++ virtual ~ExportInterface() {}
++
++ virtual KJob* exportFiles(const QString& albumname)=0;
++};
++
++#endif // EXPORTINTERFACE_H
+--- a/src/plugins/youtube/kipiplugin_youtube.h
++++ b/src/plugins/youtube/kipiplugin_youtube.h
+@@ -22,12 +22,11 @@
+ #include <kwallet.h>
+ #include <KIO/Job>
+ #include <libkipi/plugin.h>
+-#include <libkipi/exportinterface.h>
++#include <exportinterface.h>
+
+-class YoutubePlugin : public KIPI::Plugin, public KIPI::ExportInterface
++class YoutubePlugin : public KIPI::Plugin, public ExportInterface
+ {
+ Q_OBJECT
+- Q_INTERFACES(KIPI::ExportInterface)
+ public:
+ YoutubePlugin(QObject* parent, const QVariantList& args);
+ // virtual QAction* thumbnailsAction(const QList<KUrl>& url);
diff --git a/debian/patches/upstream_rename-icons.diff b/debian/patches/upstream_rename-icons.diff
new file mode 100644
index 0000000..5b01c0f
--- /dev/null
+++ b/debian/patches/upstream_rename-icons.diff
@@ -0,0 +1,18 @@
+Author: Rex Dieter <rdieter at fedoraproject.org>
+Description: rename icons to avoid conflict
+ .
+ kamoso's youtube.* icons conflict with kdeplasma-addons' youtube krunner
+ plugin. Avoid that via simple rename here for now.
+Origin: upstream, commit:b8b03322d58a920deac198c2360d65deddccd610
+
+--- a/src/plugins/youtube/kipiplugin_youtube.desktop
++++ b/src/plugins/youtube/kipiplugin_youtube.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ Exec=blubb
+-Icon=youtube
++Icon=kipiplugin_youtube
+ Comment=Upload videos directly to YouTube
+ Comment[cs]=Nahrát videa přímo na YouTube
+ Comment[da]=Upload videoer direkte til YouTube
diff --git a/debian/rules b/debian/rules
index ec024de..ba16675 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,12 @@
#!/usr/bin/make -f
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+
%:
dh $@ --parallel --with kde
+
+override_dh_auto_install:
+ dh_auto_install
+ for icon in `find debian/kamoso -regextype posix-egrep -regex '.*/youtube\.(png|svgz)'`; do \
+ mv --verbose $$icon `echo $$icon | sed -r -e 's,\<youtube\>,kipiplugin_
--
kamoso packaging
More information about the pkg-kde-commits
mailing list