[DebianGIS-dev] CVS Update: gdal/debian changelog control rules
frankie at haydn.debian.org
frankie at haydn.debian.org
Tue Jan 24 10:23:56 UTC 2006
User: frankie
Date: 06/01/24 10:23:56
Modified: debian changelog control rules
Log:
Moved to dpatch
Revision Changes Path
1.8 +7 -2 gdal/debian/changelog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/changelog?annotate=1.8&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/changelog?rev=1.8&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/changelog.diff?r1=1.8&r2=1.7&cvsroot=
-----------------------------------
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-grass/gdal/debian/changelog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- changelog 23 Jan 2006 09:51:24 -0000 1.7
+++ changelog 24 Jan 2006 10:23:55 -0000 1.8
@@ -1,10 +1,15 @@
-gdal (1.3.1-2~1) UNRELEASED; urgency=low
+gdal (1.3.1-2) unstable; urgency=low
[ Petter Reinholdtsen ]
* Add Francesco Paolo Lovergine as uploader, to make sure the next
upload isn't seen as a non-maintainer upload.
- -- Petter Reinholdtsen <pere at debian.org> Mon, 23 Jan 2006 10:49:30 +0100
+ [ Francesco Paolo Lovergine ]
+ * Missed patched reverting, anyway moving to dpatch which is more robust for
+ patch management in case of build failures and re-builds.
+ (closes: #349562). Changed control and rules files as consequence.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 24 Jan 2006 10:56:55 +0100
gdal (1.3.1-1) unstable; urgency=low
1.9 +1 -1 gdal/debian/control
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/control?annotate=1.9&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/control?rev=1.9&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/control.diff?r1=1.9&r2=1.8&cvsroot=
-----------------------------------
Index: control
===================================================================
RCS file: /cvsroot/pkg-grass/gdal/debian/control,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- control 23 Jan 2006 09:51:24 -0000 1.8
+++ control 24 Jan 2006 10:23:55 -0000 1.9
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Steve Halasz <debian at adkgis.org>, Jon Saints <saintsjd at yahoo.com>, Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>> 4.1.25), zlib1g-dev, libcfitsio-dev, netcdfg-dev, libtiff4-dev, libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, libhdf4g-dev, libpq-dev | postgresql-dev, libxerces26-dev, unixodbc-dev, libsqlite0-dev, python-dev, python-numeric, doxygen, d-shlibs, libgeos-dev
+Build-Depends: debhelper (>> 4.1.25), zlib1g-dev, libcfitsio-dev, netcdfg-dev, libtiff4-dev, libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, libhdf4g-dev, libpq-dev | postgresql-dev, libxerces26-dev, unixodbc-dev, libsqlite0-dev, python-dev, python-numeric, doxygen, d-shlibs, libgeos-dev, dpatch
Standards-Version: 3.6.2
Package: libgdal1-1.3.1
1.5 +12 -21 gdal/debian/rules
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/rules?annotate=1.5&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/rules?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/gdal/debian/rules.diff?r1=1.5&r2=1.4&cvsroot=
-----------------------------------
Index: rules
===================================================================
RCS file: /cvsroot/pkg-grass/gdal/debian/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rules 20 Jan 2006 22:26:42 -0000 1.4
+++ rules 24 Jan 2006 10:23:55 -0000 1.5
@@ -10,10 +10,14 @@
# This is the debhelper compatibility version to use.
export DH_COMPAT=4
+# dpatch targets
+include /usr/share/dpatch/dpatch.make
+
# extract the non-prefix part of INST_PYMOD
inst_pymod=$(shell awk -F '/usr' '/INST_PYMOD/ {print $$2}' GDALmake.opt)
-config.status:
+configure: configure-stamp
+configure-stamp: patch-stamp
dh_testdir
./configure --prefix=/usr \
@@ -36,32 +40,19 @@
mv libtool-2 libtool
chmod 755 libtool
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- #patch -p1 < debian/patches/01_gcc4.patch
- patch -p0 < debian/patches/02_libname.patch
- touch patch-stamp
+ touch configure-stamp
-build: patch build-stamp
-build-stamp: config.status
+build: configure-stamp build-stamp
+build-stamp:
dh_testdir
$(MAKE)
$(MAKE) docs
touch build-stamp
-unpatch: patch unpatch-stamp
-unpatch-stamp:
- dh_testdir
- # This is here for reference. It should be inside the following
- # conditional.
- # patch -p1 -R < debian/patches/01_gcc4.patch ;
- if [ -e patch-stamp ]; then \
- patch -p0 -R < debian/patches/02_libname.patch \
- rm patch-stamp ; \
- fi
-clean: unpatch
+
+clean: clean-unpatched unpatch
+clean-unpatched:
# reminiscence to old procedure of building man pages, will now created
# by doxygen. This rm will be deleted in further releases of gdal
sh -c "if (test -d man/man1) then rm -r man/man1; fi"
@@ -110,4 +101,4 @@
dh_builddeb
binary: binary-arch
-.PHONY: build clean binary-arch binary install
+.PHONY: build clean binary-arch binary install patch unpatch clean-unpatched
More information about the Pkg-grass-devel
mailing list