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

[Peter Ahlgren]

[Dmitry Shachnev (mitya57)]

* 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
*

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-23 07:36:17 +0000
+++ debian/changelog	2013-06-18 12:27:35 +0000
@@ -1,3 +1,10 @@
+obconf (1:2.0.3+20110805+debian-1ubuntu2) UNRELEASED; urgency=low
+
+  * obconf.desktop Changed Exec=obconf %f to Exec=obconf :LP #1179969 
+  * 
+
+ -- Peter Ahlgren <[e-mail]>  Tue, 18 Jun 2013 14:01:53 +0200
+
 obconf (1:2.0.3+20110805+debian-1) unstable; urgency=low
 
   * Merging upstream version 2.0.3+20110805+debian.
 
=== modified file 'obconf.desktop'
--- obconf.desktop	2011-12-15 23:15:55 +0000
+++ obconf.desktop	2013-06-18 12:27:35 +0000
@@ -14,7 +14,7 @@
 Comment[zh_TW]=管理 Openbox 組態設定
 Comment[pt_BR]=Configure as opções do Openb
 Icon=obconf
-Exec=obconf %f
+Exec=obconf 
 Categories=Settings;DesktopSettings;GTK;
 MimeType=application/x-openbox-theme;
 StartupNotify=true