From 99f5c8bf63a674faf8c507aea7425b935814548a Mon Sep 17 00:00:00 2001 From: Christian Perrier Date: Sun, 7 Oct 2012 13:27:36 +0100 Subject: gpsdrive (2.10~pre4-6.dfsg-5.2) unstable; urgency=low * Non-maintainer upload [ Allison Randal ] * Disable optional mapnik libraries, gpsdrive is incompatible with APIs of mapnik version 2.0.0. * debian/patches/107-fix-disable-mapnik.dpatch: Fix known bug with gpsdrive-2.10pre4 when disabling Mapnik library. # imported from the archive --- debian/patches/01-make.dpatch | 266 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 266 insertions(+) create mode 100644 debian/patches/01-make.dpatch (limited to 'debian/patches/01-make.dpatch') diff --git a/debian/patches/01-make.dpatch b/debian/patches/01-make.dpatch new file mode 100644 index 0000000..a0bed42 --- /dev/null +++ b/debian/patches/01-make.dpatch @@ -0,0 +1,266 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-make.dpatch by Andreas Putzo +## +## DP: Remove some SUBDIRS from Makefile.am +## DP: Remove perl checks from configure.ac +## DP: Remove map-icons from Makefile.am +## DP: call pod2man on debian/scripts/gpsfetchmap.pl + +@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 2008-07-19 15:23:42.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~/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 2008-07-19 15:23:42.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)) +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 2008-07-19 15:23:42.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 + +- +-japan_DATA = japan/health.svg japan/wlan.svg +-japandir = $(datadir)/map-icons/japan +- +-japan_accommodation_DATA = +-japan_accommodationdir = $(datadir)/map-icons/japan/accommodation +- +-japan_accomodation_DATA = +-japan_accomodationdir = $(datadir)/map-icons/japan/accomodation +- +-japan_education_DATA = japan/education/university.svg +-japan_educationdir = $(datadir)/map-icons/japan/education +- +-japan_education_school_DATA = japan/education/school/junior_high.svg +-japan_education_schooldir = $(datadir)/map-icons/japan/education/school +- +-japan_food_DATA = +-japan_fooddir = $(datadir)/map-icons/japan/food +- +-japan_geocache_DATA = +-japan_geocachedir = $(datadir)/map-icons/japan/geocache +- +-japan_health_DATA = japan/health/hospital.svg +-japan_healthdir = $(datadir)/map-icons/japan/health +- +-japan_incomming_DATA = japan/incomming/Bamboo_grove.svg japan/incomming/Barren_land.svg japan/incomming/Broadleaf_trees.svg japan/incomming/Coniferous_trees.svg japan/incomming/Crater_or_Fumarole.svg japan/incomming/District_Forest_Office.svg japan/incomming/Electronic_Datum_point.svg japan/incomming/Factory.svg japan/incomming/Field.svg japan/incomming/Fishing_port.svg japan/incomming/Government_or_Municipal_office.svg japan/incomming/High_school.svg japan/incomming/High_Tower.svg japan/incomming/Historical_site.svg japan/incomming/Home_for_the_aged.svg japan/incomming/Important_port.svg japan/incomming/Junior_college.svg japan/incomming/Koban.svg japan/incomming/Local_port.svg japan/incomming/Meteorological_observatory.svg japan/incomming/Mine.svg japan/incomming/Mulberry_field.svg japan/incomming/Oil_or_Gas_well.svg japan/incomming/Orchard.svg japan/incomming/Other_Ferry.svg japan/incomming/Other_Tree_plantation.svg japan/incomming/Palm_trees.svg japan/incomming/Pithead.svg japan/incomming/Police_station.svg japan/incomming/Power_plant.svg japan/incomming/Quarry.svg japan/incomming/Rice_field.svg japan/incomming/Shrine.svg japan/incomming/Siberian_Dwarf_Pines.svg japan/incomming/Spa.svg japan/incomming/Standard_point.svg japan/incomming/Tea_plantation.svg japan/incomming/Technical_college.svg japan/incomming/Temple.svg japan/incomming/the_Self-Defense_Forces.svg japan/incomming/Town_or_Village_Office.svg japan/incomming/Triangulation_point.svg +-japan_incommingdir = $(datadir)/map-icons/japan/incomming +- +-japan_misc_DATA = +-japan_miscdir = $(datadir)/map-icons/japan/misc +- +-japan_misc_landmark_DATA = japan/misc/landmark/chimney.svg japan/misc/landmark/lighthouse.svg japan/misc/landmark/tower.svg japan/misc/landmark/windmill.svg +-japan_misc_landmarkdir = $(datadir)/map-icons/japan/misc/landmark +- +-japan_money_DATA = +-japan_moneydir = $(datadir)/map-icons/japan/money +- +-japan_nautical_DATA = +-japan_nauticaldir = $(datadir)/map-icons/japan/nautical +- +-japan_people_DATA = +-japan_peopledir = $(datadir)/map-icons/japan/people +- +-japan_places_DATA = +-japan_placesdir = $(datadir)/map-icons/japan/places +- +-japan_public_DATA = japan/public/firebrigade.svg japan/public/post_office.svg +-japan_publicdir = $(datadir)/map-icons/japan/public +- +-japan_public_administration_DATA = japan/public/administration/court_of_law.svg japan/public/administration/townhall.svg +-japan_public_administrationdir = $(datadir)/map-icons/japan/public/administration +- +-japan_recreation_DATA = +-japan_recreationdir = $(datadir)/map-icons/japan/recreation +- +-japan_religion_DATA = japan/religion/cemetery.svg +-japan_religiondir = $(datadir)/map-icons/japan/religion +- +-japan_shopping_DATA = +-japan_shoppingdir = $(datadir)/map-icons/japan/shopping +- +-japan_shopping_rental_DATA = japan/shopping/rental/library.svg +-japan_shopping_rentaldir = $(datadir)/map-icons/japan/shopping/rental +- +-japan_sightseeing_DATA = japan/sightseeing/castle.svg japan/sightseeing/monument.svg japan/sightseeing/museum.svg +-japan_sightseeingdir = $(datadir)/map-icons/japan/sightseeing +- +-japan_sports_DATA = +-japan_sportsdir = $(datadir)/map-icons/japan/sports +- +-japan_transport_DATA = +-japan_transportdir = $(datadir)/map-icons/japan/transport +- +-japan_transport_ferry_DATA = japan/transport/ferry/ferry-car.svg +-japan_transport_ferrydir = $(datadir)/map-icons/japan/transport/ferry +- +-japan_vehicle_DATA = +-japan_vehicledir = $(datadir)/map-icons/japan/vehicle +- +-japan_waypoint_DATA = +-japan_waypointdir = $(datadir)/map-icons/japan/waypoint +- +-japan_wlan_DATA = +-japan_wlandir = $(datadir)/map-icons/japan/wlan +- +- + classic.small_DATA = classic.small/accommodation.png classic.small/education.png classic.small/empty.png classic.small/food.png classic.small/geocache.png classic.small/health.png classic.small/misc.png classic.small/money.png classic.small/nautical.png classic.small/people.png classic.small/places.png classic.small/public.png classic.small/recreation.png classic.small/religion.png classic.small/shopping.png classic.small/sightseeing.png classic.small/sports.png classic.small/transport.png classic.small/unknown.png classic.small/vehicle.png classic.small/waypoint.png classic.small/wlan.png + classic.smalldir = $(datadir)/map-icons/classic.small + +@@ -852,11 +766,6 @@ + classic.big_wlan_pay_DATA = classic.big/wlan/pay/fon.png + classic.big_wlan_paydir = $(datadir)/map-icons/classic.big/wlan/pay + +- +-nickw_DATA = nickw/amenity.png nickw/barn.png nickw/bridge.png nickw/campsite.png nickw/carpark.png nickw/caution.png nickw/church.png nickw/crossing.png nickw/farm.png nickw/industry.png nickw/interest.png nickw/mast.png nickw/node.png nickw/park.png nickw/pbridleway.png nickw/peak.png nickw/peak_small.png nickw/place.png nickw/pub.png nickw/railway.png nickw/restaurant.png nickw/road.png nickw/stationnew.png nickw/station.png nickw/teashop.png nickw/trackpoint.png nickw/tunnel.png nickw/viewpoint.png nickw/waypoint.png +-nickwdir = $(datadir)/map-icons/nickw +- +- + icons.xml_DATA = icons.xml + icons.xmldir = $(datadir)/map-icons/ + +@@ -1016,34 +925,6 @@ + $(svg_waypoint_flag_DATA) \ + $(svg_waypoint_pin_DATA) \ + $(svg_wlan_DATA) \ +- $(japan_DATA) \ +- $(japan_accommodation_DATA) \ +- $(japan_accomodation_DATA) \ +- $(japan_education_DATA) \ +- $(japan_education_school_DATA) \ +- $(japan_food_DATA) \ +- $(japan_geocache_DATA) \ +- $(japan_health_DATA) \ +- $(japan_incomming_DATA) \ +- $(japan_misc_DATA) \ +- $(japan_misc_landmark_DATA) \ +- $(japan_money_DATA) \ +- $(japan_nautical_DATA) \ +- $(japan_people_DATA) \ +- $(japan_places_DATA) \ +- $(japan_public_DATA) \ +- $(japan_public_administration_DATA) \ +- $(japan_recreation_DATA) \ +- $(japan_religion_DATA) \ +- $(japan_shopping_DATA) \ +- $(japan_shopping_rental_DATA) \ +- $(japan_sightseeing_DATA) \ +- $(japan_sports_DATA) \ +- $(japan_transport_DATA) \ +- $(japan_transport_ferry_DATA) \ +- $(japan_vehicle_DATA) \ +- $(japan_waypoint_DATA) \ +- $(japan_wlan_DATA) \ + $(classic.small_DATA) \ + $(classic.small_accommodation_DATA) \ + $(classic.small_accommodation_camping_DATA) \ +@@ -1141,7 +1022,6 @@ + $(classic.big_waypoint_wpttemp_DATA) \ + $(classic.big_wlan_DATA) \ + $(classic.big_wlan_pay_DATA) \ +- $(nickw_DATA) \ + $(icons.xml_DATA) \ + CMakeLists.txt \ + 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 2008-07-19 15:23:42.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 $? >$@ + +-gpsfetchmap.pl.1: $(srcdir)/../scripts/gpsfetchmap.pl +- pod2man $? >$@ ++gpsfetchmap.pl.1: $(srcdir)/../debian/scripts/gpsfetchmap.pl + + 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 2008-07-19 15:23:43.000000000 +0000 +@@ -5,7 +5,7 @@ + dist_bin_SCRIPTS= \ + wpcvt wpget gpspoint2gpsdrive.pl geo-nearest geocache2way \ + geo-code gpssql_backup.sh gpssql_restore.sh gpsreplay\ +- gpssmswatch gpsfetchmap.pl convert-waypoints.pl \ ++ gpssmswatch convert-waypoints.pl \ + geoinfo.pl gpsdrive-init-db.pl wp2sql gpsd_nmea.sh \ + nasaconv.sh \ + start_mysql_as_user.sh poi-manager.pl \ -- cgit v1.2.3