[Pkg-gtkpod-devel] r303 - in gtkpod/trunk/debian: . patches

[djpig at alioth.debian.org]

Author: djpig
Date: 2008-02-17 15:03:33 +0000 (Sun, 17 Feb 2008)
New Revision: 303

Added:
   gtkpod/trunk/debian/patches/10_usage--auto.dpatch
Modified:
   gtkpod/trunk/debian/changelog
   gtkpod/trunk/debian/gtkpod.pod
   gtkpod/trunk/debian/rules
Log:
* Add 10_usage--auto.dpatch. -a/--auto was removed, so
  don't advertise it in the usage output. Also adapt
  the man page. (Closes: #466127)


Modified: gtkpod/trunk/debian/changelog
===================================================================
--- gtkpod/trunk/debian/changelog	2008-02-17 14:13:08 UTC (rev 302)
+++ gtkpod/trunk/debian/changelog	2008-02-17 15:03:33 UTC (rev 303)
@@ -3,6 +3,9 @@
   * Call dh_icons. Suggested by Sikon (Closes: #466126)
   * Bump debhelper compat level to 6 and adapt
     build-dependencies.
+  * Add 10_usage--auto.dpatch. -a/--auto was removed, so
+    don't advertise it in the usage output. Also adapt
+    the man page. (Closes: #466127)
 
  -- Frank Lichtenheld <djpig at debian.org>  Sun, 17 Feb 2008 15:10:05 +0100
 

Modified: gtkpod/trunk/debian/gtkpod.pod
===================================================================
--- gtkpod/trunk/debian/gtkpod.pod	2008-02-17 14:13:08 UTC (rev 302)
+++ gtkpod/trunk/debian/gtkpod.pod	2008-02-17 15:03:33 UTC (rev 303)
@@ -4,7 +4,7 @@
 
 =head1 SYNOPSIS
 
-B<gtkpod> [B<-h>] [B<-a>] [B<-c>] [B<-o>] [B<-m> I<path>] [B<-p> I<filename>] [B<--hash> I<filename>] 
+B<gtkpod> [B<-h>] [B<-c>] [B<-o>] [B<-m> I<path>] [B<-p> I<filename>] [B<--hash> I<filename>] 
 
 =head1 DESCRIPTION
 
@@ -32,10 +32,6 @@
 
 Print gtkpod hash for file I<filename>.
 
-=item B<-a>, B<--auto>
-
-Import database automatically after start.
-
 =back
 
 =head1 FILES

Added: gtkpod/trunk/debian/patches/10_usage--auto.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/10_usage--auto.dpatch	                        (rev 0)
+++ gtkpod/trunk/debian/patches/10_usage--auto.dpatch	2008-02-17 15:03:33 UTC (rev 303)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_usage--auto.dpatch by  <djpig at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/src/prefs.c trunk/src/prefs.c
+--- trunk~/src/prefs.c	2008-02-17 15:36:26.000000000 +0100
++++ trunk/src/prefs.c	2008-02-17 15:37:15.000000000 +0100
+@@ -360,8 +360,6 @@
+   locale_fprintf(fp, _("  --hash <file>:print gtkpod hash for file\n"));
+   locale_fprintf(fp, _("  -m path:      define the mountpoint of your iPod\n"));
+   locale_fprintf(fp, _("  --mountpoint: same as '-m'.\n"));
+-  locale_fprintf(fp, _("  -a:           import database automatically after start.\n"));
+-  locale_fprintf(fp, _("  --auto:       same as '-a'.\n"));
+ }
+ 
+ /* Parse commandline based options */


Property changes on: gtkpod/trunk/debian/patches/10_usage--auto.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: gtkpod/trunk/debian/rules
===================================================================
--- gtkpod/trunk/debian/rules	2008-02-17 14:13:08 UTC (rev 302)
+++ gtkpod/trunk/debian/rules	2008-02-17 15:03:33 UTC (rev 303)
@@ -23,7 +23,7 @@
 	dh_testdir
 
 	$(MAKE)
-	pod2man --release "gtkpod 0.99.10" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1
+	pod2man --release "gtkpod 0.99.12" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1
 	touch build-stamp
 
 clean: unpatch