Author: nd-guest Date: 2007-09-24 20:29:11 +0000 (Mon, 24 Sep 2007) New Revision: 1103
Added: packages/gpsdrive/trunk/debian/patches/01-make.dpatch packages/gpsdrive/trunk/debian/patches/20-homedir.dpatch Modified: packages/gpsdrive/trunk/debian/patches/00list Log: * Removed old patches from 00list. * Added patch to build the package. * Patch mapnik.cpp to not overwrite files in homedir. Modified: packages/gpsdrive/trunk/debian/patches/00list =================================================================== --- packages/gpsdrive/trunk/debian/patches/00list 2007-09-24 20:27:02 UTC (rev 1102) +++ packages/gpsdrive/trunk/debian/patches/00list 2007-09-24 20:29:11 UTC (rev 1103) @@ -1,6 +1,9 @@ -01old.dpatch -02configure.dpatch -03manpage.dpatch -04missing_includes.dpatch -05start_gpsd.dpatch -06libtool.dpatch +#01old.dpatch +#02configure.dpatch +#03manpage.dpatch +#04missing_includes.dpatch +#05start_gpsd.dpatch +#06libtool.dpatch +01-make +10-mapnikdir +20-homedir Added: packages/gpsdrive/trunk/debian/patches/01-make.dpatch =================================================================== --- packages/gpsdrive/trunk/debian/patches/01-make.dpatch (rev 0) +++ packages/gpsdrive/trunk/debian/patches/01-make.dpatch 2007-09-24 20:29:11 UTC (rev 1103) @@ -0,0 +1,90 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-make.dpatch by Andreas Putzo <[EMAIL PROTECTED]> +## +## DP: Remove some SUBDIRS from Makefile.am +## DP: Remove perl checks from configure.ac +## DP: Add autogen.sh + [EMAIL PROTECTED]@ +diff -urNad gpsdrive-2.10~pre4~/Makefile.am gpsdrive-2.10~pre4/Makefile.am +--- gpsdrive-2.10~pre4~/Makefile.am 2007-09-24 19:41:57.000000000 +0000 ++++ gpsdrive-2.10~pre4/Makefile.am 2007-09-24 19:42:04.000000000 +0000 +@@ -1,7 +1,7 @@ + # Makefile.am in main dir + #AUTOMAKE_OPTIONS=dist-bzip2 + +-SUBDIRS = src man scripts data Documentation debian DSL gentoo po tests ++SUBDIRS = src man scripts data Documentation po + DIST_SUBDIRS = $(SUBDIRS) + + +diff -urNad gpsdrive-2.10~pre4~/Makefile.in gpsdrive-2.10~pre4/Makefile.in +--- gpsdrive-2.10~pre4~/Makefile.in 2007-09-24 19:41:58.000000000 +0000 ++++ gpsdrive-2.10~pre4/Makefile.in 2007-09-24 19:42:04.000000000 +0000 +@@ -248,7 +248,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = src man scripts data Documentation debian DSL gentoo po tests ++SUBDIRS = src man scripts data Documentation po + DIST_SUBDIRS = $(SUBDIRS) + + # 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-24 19:41:58.000000000 +0000 ++++ gpsdrive-2.10~pre4/configure.ac 2007-09-24 19:42:04.000000000 +0000 +@@ -36,13 +36,13 @@ + + wLL_LINGUAS="da de de_AT es fr hu it ja nl ru sk sv tr" + +-AC_CONFIG_FILES([DSL/Makefile]) ++dnl AC_CONFIG_FILES([DSL/Makefile]) + AC_CONFIG_FILES([Documentation/Makefile]) + AC_CONFIG_FILES([Makefile]) + AC_CONFIG_FILES([data/Makefile]) + AC_CONFIG_FILES([data/map-icons/Makefile]) +-AC_CONFIG_FILES([debian/Makefile]) +-AC_CONFIG_FILES([gentoo/Makefile]) ++dnl AC_CONFIG_FILES([debian/Makefile]) ++dnl AC_CONFIG_FILES([gentoo/Makefile]) + AC_CONFIG_FILES([man/Makefile]) + AC_CONFIG_FILES([man/de/Makefile]) + AC_CONFIG_FILES([man/es/Makefile]) +@@ -54,7 +54,7 @@ + AC_CONFIG_FILES([src/Makefile]) + AC_CONFIG_FILES([src/lib_map/Makefile]) + AC_CONFIG_FILES([src/util/Makefile]) +-AC_CONFIG_FILES([tests/Makefile]) ++dnl AC_CONFIG_FILES([tests/Makefile]) + + AC_CHECK_FUNCS([bzero]) + AC_CHECK_FUNCS([floor]) +@@ -667,17 +667,17 @@ + PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` + AC_SUBST(PERL_PACKAGE_DIR) + +-AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename)) +-AC_PROG_PERL_MODULES(File::Copy , , AC_MSG_ERROR(Need Perl module File::Copy)) +-AC_PROG_PERL_MODULES(File::Path , , AC_MSG_ERROR(Need Perl module File::Path)) +-AC_PROG_PERL_MODULES(File::Temp , , AC_MSG_ERROR(Need Perl module File::Temp)) +-AC_PROG_PERL_MODULES(Getopt::Long , , AC_MSG_ERROR(Need Perl module Getopt::Long)) +-AC_PROG_PERL_MODULES(HTTP::Request , , AC_MSG_ERROR(Need Perl module HTTP::Request)) +-AC_PROG_PERL_MODULES(HTTP::Request::Common , , AC_MSG_ERROR(Need Perl module HTTP::Request::Common)) +-AC_PROG_PERL_MODULES(IO::File , , AC_MSG_ERROR(Need Perl module IO::File)) +-AC_PROG_PERL_MODULES(LWP::Simple , , AC_MSG_ERROR(Need Perl module LWP::Simple)) +-AC_PROG_PERL_MODULES(LWP::UserAgent , , AC_MSG_ERROR(Need Perl module LWP::UserAgent)) +-AC_PROG_PERL_MODULES(Math::Trig , , AC_MSG_ERROR(Need Perl module Math::Trig)) ++#AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename)) ++#AC_PROG_PERL_MODULES(File::Copy , , AC_MSG_ERROR(Need Perl module File::Copy)) ++#AC_PROG_PERL_MODULES(File::Path , , AC_MSG_ERROR(Need Perl module File::Path)) ++#AC_PROG_PERL_MODULES(File::Temp , , AC_MSG_ERROR(Need Perl module File::Temp)) ++#AC_PROG_PERL_MODULES(Getopt::Long , , AC_MSG_ERROR(Need Perl module Getopt::Long)) ++#AC_PROG_PERL_MODULES(HTTP::Request , , AC_MSG_ERROR(Need Perl module HTTP::Request)) ++#AC_PROG_PERL_MODULES(HTTP::Request::Common , , AC_MSG_ERROR(Need Perl module HTTP::Request::Common)) ++#AC_PROG_PERL_MODULES(IO::File , , AC_MSG_ERROR(Need Perl module IO::File)) ++#AC_PROG_PERL_MODULES(LWP::Simple , , AC_MSG_ERROR(Need Perl module LWP::Simple)) ++#AC_PROG_PERL_MODULES(LWP::UserAgent , , AC_MSG_ERROR(Need Perl module LWP::UserAgent)) ++#AC_PROG_PERL_MODULES(Math::Trig , , AC_MSG_ERROR(Need Perl module Math::Trig)) + + # These will only be needed for Building GpsDrive Packages + #AC_PROG_PERL_MODULES(File::Slurp , , AC_MSG_ERROR(Need Perl module File::Slurp)) Property changes on: packages/gpsdrive/trunk/debian/patches/01-make.dpatch ___________________________________________________________________ Name: svn:executable + * Added: packages/gpsdrive/trunk/debian/patches/20-homedir.dpatch =================================================================== --- packages/gpsdrive/trunk/debian/patches/20-homedir.dpatch (rev 0) +++ packages/gpsdrive/trunk/debian/patches/20-homedir.dpatch 2007-09-24 20:29:11 UTC (rev 1103) @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20-homedir.dpatch by Andreas Putzo <[EMAIL PROTECTED]> +## +## DP: Do not overwrite ~/.gpsdrive/osm.xml when gpsdrive is started. + [EMAIL PROTECTED]@ +diff -urNad gpsdrive-2.10~pre4~/src/mapnik.cpp gpsdrive-2.10~pre4/src/mapnik.cpp +--- gpsdrive-2.10~pre4~/src/mapnik.cpp 2007-09-17 07:48:41.000000000 +0000 ++++ gpsdrive-2.10~pre4/src/mapnik.cpp 2007-09-17 07:50:02.000000000 +0000 +@@ -165,20 +165,21 @@ + } + + // load files +- +- ifstream InputXML (mapnik_config_file.c_str()); +- ofstream DestXML (Dest); ++ if ( ! boost:: filesystem::exists(Dest) ) { ++ ifstream InputXML (mapnik_config_file.c_str()); ++ ofstream DestXML (Dest); + +- if (InputXML && DestXML) { +- if (InputXML.is_open()) { +- string s ; +- while (getline(InputXML, s)) { +- DestXML << ReplaceString("@USER@", Username, s) << endl; +- } +- } +- } +- InputXML.close(); +- DestXML.close(); ++ if (InputXML && DestXML) { ++ if (InputXML.is_open()) { ++ string s ; ++ while (getline(InputXML, s)) { ++ DestXML << ReplaceString("@USER@", Username, s) << endl; ++ } ++ } ++ } ++ InputXML.close(); ++ DestXML.close(); ++ } + + return -1; + } Property changes on: packages/gpsdrive/trunk/debian/patches/20-homedir.dpatch ___________________________________________________________________ Name: svn:executable + * _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel