Author: nd-guest
Date: 2007-07-29 17:13:08 +0000 (Sun, 29 Jul 2007)
New Revision: 990
Removed:
packages/gpsdrive/trunk/debian/gpsfetchmap
Modified:
packages/gpsdrive/trunk/debian/README.Debian
packages/gpsdrive/trunk/debian/changelog
packages/gpsdrive/trunk/debian/control
packages/gpsdrive/trunk/debian/man/man1/gpsfetchmap.1
packages/gpsdrive/trunk/debian/patches/02configure.dpatch
packages/gpsdrive/trunk/debian/patches/06libtool.dpatch
packages/gpsdrive/trunk/debian/rules
Log:
gpsdrive (2.10~pre2-2) unstable; urgency=low
.
* Removed libfly.so, libnautic.so, because they weren't used.
* Removed gpsfetchmap wrapper from debian/.
* Fixed mistake in debian/rules which caused gpsdrive to configure twice.
* Documentation were installed twice in different dirs.
* Added missing perl dependencies.
Modified: packages/gpsdrive/trunk/debian/README.Debian
===================================================================
--- packages/gpsdrive/trunk/debian/README.Debian 2007-07-27 23:21:35 UTC
(rev 989)
+++ packages/gpsdrive/trunk/debian/README.Debian 2007-07-29 17:13:08 UTC
(rev 990)
@@ -4,4 +4,4 @@
All scripts installed by gpsdrive has been renamed to a version without
language extension,
e.g. /usr/bin/gpsfetchmap.pl has been renamed to /usr/bin/gpsfetchmap.
- -- Andreas Putzo <[EMAIL PROTECTED]> Wed Jul 18 16:18:55 CEST 2007
+ -- Andreas Putzo <[EMAIL PROTECTED]> Wed Jul 18 16:18:55 CEST 2007
Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog 2007-07-27 23:21:35 UTC (rev
989)
+++ packages/gpsdrive/trunk/debian/changelog 2007-07-29 17:13:08 UTC (rev
990)
@@ -1,3 +1,13 @@
+gpsdrive (2.10~pre2-2) unstable; urgency=low
+
+ * Removed libfly.so, libnautic.so, because they weren't used.
+ * Removed gpsfetchmap wrapper from debian/.
+ * Fixed mistake in debian/rules which caused gpsdrive to configure twice.
+ * Documentation were installed twice in different dirs.
+ * Added missing perl dependencies.
+
+ -- Andreas Putzo <[EMAIL PROTECTED]> Sun, 29 Jul 2007 12:27:49 +0000
+
gpsdrive (2.10~pre2-1) unstable; urgency=low
* New upstream release. Closes: #321429.
Modified: packages/gpsdrive/trunk/debian/control
===================================================================
--- packages/gpsdrive/trunk/debian/control 2007-07-27 23:21:35 UTC (rev
989)
+++ packages/gpsdrive/trunk/debian/control 2007-07-29 17:13:08 UTC (rev
990)
@@ -8,7 +8,7 @@
Package: gpsdrive
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${perl:Depends}, libxml-simple-perl, perl-tk
Recommends: gpsd
Suggests: libmysqlclient15off, imagemagick
Description: Car navigation system
Deleted: packages/gpsdrive/trunk/debian/gpsfetchmap
===================================================================
--- packages/gpsdrive/trunk/debian/gpsfetchmap 2007-07-27 23:21:35 UTC (rev
989)
+++ packages/gpsdrive/trunk/debian/gpsfetchmap 2007-07-29 17:13:08 UTC (rev
990)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Tue Jan 27 11:37:53 CET 2004
-# Frank Kirschner <[EMAIL PROTECTED]>
-# gpsfetchmap: Wrapper to gpsfetchmap.pl since gpsfetchmap is non-free
-
-if [ $# = 0 ]
-then
- echo "Usage: gpsfetchmap start-latitude start-longitude end-latitude
end-longitude scale [mapserver]"
- echo " mapserver = expedia (default) or mapblast"
- exit
-fi
-
-mapserver=$6
-
-if [ "X$mapserver" = "X" ]
-then
- mapserver=expedia
-fi
-
-exec gpsfetchmap.pl --start-lat $1 --start-lon $2 --end-lat $3 --end-lon $4
--scale $5 --mapserver $mapserver --polite 1
Modified: packages/gpsdrive/trunk/debian/man/man1/gpsfetchmap.1
===================================================================
--- packages/gpsdrive/trunk/debian/man/man1/gpsfetchmap.1 2007-07-27
23:21:35 UTC (rev 989)
+++ packages/gpsdrive/trunk/debian/man/man1/gpsfetchmap.1 2007-07-29
17:13:08 UTC (rev 990)
@@ -255,3 +255,5 @@
.IP "\fB\-\-MAN \-M\fR" 8
.IX Item "--MAN -M"
Prints the manual page and exits.
+.SH "SEE ALSO"
+.BR gpsdrive (1).
Modified: packages/gpsdrive/trunk/debian/patches/02configure.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/02configure.dpatch 2007-07-27
23:21:35 UTC (rev 989)
+++ packages/gpsdrive/trunk/debian/patches/02configure.dpatch 2007-07-29
17:13:08 UTC (rev 990)
@@ -3,13 +3,43 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: remove gcc >= 3.x check
+## DP: remove documentation from install target
@DPATCH@
-diff -urNad gpsdrive-2.09~/configure gpsdrive-2.09/configure
---- gpsdrive-2.09~/configure 2007-07-17 13:58:06.000000000 +0200
-+++ gpsdrive-2.09/configure 2007-07-17 15:20:54.000000000 +0200
-@@ -9511,20 +9511,6 @@
+diff -urNad gpsdrive-2.10~pre2~/Makefile.am gpsdrive-2.10~pre2/Makefile.am
+--- gpsdrive-2.10~pre2~/Makefile.am 2004-07-02 21:47:02.000000000 +0000
++++ gpsdrive-2.10~pre2/Makefile.am 2007-07-29 14:49:03.000000000 +0000
+@@ -2,9 +2,9 @@
+ #AUTOMAKE_OPTIONS=dist-bzip2
+ SUBDIRS = src po man intl
+-EXTRA_DIST = TODO GPS-receivers LEEME depcomp LISEZMOI README.FreeBSD
README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr README.SQL create.sql
NMEA.txt wp2sql README.kismet LISEZMOI.FreeBSD LISEZMOI.kismet LISEZMOI.SQL
CREDITS gpsdrive.desktop README.nasamaps
++EXTRA_DIST =
+
+-pkgdata_DATA = TODO GPS-receivers LEEME AUTHORS CREDITS README LISEZMOI
README.FreeBSD README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr
README.SQL create.sql NMEA.txt wp2sql README.kismet README.nasamaps
++pkgdata_DATA =
+
+ appsdir = $(datadir)/applications
+ apps_DATA = gpsdrive.desktop
+diff -urNad gpsdrive-2.10~pre2~/Makefile.in gpsdrive-2.10~pre2/Makefile.in
+--- gpsdrive-2.10~pre2~/Makefile.in 2004-07-17 14:24:04.000000000 +0000
++++ gpsdrive-2.10~pre2/Makefile.in 2007-07-29 14:49:26.000000000 +0000
+@@ -220,8 +220,8 @@
+ # Makefile.am in main dir
+ #AUTOMAKE_OPTIONS=dist-bzip2
+ SUBDIRS = src po man intl
+-EXTRA_DIST = TODO GPS-receivers LEEME depcomp LISEZMOI README.FreeBSD
README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr README.SQL create.sql
NMEA.txt wp2sql README.kismet LISEZMOI.FreeBSD LISEZMOI.kismet LISEZMOI.SQL
CREDITS gpsdrive.desktop README.nasamaps
+-pkgdata_DATA = TODO GPS-receivers LEEME AUTHORS CREDITS README LISEZMOI
README.FreeBSD README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr
README.SQL create.sql NMEA.txt wp2sql README.kismet README.nasamaps
++EXTRA_DIST =
++pkgdata_DATA =
+ appsdir = $(datadir)/applications
+ apps_DATA = gpsdrive.desktop
+ all: config.h
+diff -urNad gpsdrive-2.10~pre2~/configure gpsdrive-2.10~pre2/configure
+--- gpsdrive-2.10~pre2~/configure 2007-07-29 14:47:22.000000000 +0000
++++ gpsdrive-2.10~pre2/configure 2007-07-29 14:48:36.000000000 +0000
+@@ -20853,20 +20853,6 @@
+
echo "Using $CC compiler"
-if test "$CC" = "gcc" ; then
Modified: packages/gpsdrive/trunk/debian/patches/06libtool.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/06libtool.dpatch 2007-07-27
23:21:35 UTC (rev 989)
+++ packages/gpsdrive/trunk/debian/patches/06libtool.dpatch 2007-07-29
17:13:08 UTC (rev 990)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06libtool.dpatch by <[EMAIL PROTECTED]>
+## 06libtool.dpatch by <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
Modified: packages/gpsdrive/trunk/debian/rules
===================================================================
--- packages/gpsdrive/trunk/debian/rules 2007-07-27 23:21:35 UTC (rev
989)
+++ packages/gpsdrive/trunk/debian/rules 2007-07-29 17:13:08 UTC (rev
990)
@@ -6,8 +6,22 @@
export destdir = $(CURDIR)/debian/gpsdrive/usr
-config.status: patch configure
+# dpatch support
+include /usr/share/dpatch/dpatch.make
+
+clean: clean-patched unpatch
+
+clean-patched:
dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) distclean
+ -rm -f config.sub config.guess
+ dh_clean
+
+configure: configure-stamp
+configure-stamp: patch
+ dh_testdir
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
@@ -16,55 +30,35 @@
endif
./configure --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
-build: build-stamp
+ touch configure-stamp
-build-stamp: config.status
+build: configure-stamp build-stamp
+build-stamp:
dh_testdir
+
$(MAKE)
- touch $@
-clean: clean-patched unpatch
+ touch build-stamp
-clean-patched:
+install: build-stamp
dh_testdir
dh_testroot
- rm -f build-stamp
- -$(MAKE) distclean
- rm -f config.sub config.guess
- dh_clean
-
-patch: patch-stamp
-
-patch-stamp:
- dpatch apply-all
- dpatch cat-all > patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-install: build
- dh_testdir
- dh_testroot
dh_clean -k
dh_installdirs
$(MAKE) install prefix=$(destdir)
- # Remove gpsd since debian has its own gpsd package
+ # 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 executable bit and strip shared libraries
- chmod -x $(destdir)/lib/libfly.2.0.0
- chmod -x $(destdir)/lib/libnautic.2.0.0
- strip --remove-section=.comment --remove-section=.note --strip-unneeded
$(destdir)/lib/libfly.2.0.0
- strip --remove-section=.comment --remove-section=.note --strip-unneeded
$(destdir)/lib/libnautic.2.0.0
+ # Remove unnecessary shared libraries
+ rm -rf $(destdir)/lib/
-binary-indep: build install
+binary-indep: build-stamp install
-binary-arch: build install
+binary-arch: build-stamp install
dh_testdir
dh_testroot
dh_installdocs
@@ -73,12 +67,12 @@
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs
dh_installdeb
dh_shlibdeps
+ dh_perl
dh_gencontrol
dh_md5sums
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
