Merge lp:~bkerensa/ubuntu/quantal/ushare/fix-for-1044024 into lp:ubuntu/quantal/ushare

[Benjamin Kerensa]

Fix for scripts/ushare: typo in log_warning_msg

[Dimitri John Ledkov (xnox)]

The typo fix is correct. Thanks a lot. But there are some points about packaging it:

= must fix =
* Please set correct Maintainer field. As there are still ubuntu changes to the package, the maintainer field should stay as Ubuntu Developers. You can use `update-maintainer` utility to fix it up for you

* I cannot build the source package from your branch, because upstream sources are modified directly, instead of using a patch. Please generate a patch and add it to the packaging. You can do this with `$ dpkg-source commit`, don't forget to fill in the headers.

= minor =
* Please use `debcommit` utility when committing your changes to the packaging branches. Not only does it reuse debian/changelog as the commit message it also correctly adds --fixes lp:NXXXYYY such that branch gets auto-linked to the bug reports. This is a minor point.

review: Needs Fixing

[Benjamin Kerensa (bkerensa)]

Thats odd the changes to the maintainer field etc were not ones I made.

[Didier Roche-Tolomelli (didrocks)]

22 -Maintainer: Ubuntu Developers <email address hidden>
23 +Maintainer: Alexis Saettler <email address hidden>
24 Uploaders: Alexis Saettler <email address hidden>
25 -XSBC-Original-Maintainer: Alexis Saettler <email address hidden>

-> yeah, you need to change back the maintainer field to what it was. Debian asked that they are not marked as the maintainer for ubuntu packages.

review: Needs Fixing

[Benjamin Kerensa (bkerensa)]

This is now fixed.

review: Needs Resubmitting

[Didier Roche-Tolomelli (didrocks)]

Hum, this change is inline without any patch system right? I can't even build it as debian/sources 3 is telling me:

dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building ushare using existing ./ushare_1.1a.orig.tar.gz
dpkg-source: info: local changes detected, the modified files are:
 ushare-1.1a/scripts/ushare
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/ushare_1.1a-0ubuntu10.diff.tmDlMy

How did you built it?
Please stash that in a quilt patch as it's what the package is supporting :)

review: Needs Fixing

Unmerged revisions

12. By Benjamin Kerensa on 2012-09-28

Fix Maintainer

11. By Benjamin Kerensa on 2012-09-25

Fixed scripts/ushare typo

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-02 20:37:14 +0000
+++ debian/changelog	2012-09-28 09:19:20 +0000
@@ -1,3 +1,9 @@
+ushare (1.1a-0ubuntu10) quantal; urgency=low
+
+  * scripts/ushare: Fixed Typo in log_warning_msg (LP: #1044024) 
+
+ -- Benjamin Kerensa <[e-mail]>  Tue, 25 Sep 2012 01:43:46 -0700
+
 ushare (1.1a-0ubuntu9) quantal; urgency=low
 
   * debian/patches/fix-implicit-pointers.patch:

=== modified file 'scripts/ushare'
--- scripts/ushare	2012-01-03 23:35:53 +0000
+++ scripts/ushare	2012-09-28 09:19:20 +0000
@@ -48,7 +48,7 @@
   start)
     log_daemon_msg "Starting $DESC: $NAME"
     if ! $(check_shares); then
-      log_warning_msg "No shares avalaible ..."
+      log_warning_msg "No shares available ..."
       log_end_msg 0
     else
       checkpid