Author: nd-guest
Date: 2007-09-24 20:25:48 +0000 (Mon, 24 Sep 2007)
New Revision: 1100

Modified:
   packages/gpsdrive/trunk/debian/changelog
   packages/gpsdrive/trunk/debian/control
   packages/gpsdrive/trunk/debian/copyright
   packages/gpsdrive/trunk/debian/docs
   packages/gpsdrive/trunk/debian/rules
Log:
* New upstream release.
* Update copyright.
* Remove some obsolete/incomplete docs.
* Split the package into -scripts, lib-perl and map-icons.


Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog    2007-09-24 20:21:19 UTC (rev 
1099)
+++ packages/gpsdrive/trunk/debian/changelog    2007-09-24 20:25:48 UTC (rev 
1100)
@@ -1,3 +1,10 @@
+gpsdrive (2.10~pre4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Create map-icon packages
+
+ -- Andreas Putzo <[EMAIL PROTECTED]>  Sat, 15 Sep 2007 20:17:07 +0000
+
 gpsdrive (2.10~pre2-2) unstable; urgency=low
 
   * Removed libfly.so, libnautic.so, because they weren't used.

Modified: packages/gpsdrive/trunk/debian/control
===================================================================
--- packages/gpsdrive/trunk/debian/control      2007-09-24 20:21:19 UTC (rev 
1099)
+++ packages/gpsdrive/trunk/debian/control      2007-09-24 20:25:48 UTC (rev 
1100)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Andreas Putzo <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), pkg-config, libpcre3-dev, libgtk2.0-dev, 
libmysqlclient15-dev, xutils, autotools-dev, dpatch
+Build-Depends: debhelper (>> 3.0.0), automake1.9, libtool, pkg-config, 
libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient15-dev, 
autotools-dev, dpatch, libmapnik-dev, libboost-dev, libboost-filesystem-dev, 
libboost-serialization-dev, perl (>= 5.6.0-16)
 Standards-Version: 3.7.2
 
 Package: gpsdrive
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, libxml-simple-perl, perl-tk
 Recommends: gpsd
-Suggests: libmysqlclient15off, imagemagick
+Suggests: gpsdrive-scripts, libmysqlclient15off, imagemagick
 Description: Car navigation system
  GpsDrive is a car (bike, ship, plane) navigation system.
  GpsDrive displays your position provided from your NMEA capable GPS
@@ -20,3 +20,35 @@
  resolution depending of your position. All Garmin GPS reveivers with a
  serial output should be usable, also other GPS receiver which supports
  NMEA protocol.
+
+Package: libgeo-gpsdrive-perl
+Architecture: all
+Depends: ${perl:Depends}
+Suggests: gpsdrive-scripts
+Description: Gpsdrive perl modules
+ Gpsdrive is a car (bike, ship, plane) navigation system.
+ .
+ This package contains bla perl modules.
+
+Package: gpsdrive-scripts
+Architecture: all
+Depends: gpsdrive, libgeo-gpsdrive-perl
+Description: Helper scripts for gpsdrive
+ Gpsdrive is a car (bike, ship, plane) navigation system.
+ .
+ This package contains various scripts.
+
+Package: openstreetmap-map-icons-classic
+Architecture: all
+Description: Collection of map icons
+ This package contains the classic set.
+
+Package: openstreetmap-map-icons-square
+Architecture: all
+Description: Collection of map icons
+ This package contains the square set
+
+Package: openstreetmap-map-icons-scalable
+Architecture: all
+Description: Collection of map icons
+ This package contains the scaleable set

Modified: packages/gpsdrive/trunk/debian/copyright
===================================================================
--- packages/gpsdrive/trunk/debian/copyright    2007-09-24 20:21:19 UTC (rev 
1099)
+++ packages/gpsdrive/trunk/debian/copyright    2007-09-24 20:25:48 UTC (rev 
1100)
@@ -1,18 +1,105 @@
 This package was debianized by Frank Kirschner <[EMAIL PROTECTED]> on
 Wed Apr 17 18:35:19 CEST 2002.
 
-It was downloaded from http://www.gpsdrive.cc/gpsdrive-2.07.tar.gz
+The current Debian Maintainer is the Debian GIS Team 
<pkg-grass-devel@lists.alioth.debian.org>.
 
-Homepage: http://www.gpsdrive.cc/
-Project Page: http://freshmeat.net/projects/gpsdrive/
+It was downloaded from http://gpsdrive.de/packages/gpsdrive-2.10pre4.tar.gz
 
