The following commit has been merged in the master branch: commit 02ceb3ff65a001e25b74cf470acbe73fb6144e86 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Mon Nov 25 14:30:56 2013 +0100
Sync with current sid version. diff --git a/debian/changelog b/debian/changelog index cc45cc5..df65322 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +proj (4.7.0-2) unstable; urgency=medium + + * Moved to source format 3.0 with quilt support. + * Pushed policy to 3.9.3. No changes required. + * Alioth repository moved to git and Vcs-* fields updated. + * Dropped Peter S Galbraith as uploader. + * Dropped transitional proj package. + * Now suggesting proj-ps-doc in proj-bin. + (closes: #661662) + * Home page is now fixed with current OsGeo one. + (closes: #597587) + * Fixed proj-data description. + (closes: #613514) + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 23 May 2012 14:16:42 +0200 + proj (4.7.0-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 6c03aae..5f91fc8 100644 --- a/debian/control +++ b/debian/control @@ -2,37 +2,18 @@ Source: proj Section: science Priority: extra Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> -Uploaders: Peter S Galbraith <p...@debian.org>, Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 7), sharutils, dpatch -Standards-Version: 3.8.3 +Uploaders: Francesco Paolo Lovergine <fran...@debian.org> +Build-Depends: debhelper (>= 9), sharutils +Standards-Version: 3.9.3 Homepage: http://trac.osgeo.org/proj/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/proj/ -Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/proj/ - -Package: proj -Architecture: all -Section: science -Depends: libproj0 (>= 4.6.1-4), proj-bin (>= 4.6.1-4), libproj-dev (>= 4.6.1-4), ${misc:Depends} -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. +Vcs-Browser: http://git.debian.org/?p=pkg-grass/proj.git +Vcs-Git: git://git.debian.org/pkg-grass/proj.git Package: proj-data Architecture: any Section: libs -Conflicts: proj (<= 4.6.1-3) -Replaces: proj (<= 4.6.1-3) Depends: ${misc:Depends} -Description: Cartographic projection filter and library (transitional package) +Description: Cartographic projection filter and library (datum 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). @@ -51,8 +32,6 @@ Architecture: any Section: libs Depends: proj-data, ${shlibs:Depends}, ${misc:Depends} Suggests: proj-bin -Conflicts: proj (<= 4.6.1-3) -Replaces: proj (<= 4.6.1-3) 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 @@ -72,8 +51,6 @@ Architecture: any Section: libdevel Depends: libproj0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: proj-bin -Conflicts: proj (<= 4.6.1-3) -Replaces: proj (<= 4.6.1-3) 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 @@ -91,8 +68,7 @@ Package: proj-bin Architecture: any Section: science Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: proj (<= 4.6.1-3) -Replaces: proj (<= 4.6.1-3) +Suggests: proj-ps-doc Description: Cartographic projection library (tools) Proj and invproj perform respective forward and inverse transformation of cartographic data to or from Cartesian data with a wide range of diff --git a/debian/patches/00list b/debian/patches/series similarity index 100% rename from debian/patches/00list rename to debian/patches/series diff --git a/debian/rules b/debian/rules index f3039a5..19df8b4 100755 --- a/debian/rules +++ b/debian/rules @@ -12,15 +12,13 @@ CFLAGS += -g endif # `nostrip' handled by dh_strip... -include /usr/share/dpatch/dpatch.make - datumgrids: datumgrids-stamp datumgrids-stamp: unshar -c -d $(CURDIR)/nad $(CURDIR)/debian/datumgrids.shar unshar -c -d $(CURDIR)/nad $(CURDIR)/debian/datumgrids-ch.shar touch $@ -config: datumgrids patch config.status +config: datumgrids config.status config.status: ./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man @@ -30,7 +28,7 @@ build-stamp: $(MAKE) CFLAGS="$(CFLAGS)" touch $@ -clean: unpatch +clean: dh_testdir dh_testroot ( cd $(CURDIR)/nad && cat $(CURDIR)/debian/datumgrids.list $(CURDIR)/debian/datumgrids-ch.list | xargs rm -f ) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Proj.4 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel