diff options
| author | Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> | 2015-08-31 21:37:12 +0100 |
|---|---|---|
| committer | Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> | 2015-08-31 22:05:18 +0100 |
| commit | 4789e9a31add883fcbc9e84ec9a74ed9a664b9cc (patch) | |
| tree | 72204fb88ff214fade238debe0e7d93707353024 /debian | |
| parent | 99f5c8bf63a674faf8c507aea7425b935814548a (diff) | |
Drop versioned dependency on automake, add patch to fix compat.HEADdebian/2.10_pre4-6.dfsg-5.3master
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/00list | 3 | ||||
| -rw-r--r-- | debian/patches/108-drop-duplicate-automake.dpatch | 20 |
4 files changed, 31 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8021119..72b1929 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gpsdrive (2.10~pre4-6.dfsg-5.3) unstable; urgency=medium + + * Non-maintainer upload. + * Drop versioned dependency on automake. + * Add a patch to avoid duplicate scripts in Makefile.am. + + -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> Mon, 31 Aug 2015 21:36:46 +0100 + gpsdrive (2.10~pre4-6.dfsg-5.2) unstable; urgency=low * Non-maintainer upload diff --git a/debian/control b/debian/control index cc5b8a7..c977289 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Andreas Putzo <andreas@putzo.net>, Francesco Paolo Lovergine <frankie@debian.org> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient-dev, +Build-Depends: debhelper (>= 7), automake, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient-dev, autotools-dev, dpatch, libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev, libltdl-dev (>= 2.4) Standards-Version: 3.8.4 Homepage: http://gpsdrive.de diff --git a/debian/patches/00list b/debian/patches/00list index 509e3d4..768a287 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -21,4 +21,5 @@ 103-no-textquery 104-fix-xcursor-check 105-add-boost-links -107-fix-disable-mapnik.dpatch +107-fix-disable-mapnik +108-drop-duplicate-automake diff --git a/debian/patches/108-drop-duplicate-automake.dpatch b/debian/patches/108-drop-duplicate-automake.dpatch new file mode 100644 index 0000000..f276c65 --- /dev/null +++ b/debian/patches/108-drop-duplicate-automake.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## drop-duplicate-automake.dpatch by Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpsdrive~/scripts/Makefile.am gpsdrive/scripts/Makefile.am +--- gpsdrive~/scripts/Makefile.am 2015-08-31 21:35:35.000000000 +0100 ++++ gpsdrive/scripts/Makefile.am 2015-08-31 21:45:11.866662054 +0100 +@@ -8,8 +8,7 @@ + gpssmswatch gpsfetchmap.pl convert-waypoints.pl \ + geoinfo.pl gpsdrive-init-db.pl wp2sql gpsd_nmea.sh \ + nasaconv.sh \ +- start_mysql_as_user.sh poi-manager.pl \ +- convert-waypoints.pl ++ start_mysql_as_user.sh poi-manager.pl + + + geoinfo: |