Ubuntu

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

Proposed by Michael Hall on 2012-02-27
Status: Merged
Merged at revision: 32
Proposed branch: lp:~mhall119/ubuntu/precise/geany/add_keywords
Merge into: lp:ubuntu/precise/geany
Diff against target: 39 lines (+19/-0) 3 files modified
To merge this branch: bzr merge lp:~mhall119/ubuntu/precise/geany/add_keywords
Reviewer Review Type Date Requested Status
Martin Pitt 2012-02-27 Approve on 2012-03-19
Didier Roche Needs Information on 2012-02-29
Review via email: mp+94825@code.launchpad.net

Description of the Change

Adds searchable keywords to Geany's .desktop file

To post a comment you must log in.
Didier Roche (didrocks) wrote :

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) wrote :

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/

Didier Roche (didrocks) wrote :

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

Sebastien Bacher (seb128) wrote :

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

33. By Michael Hall on 2012-03-05

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

Michael Hall (mhall119) wrote :

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) wrote :

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

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-02-24 19:30:41 +0000
3+++ debian/changelog 2012-03-05 16:54:59 +0000
4@@ -1,3 +1,9 @@
5+geany (0.21.dfsg-1ubuntu4) precise; urgency=low
6+
7+ * debian/patches/add_keywords.patch: Add search keywords (LP: 942154)
8+
9+ -- Michael Hall <mhall119@ubuntu.com> Mon, 05 Mar 2012 11:16:51 -0500
10+
11 geany (0.21.dfsg-1ubuntu3) precise; urgency=low
12
13 * Revert previous change, the string is basically un-translatable since
14
15=== added file 'debian/patches/add_keywords.patch'
16--- debian/patches/add_keywords.patch 1970-01-01 00:00:00 +0000
17+++ debian/patches/add_keywords.patch 2012-03-05 16:54:59 +0000
18@@ -0,0 +1,12 @@
19+## Description: Adds search keyworkds to .desktop file
20+## Origin/Author: Michael Hall <mhall119@ubuntu.com>
21+## Bug: https://bugs.launchpad.net/ubuntu/+source/geany/+bug/942154
22+Index: b/geany.desktop.in
23+===================================================================
24+--- a/geany.desktop.in
25++++ b/geany.desktop.in
26+@@ -10,3 +10,4 @@
27+ Categories=GTK;Development;IDE;
28+ 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;
29+ StartupNotify=true
30++_Keywords=Code;Editor;Programming;
31
32=== modified file 'debian/patches/series'
33--- debian/patches/series 2012-02-24 19:30:41 +0000
34+++ debian/patches/series 2012-03-05 16:54:59 +0000
35@@ -5,3 +5,4 @@
36 20_load_plugins_from_all_paths.patch
37 20_use_evince_viewer.patch
38 20_use_x_terminal_emulator.patch
39+add_keywords.patch

Subscribers

People subscribed via source and target branches

to all changes: