Merge lp:~peter.ahlgren/ubuntu/raring/obconf/fix-for-1179969 into lp:ubuntu/raring/obconf

Proposed by Peter Ahlgren on 2013-06-18
Status: Rejected
Rejected by: Martin Pitt on 2013-07-03
Proposed branch: lp:~peter.ahlgren/ubuntu/raring/obconf/fix-for-1179969
Merge into: lp:ubuntu/raring/obconf
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
obconf.desktop (+1/-1)
To merge this branch: bzr merge lp:~peter.ahlgren/ubuntu/raring/obconf/fix-for-1179969
Reviewer Review Type Date Requested Status
Dmitry Shachnev Needs Fixing on 2013-06-18
Ubuntu branches 2013-06-18 Pending
Review via email: mp+170065@code.launchpad.net
To post a comment you must log in.
Dmitry Shachnev (mitya57) wrote :

* Please forward the fix upstream, I don't think we want to carry a delta (against Debian) because of such a minor fix.
* The source format is 3.0 (quilt), so you shouldn't change the upstream source directly, but via a patch instead. See http://developer.ubuntu.com/packaging/html/patches-to-packages.html for details.
* The version should be -1ubuntu1, not -1ubuntu2. Also, please target lp:ubuntu/obconf instead of lp:ubuntu/raring/obconf.
* Please remove empty line from the list of changes.

review: Needs Fixing

Unmerged revisions

7. By Peter Ahlgren on 2013-06-18

* obconf.desktop Changed Exec=obconf %f to Exec=obconf :LP #1179969
*

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-04-23 07:36:17 +0000
3+++ debian/changelog 2013-06-18 12:27:35 +0000
4@@ -1,3 +1,10 @@
5+obconf (1:2.0.3+20110805+debian-1ubuntu2) UNRELEASED; urgency=low
6+
7+ * obconf.desktop Changed Exec=obconf %f to Exec=obconf :LP #1179969
8+ *
9+
10+ -- Peter Ahlgren <ahlgren1234@gmail.com> Tue, 18 Jun 2013 14:01:53 +0200
11+
12 obconf (1:2.0.3+20110805+debian-1) unstable; urgency=low
13
14 * Merging upstream version 2.0.3+20110805+debian.
15
16=== modified file 'obconf.desktop'
17--- obconf.desktop 2011-12-15 23:15:55 +0000
18+++ obconf.desktop 2013-06-18 12:27:35 +0000
19@@ -14,7 +14,7 @@
20 Comment[zh_TW]=管理 Openbox 組態設定
21 Comment[pt_BR]=Configure as opções do Openb
22 Icon=obconf
23-Exec=obconf %f
24+Exec=obconf
25 Categories=Settings;DesktopSettings;GTK;
26 MimeType=application/x-openbox-theme;
27 StartupNotify=true

Subscribers

People subscribed via source and target branches

to all changes: