Author: frankie
Date: 2009-02-17 22:42:28 +0000 (Tue, 17 Feb 2009)
New Revision: 1917
Added:
packages/proj/trunk/debian/libproj-dev.install
packages/proj/trunk/debian/libproj-dev.links
packages/proj/trunk/debian/libproj-dev.manpages
packages/proj/trunk/debian/libproj0.install
packages/proj/trunk/debian/proj-bin.install
packages/proj/trunk/debian/proj-bin.links
packages/proj/trunk/debian/proj-bin.manpages
Removed:
packages/proj/trunk/debian/links
packages/proj/trunk/debian/proj.postinst
packages/proj/trunk/debian/proj.postrm
packages/proj/trunk/debian/shlibs
Modified:
packages/proj/trunk/debian/changelog
packages/proj/trunk/debian/control
packages/proj/trunk/debian/copyright
packages/proj/trunk/debian/rules
Log:
Modified: packages/proj/trunk/debian/changelog
===================================================================
--- packages/proj/trunk/debian/changelog 2009-02-17 16:33:48 UTC (rev
1916)
+++ packages/proj/trunk/debian/changelog 2009-02-17 22:42:28 UTC (rev
1917)
@@ -1,3 +1,18 @@
+proj (4.6.1-2) UNRELEASED; urgency=low
+
+ * Reordered dh_* rules.
+ * Now moving to a usual set of packages, with libraries, tools and
+ dev files split in different packages. The old proj package
+ is now a pure transitional meta-package, to be removed after Squeeze
+ release.
+ * Removed dummy postinst/postrm/shlibs in repository, because managed
+ by dh_makeshlibs.
+ * Fixed debian/rules targets to be idempotent
+ * Other minor clenaups in debian/rules, such as .PHONY.
+ * [PATCH] autotols.patch: reconfigured with current autotools chain.
+
+ -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 17 Feb 2009 23:06:12
+0100
+
proj (4.6.1-1) unstable; urgency=low
* New upstream release.
Modified: packages/proj/trunk/debian/control
===================================================================
--- packages/proj/trunk/debian/control 2009-02-17 16:33:48 UTC (rev 1916)
+++ packages/proj/trunk/debian/control 2009-02-17 22:42:28 UTC (rev 1917)
@@ -10,10 +10,26 @@
Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/proj/
Package: proj
+Architecture: all
+Depends: libproj0 (>=${binary:Version}), proj-bin (>=${binary:Version}),
libproj-dev (>=${binary:Version})
+Description: Cartographic projection filter and library (transitional package)
+ Proj and invproj perform respective forward and inverse transformation
+ of cartographic data to or from Cartesian data with a wide range of
+ selectable projection functions (over 100 projections).
+ .
+ Geod and invgeod perform geodesic (Great Circle) computations for
+ determining latitude, longitude and back azimuth of a terminus point given
+ a initial point latitude, longitude, azimuth and distance (direct) or the
+ forward and back azimuths and distance between an initial and terminus
+ point latitudes and longitudes (inverse).
+ .
+ This is a transitional meta-package. You can safely remove it after upgrading.
+
+Package: libproj0
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: proj-ps-doc
-Description: Cartographic projection filter and library
+Suggests: proj-bin
+Description: Cartographic projection library
Proj and invproj perform respective forward and inverse transformation
of cartographic data to or from Cartesian data with a wide range of
selectable projection functions (over 100 projections).
@@ -24,7 +40,37 @@
forward and back azimuths and distance between an initial and terminus
point latitudes and longitudes (inverse).
.
- The proj package now provides builtin datum conversion.
+ The proj package provides builtin datum conversion.
+
+Package: libproj-dev
+Architecture: any
+Depends: libproj0 (=${binary:Version}), ${shlibs:Depends}
+Suggests: proj-bin
+Description: Cartographic projection library (development files)
+ Proj and invproj perform respective forward and inverse transformation
+ of cartographic data to or from Cartesian data with a wide range of
+ selectable projection functions (over 100 projections).
.
- See the package proj-ps-doc for documentation in PostScript format
- and http://www.remotesensing.org/proj for additional resources.
+ Geod and invgeod perform geodesic (Great Circle) computations for
+ determining latitude, longitude and back azimuth of a terminus point given
+ a initial point latitude, longitude, azimuth and distance (direct) or the
+ forward and back azimuths and distance between an initial and terminus
+ point latitudes and longitudes (inverse).
+ .
+ The proj package provides builtin datum conversion.
+
+Package: proj-bin
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Cartographic projection library (development files)
+ Proj and invproj perform respective forward and inverse transformation
+ of cartographic data to or from Cartesian data with a wide range of
+ selectable projection functions (over 100 projections).
+ .
+ Geod and invgeod perform geodesic (Great Circle) computations for
+ determining latitude, longitude and back azimuth of a terminus point given
+ a initial point latitude, longitude, azimuth and distance (direct) or the
+ forward and back azimuths and distance between an initial and terminus
+ point latitudes and longitudes (inverse).
+ .
+ The proj package provides builtin datum conversion.
Modified: packages/proj/trunk/debian/copyright
===================================================================
--- packages/proj/trunk/debian/copyright 2009-02-17 16:33:48 UTC (rev
1916)
+++ packages/proj/trunk/debian/copyright 2009-02-17 22:42:28 UTC (rev
1917)
@@ -1,5 +1,6 @@
This package was debianized by Peter S Galbraith p...@debian.org on
-Sun, 24 Oct 1999 14:13:26 -0400.
+Sun, 24 Oct 1999 14:13:26 -0400. It is currently maintained by
+the DebianGis team.
The Debian orig.tar.gz files combines:
Added: packages/proj/trunk/debian/libproj-dev.install
===================================================================
--- packages/proj/trunk/debian/libproj-dev.install
(rev 0)
+++ packages/proj/trunk/debian/libproj-dev.install 2009-02-17 22:42:28 UTC
(rev 1917)
@@ -0,0 +1,7 @@
+usr/lib/libproj.a
+usr/lib/libproj.la
+usr/lib/libproj.so
+usr/include/org_proj4_Projections.h
+usr/include/nad_list.h
+usr/include/proj_api.h
+usr/include/projects.h
Added: packages/proj/trunk/debian/libproj-dev.links
===================================================================
--- packages/proj/trunk/debian/libproj-dev.links
(rev 0)
+++ packages/proj/trunk/debian/libproj-dev.links 2009-02-17 22:42:28 UTC
(rev 1917)
@@ -0,0 +1,2 @@
+usr/share/man/man3/pj_init.3 usr/share/man/man3/proj.3
+
Added: packages/proj/trunk/debian/libproj-dev.manpages
===================================================================
--- packages/proj/trunk/debian/libproj-dev.manpages
(rev 0)
+++ packages/proj/trunk/debian/libproj-dev.manpages 2009-02-17 22:42:28 UTC
(rev 1917)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man3/pj_init.3
Added: packages/proj/trunk/debian/libproj0.install
===================================================================
--- packages/proj/trunk/debian/libproj0.install (rev 0)
+++ packages/proj/trunk/debian/libproj0.install 2009-02-17 22:42:28 UTC (rev
1917)
@@ -0,0 +1,29 @@
+usr/lib/libproj.so.0
+usr/lib/libproj.so.0.5.5
+usr/share/proj/FL
+usr/share/proj/MD
+usr/share/proj/TN
+usr/share/proj/WI
+usr/share/proj/WO
+usr/share/proj/GL27
+usr/share/proj/IGNF
+usr/share/proj/epsg
+usr/share/proj/esri
+usr/share/proj/null
+usr/share/proj/prvi
+usr/share/proj/proj_def.dat
+usr/share/proj/conus
+usr/share/proj/nad27
+usr/share/proj/nad83
+usr/share/proj/world
+usr/share/proj/other.extra
+usr/share/proj/nzgd2kgrid0005.gsb
+usr/share/proj/alaska
+usr/share/proj/esri.extra
+usr/share/proj/nad.lst
+usr/share/proj/hawaii
+usr/share/proj/stlrnc
+usr/share/proj/stpaul
+usr/share/proj/stgeorge
+usr/share/proj/ntv1_can.dat
+usr/share/proj/ntf_r93.gsb
Deleted: packages/proj/trunk/debian/links
===================================================================
--- packages/proj/trunk/debian/links 2009-02-17 16:33:48 UTC (rev 1916)
+++ packages/proj/trunk/debian/links 2009-02-17 22:42:28 UTC (rev 1917)
@@ -1,4 +0,0 @@
-usr/share/man/man1/proj.1 usr/share/man/man1/invproj.1
-usr/share/man/man1/geod.1 usr/share/man/man1/invgeod.1
-usr/share/man/man3/pj_init.3 usr/share/man/man3/proj.3
-
Added: packages/proj/trunk/debian/proj-bin.install
===================================================================
--- packages/proj/trunk/debian/proj-bin.install (rev 0)
+++ packages/proj/trunk/debian/proj-bin.install 2009-02-17 22:42:28 UTC (rev
1917)
@@ -0,0 +1,7 @@
+usr/bin/geod
+usr/bin/proj
+usr/bin/cs2cs
+usr/bin/nad2bin
+usr/bin/nad2nad
+usr/bin/invgeod
+usr/bin/invproj
Copied: packages/proj/trunk/debian/proj-bin.links (from rev 1914,
packages/proj/trunk/debian/links)
===================================================================
--- packages/proj/trunk/debian/proj-bin.links (rev 0)
+++ packages/proj/trunk/debian/proj-bin.links 2009-02-17 22:42:28 UTC (rev
1917)
@@ -0,0 +1,3 @@
+usr/share/man/man1/proj.1 usr/share/man/man1/invproj.1
+usr/share/man/man1/geod.1 usr/share/man/man1/invgeod.1
+
Property changes on: packages/proj/trunk/debian/proj-bin.links
___________________________________________________________________
Name: svn:mergeinfo
+
Added: packages/proj/trunk/debian/proj-bin.manpages
===================================================================
--- packages/proj/trunk/debian/proj-bin.manpages
(rev 0)
+++ packages/proj/trunk/debian/proj-bin.manpages 2009-02-17 22:42:28 UTC
(rev 1917)
@@ -0,0 +1,5 @@
+debian/tmp/usr/share/man/man1/cs2cs.1
+debian/tmp/usr/share/man/man1/geod.1
+debian/tmp/usr/share/man/man1/proj.1
+debian/tmp/usr/share/man/man1/nad2nad.1
+debian/nad2bin.1
Deleted: packages/proj/trunk/debian/proj.postinst
===================================================================
--- packages/proj/trunk/debian/proj.postinst 2009-02-17 16:33:48 UTC (rev
1916)
+++ packages/proj/trunk/debian/proj.postinst 2009-02-17 22:42:28 UTC (rev
1917)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <postinst> `abort-remove'
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- configure)
- ldconfig
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: packages/proj/trunk/debian/proj.postrm
===================================================================
--- packages/proj/trunk/debian/proj.postrm 2009-02-17 16:33:48 UTC (rev
1916)
+++ packages/proj/trunk/debian/proj.postrm 2009-02-17 22:42:28 UTC (rev
1917)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <overwriter>
-# <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ldconfig
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Modified: packages/proj/trunk/debian/rules
===================================================================
--- packages/proj/trunk/debian/rules 2009-02-17 16:33:48 UTC (rev 1916)
+++ packages/proj/trunk/debian/rules 2009-02-17 22:42:28 UTC (rev 1917)
@@ -26,7 +26,7 @@
build: config build-stamp
build-stamp:
dh_testdir
- make CFLAGS="$(CFLAGS)"
+ $(MAKE) CFLAGS="$(CFLAGS)"
touch $@
clean: unpatch
@@ -35,17 +35,18 @@
dh_prep
( cd $(CURDIR)/nad && cat $(CURDIR)/debian/datumgrids.list | xargs rm
-f )
[ ! -f Makefile ] || $(MAKE) distclean
+ rm -f $(CURDIR)/debian/*.log
-install: build-stamp
+install: build
dh_testdir
dh_testroot
dh_clean
dh_installdirs
# Add here commands to install the package into debian/proj.
- make install DESTDIR=`pwd`/debian/proj
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Fix manpages
- for man in debian/proj/usr/share/man/man1/*.1
debian/proj/usr/share/man/man3/*.3; \
+ for man in $(CURDIR)/debian/tmp/usr/share/man/man1/*.1
$(CURDIR)/debian/tmp/usr/share/man/man3/*.3; \
do \
sed -i -e 's/^\.nr LL 5.5i$$/\.\\"/' $$man; \
done
@@ -53,30 +54,39 @@
touch $@
# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-indep:
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
+ dh_installchangelogs -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs AUTHORS README
- dh_installexamples
- dh_installman debian/nad2bin.1
- dh_link
- dh_installchangelogs ChangeLog upstream
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_makeshlibs
- dh_md5sums
- dh_builddeb
+binary-arch: install
+ dh_testdir -a
+ dh_testroot -a
+ dh_install -a
+ dh_installdocs -a AUTHORS README
+ dh_installexamples -a
+ dh_installman -a
+ dh_link -a
+ dh_installchangelogs -a ChangeLog upstream
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a
+ dh_shlibdeps -a
+ dh_installdeb -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+
+.PHONY: build clean binary-indep binary-arch binary datumgrids config install
Deleted: packages/proj/trunk/debian/shlibs
===================================================================
--- packages/proj/trunk/debian/shlibs 2009-02-17 16:33:48 UTC (rev 1916)
+++ packages/proj/trunk/debian/shlibs 2009-02-17 22:42:28 UTC (rev 1917)
@@ -1 +0,0 @@
-libproj 0 proj (>= 4.4.1-1)
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
