[SCM] gdal branch, master, updated. upstream/1.8.1-68-g7b555aa
The following commit has been merged in the master branch:
commit dc99347e97840656c148b882f347c48bafa6aca0
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Thu Oct 6 09:46:11 2011 +0200
Added conflict/provides/replaces for libgdal-dev against libgdal1-dev.
diff --git a/debian/control b/debian/control
index e4ebca6..a082a7a 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,8 @@ Depends: libgdal1 (=${binary:Version}), libc6-dev,
libnetcdf-dev,
libspatialite-dev, libdap-dev, ${misc:Depends}
Suggests: libgdal-doc
Provides: libgdal1-dev
+Replaces: libgdal1-dev
+Conflicts: libgdal1-dev
Description: Geospatial Data Abstraction Library - Development files
GDAL is a translator library for raster geospatial data formats.
As a library, it presents a single abstract data model to the
--
GDAL/OGR library and tools
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.1-68-g7b555aa
The following commit has been merged in the master branch:
commit 2a27c483420e0dcfedf83c5b1b6a334dd893c76b
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Thu Oct 6 09:55:33 2011 +0200
Now debian/rules is compatible with the new naming scheme for libgdal1
diff --git a/debian/rules b/debian/rules
index 8660241..39aaba8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -142,7 +142,7 @@ install: build
cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
$(MAKE) install BINDINGS=perl ruby DESTDIR=$(CURDIR)/debian/tmp \
- INST_DATA=\$$(prefix)/share/gdal/1.8
+
INST_DATA=\$$(prefix)/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)
$(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \
INST_DOCS=\$$(prefix)/share/doc/libgdal-doc\
INST_MAN=\$$(prefix)/share/man
@@ -156,7 +156,7 @@ install: build
install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py
$(CURDIR)/debian/tmp/usr/bin/.
# removing license file
- rm -f $(CURDIR)/debian/tmp/usr/share/gdal/1.8/LICENSE.TXT
+ rm -f
$(CURDIR)/debian/tmp/usr/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)/LICENSE.TXT
# removing empty packlist MakeMaker files
-find $(CURDIR)/debian/tmp$(PERL_PATH) -type f -name .packlist -exec rm
-f {} \;
# removing embedded rpath in perl shlibs
@@ -174,8 +174,8 @@ install: build
install -o root -g root -d
$(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples
install -o root -g root -m 755 $(CURDIR)/swig/python/samples/*.py
$(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples/.
# create lintian overrides file
- echo libgdal1-1.8.0: embedded-library
usr/lib/libgdal1.8.0.so.$$(basename
debian/tmp/usr/lib/libgdal1.8.0.so.*.*.*|cut -d. -f5,6,7): tiff \
- $(CURDIR)/debian/libgdal1-1.8.0.lintian-overrides
+ echo libgdal1: embedded-library usr/lib/libgdal.so.$$(basename
debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5): tiff \
+ $(CURDIR)/debian/libgdal1.lintian-overrides
binary-common:
dh_testdir
@@ -191,9 +191,10 @@ binary-common:
dh_lintian
dh_python2 -X.info
dh_perl
+ ln libgdal1
dh_makeshlibs
dh_installdeb
- dh_shlibdeps -L libgdal1-1.8.0 -l debian/libgdal1-1.8.0/usr/lib
+ dh_shlibdeps -L libgdal1 -l debian/libgdal1/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb
--
GDAL/OGR library and tools
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.1-68-g7b555aa
The following commit has been merged in the master branch: commit d70d0e03e7481d928120bf589064036d01964993 Merge: 2a27c483420e0dcfedf83c5b1b6a334dd893c76b 2477a1356ca3ce89d49fb3ea56c41cf6d54546e8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 6 09:56:17 2011 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.1-68-g7b555aa
The following commit has been merged in the master branch: commit 628c88f76b832cb30c3c35d0a76f279de6d3ce8f Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 6 10:03:07 2011 +0200 Added kfreebsd-* symfiles trick. diff --git a/debian/rules b/debian/rules index 39aaba8..ef233c2 100755 --- a/debian/rules +++ b/debian/rules @@ -131,7 +131,8 @@ clean: rm -rf $(CURDIR)/html $(CURDIR)/doc/br/html $(CURDIR)/doc/ru/html rm -rf $(CURDIR)/frmts/o/.libs rm -f $(CURDIR)/islibdappost310.* - + # Removes per arch symbols for compatible archs + rm -f libgdal*.symbols.kfreebsd-i386 libgdal*.symbols.kfreebsd-amd64 dh_clean install: build @@ -191,7 +192,9 @@ binary-common: dh_lintian dh_python2 -X.info dh_perl - ln libgdal1 + # Adds per arch symbols for compatible archs + ln libgdal*.symbols.i386 libgdal1.symbols.kfreebsd-i386 + ln libgdal*.symbols.amd64 libgdal1.symbols.kfreebsd-amd64 dh_makeshlibs dh_installdeb dh_shlibdeps -L libgdal1 -l debian/libgdal1/usr/lib -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.1-68-g7b555aa
The following commit has been merged in the master branch: commit 8dc63f8859587fd9d812c0a3094bf6d5fbfee394 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 6 10:18:30 2011 +0200 Fixed paths in kfreebsd-* symfiles. diff --git a/debian/rules b/debian/rules index ef233c2..e28ec6e 100755 --- a/debian/rules +++ b/debian/rules @@ -132,7 +132,7 @@ clean: rm -rf $(CURDIR)/frmts/o/.libs rm -f $(CURDIR)/islibdappost310.* # Removes per arch symbols for compatible archs - rm -f libgdal*.symbols.kfreebsd-i386 libgdal*.symbols.kfreebsd-amd64 + rm -f $(CURDIR)/debian/libgdal*.symbols.kfreebsd-i386 $(CURDIR)/debian/libgdal*.symbols.kfreebsd-amd64 dh_clean install: build @@ -193,8 +193,8 @@ binary-common: dh_python2 -X.info dh_perl # Adds per arch symbols for compatible archs - ln libgdal*.symbols.i386 libgdal1.symbols.kfreebsd-i386 - ln libgdal*.symbols.amd64 libgdal1.symbols.kfreebsd-amd64 + ln $(CURDIR)/debian/libgdal*.symbols.i386 $(CURDIR)/debian/libgdal1.symbols.kfreebsd-i386 + ln $(CURDIR)/debian/libgdal*.symbols.amd64 $(CURDIR)/debian/libgdal1.symbols.kfreebsd-amd64 dh_makeshlibs dh_installdeb dh_shlibdeps -L libgdal1 -l debian/libgdal1/usr/lib -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.1-68-g7b555aa
The following commit has been merged in the master branch: commit 7b555aa12d13fee2b33658630af9da8ab222d5b2 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 6 10:54:06 2011 +0200 Grr, added -f to link commands. diff --git a/debian/rules b/debian/rules index e28ec6e..2954655 100755 --- a/debian/rules +++ b/debian/rules @@ -193,8 +193,8 @@ binary-common: dh_python2 -X.info dh_perl # Adds per arch symbols for compatible archs - ln $(CURDIR)/debian/libgdal*.symbols.i386 $(CURDIR)/debian/libgdal1.symbols.kfreebsd-i386 - ln $(CURDIR)/debian/libgdal*.symbols.amd64 $(CURDIR)/debian/libgdal1.symbols.kfreebsd-amd64 + ln -f $(CURDIR)/debian/libgdal*.symbols.i386 $(CURDIR)/debian/libgdal1.symbols.kfreebsd-i386 + ln -f $(CURDIR)/debian/libgdal*.symbols.amd64 $(CURDIR)/debian/libgdal1.symbols.kfreebsd-amd64 dh_makeshlibs dh_installdeb dh_shlibdeps -L libgdal1 -l debian/libgdal1/usr/lib -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
