Merge lp:~stijnbrouwers/ubuntu/quantal/kamoso/fix-missing-icons into lp:ubuntu/quantal/kamoso

[Stijn Brouwers]

Bug fix : missing icon
Icon 'webcamreceive' did not exist anymore, it has been replaced with 'digikam'

[Sebastien Bacher (seb128)]

Thank you for your work, some comments:

- you targetted the wrong serie, you should pick raring and not quantal as a target branch

- your diff is adding a kamoso/src/photoshootmode.cpp~, that seems buggy

- to close a bug on update you want to use the syntax "lp: #<bug number>" in the changelog

- did you upstream that bug fix?

Setting to Work In Progress, it would be nice if you could address those issues and set it back to "Needs review"

review: Needs Fixing

[Stijn Brouwers (stijnbrouwers)]

Hi, thanks for the review!
1. I changed it in the debian/changelog file, should i also change the branch name? If so,... how? :-)
2. Changed it, it is a file that was automatically created by gedit, and it slipped by me.
3. Changed it
4. No, haven't upstreamed it yet, I just received a document about how to do this, I will look into it as soon as possible. When I did, I will change the status of this merge-request back to 'Needs review'.

With kind regards,

Stijn Brouwers

[Sebastien Bacher (seb128)]

1. you should be able to edit the merge request to change the branch by clicking on the top right corner on "Resubmit proposal" and by changing the url in the page it displays then

[Stijn Brouwers (stijnbrouwers)]

The bug has been reported upstream :
https://bugs.kde.org/show_bug.cgi?id=310938

Unmerged revisions

22. By Stijn Brouwers on 2012-11-30

debian/patches/fix-missing-icons.patch: removed photoshootmode.cpp~
Related to Bug (lp: #1074961) :

21. By Stijn Brouwers on 2012-11-17

  Related to Bug #1074961 :
  https://bugs.launchpad.net/ubuntu/+source/kamoso/+bug/1074961
->Changed : photoshootmode.cpp : line 76
  Use icon 'digikam' because the old icon ('webcamreceive') was removed

20. By Stijn Brouwers on 2012-11-17

* debian/patches/fix-missing-icons.patch: Some icons from the interface were
  missing.
- Add patch
- Related to Bug #1074961
 * https://bugs.launchpad.net/ubuntu/+source/kamoso/+bug/1074961

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-25 14:50:10 +0000
+++ debian/changelog	2012-11-30 15:43:39 +0000
@@ -1,3 +1,20 @@
+kamoso (2.0.2-1ubuntu4) raring; urgency=low
+
+  * debian/patches/fix-missing-icons.patch: removed photoshootmode.cpp~
+
+ -- Stijn Brouwers <[e-mail]>  Fri, 30 Nov 2012 16:35:55 +0100
+
+kamoso (2.0.2-1ubuntu3) raring; urgency=low
+
+  * debian/patches/fix-missing-icons.patch: Some icons from the interface were
+    missing. 
+    Related to Bug (lp: #1074961) : 
+    https://bugs.launchpad.net/ubuntu/+source/kamoso/+bug/1074961
+  ->Changed : photoshootmode.cpp : line 76
+    Use icon 'digikam' because the old icon ('webcamreceive') was removed 
+
+ -- Stijn Brouwers <[e-mail]>  Sat, 17 Nov 2012 13:51:26 +0100
+
 kamoso (2.0.2-1ubuntu2) quantal; urgency=low
 
   * Suggest instead of recommend kipi-plugins since it has a large set of
 
=== added file 'debian/patches/fix-missing-icons.patch'
--- debian/patches/fix-missing-icons.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-missing-icons.patch	2012-11-30 15:43:39 +0000
@@ -0,0 +1,16 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: fix-missing-icons/src/photoshootmode.cpp
+===================================================================
+--- fix-missing-icons.orig/src/photoshootmode.cpp	2012-11-30 16:32:08.844729000 +0100
++++ fix-missing-icons/src/photoshootmode.cpp	2012-11-30 16:35:26.888020292 +0100
+@@ -73,7 +73,7 @@
+ 
+ QIcon PhotoShootMode::icon() const
+ {
+-    return KIcon("webcamreceive");
++    return KIcon("digikam");
+ }
+ 
+ QString PhotoShootMode::name() const
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-06-10 10:44:16 +0000
+++ debian/patches/series	2012-11-30 15:43:39 +0000
@@ -2,3 +2,4 @@
 proper_version_kaboutdata.diff
 dont_build_plugin_tester.diff
 fix_ftbfs_libkipi9.patch
+fix-missing-icons.patch