[SCM] kamoso packaging branch, master, updated. b70f12db91dfb9e54f0a9b6905592e8cd4f66c23

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kamoso.git;a=commitdiff;h=ab440f9

The following commit has been merged in the master branch:
commit ab440f94caa2f10a335fda667aac17298e78bf0e
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Jan 22 21:27:54 2013 +0100

    Remove about_dialog.diff, applied upstream.
---
 debian/changelog                 |    1 +
 debian/patches/about_dialog.diff |   27 ---------------------------
 debian/patches/series            |    1 -
 3 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db2871d..6525f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kamoso (2.0.2++git20130122-2) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Remove about_dialog.diff, applied upstream.
   * Bump debhelper compatibility level to 9. This enables the hardening flags.
   * Add watch file.
   * Update Vcs-* fields.
diff --git a/debian/patches/about_dialog.diff b/debian/patches/about_dialog.diff
deleted file mode 100644
index b2e4704..0000000
--- a/debian/patches/about_dialog.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-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/series b/debian/patches/series
index 79e0bee..784b8ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-about_dialog.diff
 proper_version_kaboutdata.diff
 dont_build_plugin_tester.diff

-- 
kamoso packaging