-Upstream Author: Fritz Ganter <[EMAIL PROTECTED]>
+Upstream Authors: 
 
+    GpsDrive Development Team
+    Fritz Ganter <[EMAIL PROTECTED]>
+    J�rg Ostertag <[EMAIL PROTECTED]>
+    Guenter Meyer <[EMAIL PROTECTED]>                      
+    and Contributors.
+
 Copyright:
 
-Fritz Ganter released GpsDrive under the terms and conditions of the GNU
-General Public License Version 2 (GPL2).
-On Debian GNU/Linux systems, the complete text of the
-GNU General Public License Version 2 may be found in
-`/usr/share/common-licenses/GPL2'.
+    Copyright (C) 2001-2006 Fritz Ganter
+                  2006-2007 The GpsDrive Development Team
 
+License:
+
+This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'
+
+
+The files 
+    src/lib_map/map_load.c
+    src/lib_map/map_render.c
+    src/lib_map/map_transform.c
+    src/lib_map/map_port_cpp.cpp
+    src/lib_map/map_render_cpp.cpp
+    src/util/gmapview.c
+    src/util/gps.c
+    src/util/mmapview.c
+    src/util/wmapview.c
+    src/util/worldgen.c
+    src/util/qmapview.cpp
+are Copyright (C) 2005 Daniel Wallner and are licensed under the GNU General
+Public License version 2 or later (see above).
+
+
+The files
+    scripts/gpssql_backup.sh
+    scripts/gpssql_restore.sh
+are Copyleft 2002 Sven Fichtner <[EMAIL PROTECTED]>.
+
+
+The files
+    scripts/osm/perl_lib/Geo/OSM/OsmChangeReaderV5.pm
+    scripts/osm/perl_lib/OsmReader*.pm 
+    scripts/osm/perl_lib/OsmChangeReader*.pm
+are Copyright (C) 2006 Oliver Whilte
+                  2007 Martijn van Oosterhout <[EMAIL PROTECTED]>
+and are licensed under the GNU General Public License version 2 or later (see 
above).
+
+
+The file
+    scripts/geo-code
+is Copyright (C) Rick Richardson <[EMAIL PROTECTED]> 
+and has been donated to the public domain.
+
+
+The file
+    scripts/gpsreplay
+is Copyright (C) 2002,2003 Tim Witham <[EMAIL PROTECTED]> 
+and is licensed under the GNU General Public License version 2 or later (see 
above).
+
+The file
+    scripts/gpspoint2gpsdrive.pl
+is Copyright (C) 2002 Stephen Merrony <[EMAIL PROTECTED]> 
+and is licensed under the GNU General Public Licnese version 2 or later (see 
above).
+
+The file 
+    scripts/wpcvt
+is Copyright (C) 2002 Ned Konz <[EMAIL PROTECTED]>
+and is licensed under the GNU General Public License version 2 or later (see 
above).
+    
+The file
+    scripts/osm/perl_lib/Geo/OSM/OsmXML.pm
+is Copyright (C) 2006 Oliver White <[EMAIL PROTECTED]>
+and is licensed under the GNU General Public License version 2 or later (see 
above).
+
+The files
+    scripts/osm/perl_lib/Geo/OSM/APIClientV4.pm
+    scripts/osm/perl_lib/Geo/OSM/EntitiesV3.pm
+    scripts/osm/perl_lib/Geo/OSM/APIClientV5.pm
+are Copyright (C) 2007 Martijn van Oosterhout <[EMAIL PROTECTED]> 
+and are licensed under the GNU Lesser General Public License.
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'

Modified: packages/gpsdrive/trunk/debian/docs
===================================================================
--- packages/gpsdrive/trunk/debian/docs 2007-09-24 20:21:19 UTC (rev 1099)
+++ packages/gpsdrive/trunk/debian/docs 2007-09-24 20:25:48 UTC (rev 1100)
@@ -1,20 +1,19 @@
-ABOUT-NLS
+README
 AUTHORS
-CREDITS
-FAQ.gpsdrive
-FAQ.gpsdrive.fr
-GPS-receivers
-LEEME
-LISEZMOI
-LISEZMOI.FreeBSD
-LISEZMOI.SQL
-LISEZMOI.kismet
 NEWS
-NMEA.txt
-README
-README.SQL
-README.gpspoint2gspdrive
-README.kismet
-TODO
-create.sql
-wp2sql
+Documentation/CREDITS
+Documentation/FAQ.gpsdrive
+Documentation/FAQ.gpsdrive.fr
+Documentation/GPS-receivers
+Documentation/LISEZMOI
+Documentation/LISEZMOI.SQL
+Documentation/LISEZMOI.kismet
+Documentation/NMEA.txt
+Documentation/README.Bluetooth
+Documentation/README.OpenStreetMap-Vektordata
+Documentation/README.SQL
+Documentation/README.kismet
+Documentation/README.lib_map
+Documentation/README.mysql
+Documentation/README.nasamaps
+Documentation/TODO

Modified: packages/gpsdrive/trunk/debian/rules
===================================================================
--- packages/gpsdrive/trunk/debian/rules        2007-09-24 20:21:19 UTC (rev 
1099)
+++ packages/gpsdrive/trunk/debian/rules        2007-09-24 20:25:48 UTC (rev 
1100)
@@ -1,73 +1,90 @@
 #!/usr/bin/make -f
-# GNU copyright 1997 to 1999 by Joey Hess.
+# debian/rules for gpsdrive
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export destdir = $(CURDIR)/debian/gpsdrive/usr
-
-# dpatch support
 include /usr/share/dpatch/dpatch.make
 
-clean: clean-patched unpatch
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DESTDIR  := ${CURDIR}/debian/tmp
 
-clean-patched: 
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0
+else   
+       CFLAGS += -O2
+endif
+
+config.status: configure patch-stamp
        dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       -$(MAKE) distclean
-       -rm -f config.sub config.guess
-       dh_clean
+       aclocal -I m4 --force
+       automake --add-missing
+       autoconf
+       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+                               --prefix=/usr \
+                               CFLAGS="$(CFLAGS)"
 
-configure: configure-stamp
-configure-stamp: patch 
+build: build-stamp
+build-stamp: config.status
        dh_testdir
+       $(MAKE)
+       touch $@
+
+clean: clean-patched unpatch   
+
+clean-patched:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp
+       [ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
-       ./configure --prefix=/usr --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info
+       dh_clean
 
-       touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
+install: build
        dh_testdir
-
-       $(MAKE)
-
-       touch build-stamp
-
-install: build-stamp
-       dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
-       $(MAKE) install prefix=$(destdir)
-       # Remove gpsd since Debian has its own gpsd package
-       rm -f $(destdir)/bin/gpsd
-       # Strip language extensions
-       mv -f $(destdir)/bin/gpsfetchmap.pl $(destdir)/bin/gpsfetchmap
-       mv -f $(destdir)/bin/gpspoint2gpsdrive.pl 
$(destdir)/bin/gpspoint2gpsdrive
-       mv -f $(destdir)/bin/gpssql_backup.sh $(destdir)/bin/gpssql_backup
-       mv -f $(destdir)/bin/gpssql_restore.sh $(destdir)/bin/gpssql_restore
-       # Remove unnecessary shared libraries 
-       rm -rf $(destdir)/lib/
+       $(MAKE) install DESTDIR=$(DESTDIR)
 
-binary-indep: build-stamp install
+binary-indep: build install
 
-binary-arch: build-stamp install
+binary-arch: build install
        dh_testdir
        dh_testroot
+       dh_installchangelogs ChangeLog
        dh_installdocs
        dh_installman
-       dh_installchangelogs ChangeLog
+       dh_installexamples
+       dh_install --sourcedir=$(DESTDIR)
        dh_strip
        dh_compress
        dh_fixperms
+       dh_makeshlibs
        dh_installdeb
+       # move mapnik settings to gpsdrive dir
+#      mv -f $(CURDIR)/debian/gpsdrive/usr/share/mapnik 
$(CURDIR)/debian/gpsdrive/usr/share/gpsdrive/mapnik
+       # strip language extensions
+       mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints.pl 
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints
+       mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/geoinfo.pl 
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/geoinfo
+       mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsdrive-init-db.pl 
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsdrive-init-db
+       mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsfetchmap.pl 
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsfetchmap
+       mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpspoint2gpsdrive.pl 
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpspoint2gpsdrive
+       mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/nasaconv.sh 
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/nasaconv
+       mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/poi-manager.pl 
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/poi-manager
+       # remove some scripts
+       -$(RM) $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsd_nmea.sh
+       -$(RM) $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsdrive_test.sh
+       -$(RM) $(CURDIR)/debian/gpsdrive-scripts/usr/bin/start_mysql_as_user.sh
+       -$(RM) $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpssql_backup.sh
+       -$(RM) $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpssql_restore.sh
        dh_shlibdeps
        dh_perl
        dh_gencontrol
@@ -75,4 +92,4 @@
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install    
+.PHONY: build clean binary-indep binary-arch binary install


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to