[DebianGIS-dev] r1218 - packages/gpsdrive/trunk/debian/patches

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2007-10-17 12:20:13 +0000 (Wed, 17 Oct 2007)
New Revision: 1218

Modified:
   packages/gpsdrive/trunk/debian/patches/01-make.dpatch
Log:
Calling pod2man causes the manpage patch to fail now and then.
Should be fixed in the pod section anyway.


Modified: packages/gpsdrive/trunk/debian/patches/01-make.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/01-make.dpatch	2007-10-17 12:01:26 UTC (rev 1217)
+++ packages/gpsdrive/trunk/debian/patches/01-make.dpatch	2007-10-17 12:20:13 UTC (rev 1218)
@@ -9,7 +9,7 @@
 @DPATCH@
 diff -urNad gpsdrive-2.10~pre4~/Makefile.am gpsdrive-2.10~pre4/Makefile.am
 --- gpsdrive-2.10~pre4~/Makefile.am	2007-09-15 15:12:07.000000000 +0000
-+++ gpsdrive-2.10~pre4/Makefile.am	2007-10-16 11:54:09.000000000 +0000
++++ gpsdrive-2.10~pre4/Makefile.am	2007-10-17 11:37:55.000000000 +0000
 @@ -1,7 +1,7 @@
  # Makefile.am in main dir
  #AUTOMAKE_OPTIONS=dist-bzip2
@@ -21,7 +21,7 @@
  
 diff -urNad gpsdrive-2.10~pre4~/Makefile.in gpsdrive-2.10~pre4/Makefile.in
 --- gpsdrive-2.10~pre4~/Makefile.in	2007-09-15 18:51:27.000000000 +0000
-+++ gpsdrive-2.10~pre4/Makefile.in	2007-10-16 11:54:09.000000000 +0000
++++ gpsdrive-2.10~pre4/Makefile.in	2007-10-17 11:37:55.000000000 +0000
 @@ -249,7 +249,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
@@ -33,7 +33,7 @@
  # I'm not shure if this is needed
 diff -urNad gpsdrive-2.10~pre4~/configure.ac gpsdrive-2.10~pre4/configure.ac
 --- gpsdrive-2.10~pre4~/configure.ac	2007-09-15 17:05:51.000000000 +0000
-+++ gpsdrive-2.10~pre4/configure.ac	2007-10-16 11:54:09.000000000 +0000
++++ gpsdrive-2.10~pre4/configure.ac	2007-10-17 11:37:55.000000000 +0000
 @@ -36,13 +36,13 @@
  
  wLL_LINGUAS="da de de_AT es fr hu it ja nl ru sk sv tr"
@@ -91,7 +91,7 @@
  #AC_PROG_PERL_MODULES(File::Slurp , ,  AC_MSG_ERROR(Need Perl module File::Slurp))
 diff -urNad gpsdrive-2.10~pre4~/data/map-icons/Makefile.am gpsdrive-2.10~pre4/data/map-icons/Makefile.am
 --- gpsdrive-2.10~pre4~/data/map-icons/Makefile.am	2007-09-15 18:50:48.000000000 +0000
-+++ gpsdrive-2.10~pre4/data/map-icons/Makefile.am	2007-10-16 11:54:29.000000000 +0000
++++ gpsdrive-2.10~pre4/data/map-icons/Makefile.am	2007-10-17 11:37:55.000000000 +0000
 @@ -474,92 +474,6 @@
  svg_wlan_DATA = svg/wlan/closed.svg svg/wlan/open.svg svg/wlan/pay.svg svg/wlan/wep.svg
  svg_wlandir = $(datadir)/map-icons/svg/wlan
@@ -242,19 +242,31 @@
  	overview.de.html \
 diff -urNad gpsdrive-2.10~pre4~/man/Makefile.am gpsdrive-2.10~pre4/man/Makefile.am
 --- gpsdrive-2.10~pre4~/man/Makefile.am	2007-09-15 15:12:06.000000000 +0000
-+++ gpsdrive-2.10~pre4/man/Makefile.am	2007-10-16 11:54:09.000000000 +0000
-@@ -22,7 +22,7 @@
++++ gpsdrive-2.10~pre4/man/Makefile.am	2007-10-17 11:38:14.000000000 +0000
+@@ -17,19 +17,13 @@
+ EXTRA_DIST = CMakeLists.txt
+ 
+ convert-waypoints.pl.1: $(srcdir)/../scripts/convert-waypoints.pl
+-	pod2man $? >$@ 
+ 
  gpsdrive-init-db.pl.1: $(srcdir)/../scripts/gpsdrive-init-db.pl
- 	pod2man $? >$@ 
+-	pod2man $? >$@ 
  
 -gpsfetchmap.pl.1: $(srcdir)/../scripts/gpsfetchmap.pl
+-	pod2man $? >$@ 
 +gpsfetchmap.pl.1: $(srcdir)/../debian/scripts/gpsfetchmap.pl
- 	pod2man $? >$@ 
  
  gpspoint2gpsdrive.pl.1: $(srcdir)/../scripts/gpspoint2gpsdrive.pl
+-	pod2man $? >$@ 
+ 
+ poi-manager.pl.1: $(srcdir)/../scripts/poi-manager.pl
+-	pod2man $? >$@ 
+ 
+ geoinfo.pl.1: $(srcdir)/../scripts/geoinfo.pl
+-	pod2man $? >$@ 
 diff -urNad gpsdrive-2.10~pre4~/scripts/Makefile.am gpsdrive-2.10~pre4/scripts/Makefile.am
 --- gpsdrive-2.10~pre4~/scripts/Makefile.am	2007-09-15 15:11:59.000000000 +0000
-+++ gpsdrive-2.10~pre4/scripts/Makefile.am	2007-10-16 11:54:09.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/Makefile.am	2007-10-17 11:37:55.000000000 +0000
 @@ -5,7 +5,7 @@
  dist_bin_SCRIPTS=	\
  	wpcvt wpget gpspoint2gpsdrive.pl geo-nearest geocache2way \