Merge lp:~mhall119/ubuntu/precise/geany/add_keywords into lp:ubuntu/precise/geany

[Michael Hall]

Adds searchable keywords to Geany's .desktop file

[Didier Roche (didrocks)]

Hey Michael, did you sent the fix upstream? I normally do that for external contributor but I think we should show the lead there (if you did so, you should state it either in the merge req or link the upstream bug tracker in the bug report)

review: Needs Information

[Didier Roche (didrocks)]

btw, repeating the same information I did on other merge requests:

thanks for your contribution to ubuntu and for this merge requests :)

Some notes about it:
- we normally comment the changes in the debian/changelog file. For that, we are using debchange -i and write something like:
- move the .desktop file change into something the patch system of the package can deal with

http://developer.ubuntu.com/packaging/html/udd-patchsys.html#edit-patch is something which might interest you in this regard. This is the end result: http://paste.ubuntu.com/855106/

[Michael Hall (mhall119)]

Upstream has both a bug report and a git pull request.

https://sourceforge.net/tracker/?func=detail&aid=3495064&group_id=153444&atid=787794
https://github.com/geany/geany/pull/31

[Didier Roche (didrocks)]

Can you link it to the bug report please? (and fix the other notes)

[Sebastien Bacher (seb128)]

Thank you for your work

Setting to "Work in progress" please set back to "Needs review" when you update so it shows again on the sponsoring list

Didn't we agree to not patch universe softwares this cycle?

Your patch upstream needs to be updated as well:
- to use the current spec format
- the most recent patch on https://github.com/mhall119/geany/commit/1cea979bd151018f42cd32eb1d13bd90688e0ae9 drop the list but keep the TargetEnvironment?
- you need to prefix Name with a _, i.e "_Name=" to be translatable

[lp:~mhall119/ubuntu/precise/geany/add_keywords]

33. By Michael Hall on 2012-03-05

Add details to patch file, add LP bug # to changelog

[Michael Hall (mhall119)]

We agreed not to patch Quicklists, because their strings were exposed to the user, and a lack of translation would be noticeable. Keywords are not displayed, only used in searches, so a lack of translation wouldn't have any effect.

[Martin Pitt (pitti)]

Seems fine to me, thanks! Will merge with the changelog typo fixed (LP bug ref) and fixing the patch headers for DEP-3.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-24 19:30:41 +0000
+++ debian/changelog	2012-03-05 16:54:59 +0000
@@ -1,3 +1,9 @@
+geany (0.21.dfsg-1ubuntu4) precise; urgency=low
+
+  * debian/patches/add_keywords.patch: Add search keywords (LP: 942154)
+
+ -- Michael Hall <[e-mail]>  Mon, 05 Mar 2012 11:16:51 -0500
+
 geany (0.21.dfsg-1ubuntu3) precise; urgency=low
 
   * Revert previous change, the string is basically un-translatable since 

=== added file 'debian/patches/add_keywords.patch'
--- debian/patches/add_keywords.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/add_keywords.patch	2012-03-05 16:54:59 +0000
@@ -0,0 +1,12 @@
+## Description: Adds search keyworkds to .desktop file
+## Origin/Author: Michael Hall <[e-mail]>
+## Bug: https://bugs.launchpad.net/ubuntu/+source/geany/+bug/942154 
+Index: b/geany.desktop.in
+===================================================================
+--- a/geany.desktop.in
++++ b/geany.desktop.in
+@@ -10,3 +10,4 @@
+ Categories=GTK;Development;IDE;
+ MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff;
+ StartupNotify=true
++_Keywords=Code;Editor;Programming;

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-24 19:30:41 +0000
+++ debian/patches/series	2012-03-05 16:54:59 +0000
@@ -5,3 +5,4 @@
 20_load_plugins_from_all_paths.patch
 20_use_evince_viewer.patch
 20_use_x_terminal_emulator.patch
+add_keywords.patch