libgeotiff-dfsg 1.3.0+dfsg-3.2 MIGRATED to testing
FYI: The status of the libgeotiff-dfsg source package in Debian's testing distribution has changed. Previous version: 1.3.0+dfsg-3.1 Current version: 1.3.0+dfsg-3.2 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See http://release.debian.org/testing-watch/ for more information. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
libterralib 4.0.0-5 MIGRATED to testing
FYI: The status of the libterralib source package in Debian's testing distribution has changed. Previous version: 4.0.0-4 Current version: 4.0.0-5 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See http://release.debian.org/testing-watch/ for more information. ___ 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] osgearth branch, master, updated. debian/1.4.1-1-84-gdb5170c
The following commit has been merged in the master branch: commit db5170c31934b14a3aa3561c0fce1fd003e78adc Author: Aron Xu a...@debian.org Date: Mon Sep 23 02:37:12 2013 +0800 Allow parallel building diff --git a/debian/rules b/debian/rules index b114efa..80d1917 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,10 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS + NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS +endif + # CMake doesn't use hardening build flags set in CPPFLAGS CFLAGS += $(CPPFLAGS) CXXFLAGS += $(CPPFLAGS) @@ -36,7 +40,7 @@ override_dh_auto_build: mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \ done - $(MAKE) -C build VERBOSE=$(MAKE_VERBOSE) + $(MAKE) $(NJOBS) -C build VERBOSE=$(MAKE_VERBOSE) override_dh_auto_install: $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE) -- osgEarth terrain rendering toolkit ___ 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] osgearth branch, master, updated. debian/1.4.1-1-85-gb4de843
The following commit has been merged in the master branch: commit b4de84336916164d2c68c2a33cd6d11c5c59dc5a Author: Aron Xu a...@debian.org Date: Mon Sep 23 02:52:35 2013 +0800 Update changelog diff --git a/debian/changelog b/debian/changelog index 4beffe0..a2675f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ osgearth (2.4.0+dfsg-5) unstable; urgency=low + [ Bas Couwenberg ] * Add versioned Breaks/Replaces for libosgearth2. * Drop transitional package libosgearth1. (closes: #723980) - -- Bas Couwenberg sebas...@xs4all.nl Sun, 22 Sep 2013 00:18:20 +0200 + [ Aron Xu ] + * Allow parallel building. + + -- Aron Xu a...@debian.org Mon, 23 Sep 2013 02:51:33 +0800 osgearth (2.4.0+dfsg-4) unstable; urgency=low -- osgEarth terrain rendering toolkit ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of osgearth_2.4.0+dfsg-5_amd64.changes
osgearth_2.4.0+dfsg-5_amd64.changes uploaded successfully to ftp-master.debian.org along with the files: osgearth_2.4.0+dfsg-5.dsc osgearth_2.4.0+dfsg-5.debian.tar.gz osgearth_2.4.0+dfsg-5_amd64.deb osgearth-data_2.4.0+dfsg-5_all.deb libosgearth2_2.4.0+dfsg-5_amd64.deb libosgearthannotation2_2.4.0+dfsg-5_amd64.deb libosgearthfeatures2_2.4.0+dfsg-5_amd64.deb libosgearthqt2_2.4.0+dfsg-5_amd64.deb libosgearthsymbology2_2.4.0+dfsg-5_amd64.deb libosgearthutil2_2.4.0+dfsg-5_amd64.deb openscenegraph-plugin-osgearth_2.4.0+dfsg-5_amd64.deb libosgearth-dev_2.4.0+dfsg-5_amd64.deb Greetings, Your Debian queue daemon (running on host ravel.debian.org) ___ 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] osgearth branch, jessie, updated. debian/1.4.1-1-85-gb4de843
The following commit has been merged in the jessie branch: commit db5170c31934b14a3aa3561c0fce1fd003e78adc Author: Aron Xu a...@debian.org Date: Mon Sep 23 02:37:12 2013 +0800 Allow parallel building diff --git a/debian/rules b/debian/rules index b114efa..80d1917 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,10 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS + NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS +endif + # CMake doesn't use hardening build flags set in CPPFLAGS CFLAGS += $(CPPFLAGS) CXXFLAGS += $(CPPFLAGS) @@ -36,7 +40,7 @@ override_dh_auto_build: mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \ done - $(MAKE) -C build VERBOSE=$(MAKE_VERBOSE) + $(MAKE) $(NJOBS) -C build VERBOSE=$(MAKE_VERBOSE) override_dh_auto_install: $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE) -- osgEarth terrain rendering toolkit ___ 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] osgearth branch, jessie, updated. debian/1.4.1-1-85-gb4de843
The following commit has been merged in the jessie branch: commit b4de84336916164d2c68c2a33cd6d11c5c59dc5a Author: Aron Xu a...@debian.org Date: Mon Sep 23 02:52:35 2013 +0800 Update changelog diff --git a/debian/changelog b/debian/changelog index 4beffe0..a2675f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ osgearth (2.4.0+dfsg-5) unstable; urgency=low + [ Bas Couwenberg ] * Add versioned Breaks/Replaces for libosgearth2. * Drop transitional package libosgearth1. (closes: #723980) - -- Bas Couwenberg sebas...@xs4all.nl Sun, 22 Sep 2013 00:18:20 +0200 + [ Aron Xu ] + * Allow parallel building. + + -- Aron Xu a...@debian.org Mon, 23 Sep 2013 02:51:33 +0800 osgearth (2.4.0+dfsg-4) unstable; urgency=low -- osgEarth terrain rendering toolkit ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of osgearth_2.4.0+dfsg-5_amd64.changes
osgearth_2.4.0+dfsg-5_amd64.changes uploaded successfully to localhost along with the files: osgearth_2.4.0+dfsg-5.dsc osgearth_2.4.0+dfsg-5.debian.tar.gz osgearth_2.4.0+dfsg-5_amd64.deb osgearth-data_2.4.0+dfsg-5_all.deb libosgearth2_2.4.0+dfsg-5_amd64.deb libosgearthannotation2_2.4.0+dfsg-5_amd64.deb libosgearthfeatures2_2.4.0+dfsg-5_amd64.deb libosgearthqt2_2.4.0+dfsg-5_amd64.deb libosgearthsymbology2_2.4.0+dfsg-5_amd64.deb libosgearthutil2_2.4.0+dfsg-5_amd64.deb openscenegraph-plugin-osgearth_2.4.0+dfsg-5_amd64.deb libosgearth-dev_2.4.0+dfsg-5_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
osgearth_2.4.0+dfsg-5_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Mon, 23 Sep 2013 02:51:33 +0800 Source: osgearth Binary: osgearth osgearth-data libosgearth2 libosgearthannotation2 libosgearthfeatures2 libosgearthqt2 libosgearthsymbology2 libosgearthutil2 openscenegraph-plugin-osgearth libosgearth-dev Architecture: source amd64 all Version: 2.4.0+dfsg-5 Distribution: unstable Urgency: low Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Aron Xu a...@debian.org Description: libosgearth-dev - osgEarth development files libosgearth2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (shared l libosgearthannotation2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth libosgearthfeatures2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth libosgearthqt2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth libosgearthsymbology2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth libosgearthutil2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth openscenegraph-plugin-osgearth - OpenSceneGraph plugins for osgEarth osgearth - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (binaries osgearth-data - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (data) Closes: 723980 Changes: osgearth (2.4.0+dfsg-5) unstable; urgency=low . [ Bas Couwenberg ] * Add versioned Breaks/Replaces for libosgearth2. * Drop transitional package libosgearth1. (closes: #723980) . [ Aron Xu ] * Allow parallel building. Checksums-Sha1: 2143f571ad95d8127af8171509d5e09231e623a1 2412 osgearth_2.4.0+dfsg-5.dsc 25aed41429585eed20ec67e5cf663037d923114b 127065 osgearth_2.4.0+dfsg-5.debian.tar.gz 84e572e5df1222d1a35c189361334bbfdb7198b3 124784 osgearth_2.4.0+dfsg-5_amd64.deb 854bd0ed5160313cc752d918ae0ea5c6c21b3419 3944016 osgearth-data_2.4.0+dfsg-5_all.deb 3ceb892e10760cac574aa70e3c2b9531067e0035 720218 libosgearth2_2.4.0+dfsg-5_amd64.deb 97dafc827a1d09711088e9e955481a3f4fa2a753 192318 libosgearthannotation2_2.4.0+dfsg-5_amd64.deb c25f21cfb7bcd241880cc5f1c592af40963930f1 244876 libosgearthfeatures2_2.4.0+dfsg-5_amd64.deb 3ee9ab1609d71d71f52af976073559f7fc54c861 181626 libosgearthqt2_2.4.0+dfsg-5_amd64.deb 6185212d1f5a47a049fec2fbd0011151abb97555 237512 libosgearthsymbology2_2.4.0+dfsg-5_amd64.deb f4578d7add71620a725d1fe194501a9507a252a0 595712 libosgearthutil2_2.4.0+dfsg-5_amd64.deb 5dfed2fff268a67ab0b45389f4b7562efed21c78 3396878 openscenegraph-plugin-osgearth_2.4.0+dfsg-5_amd64.deb 162f671e967cb6f9dd05912e06e68e9ceced2805 434138 libosgearth-dev_2.4.0+dfsg-5_amd64.deb Checksums-Sha256: a37298e82783625909bec0fdb4144c9e24f613190cd9b2056d8910cd2b49c1ed 2412 osgearth_2.4.0+dfsg-5.dsc a341c4b1614314028515da8b739e44f0a0bdcb889d21ef157367bdc22307b7b1 127065 osgearth_2.4.0+dfsg-5.debian.tar.gz 96205d456d6779f65a8536cd8aee9ba159e1a29d36ec63525e2104a593e9b6c7 124784 osgearth_2.4.0+dfsg-5_amd64.deb acc16931ce4078b48a0b35c5cce90a02c95188019ab78aa4cb2ceae505103678 3944016 osgearth-data_2.4.0+dfsg-5_all.deb 80c489baae84076a2b6b16d7d69bd5af1b40c3b297a66f5cf04fc929c311503c 720218 libosgearth2_2.4.0+dfsg-5_amd64.deb ac804b9413d5c115f35a2c5c73eab02dac7123bb69c4f4f82836796b991ddc2d 192318 libosgearthannotation2_2.4.0+dfsg-5_amd64.deb ce5a15ac65ddd5fca5ea106d461fc2c3b534197cff093d36b3b55c311abcaf21 244876 libosgearthfeatures2_2.4.0+dfsg-5_amd64.deb 240f7a602ac760671e10c5d9ba117d5ebfa97b5b4d279de671d510365c01941a 181626 libosgearthqt2_2.4.0+dfsg-5_amd64.deb adc24797a6b2597d3250601656b1fc8c4742613caa9036926c565582929f1730 237512 libosgearthsymbology2_2.4.0+dfsg-5_amd64.deb e4afdf3d6c3d48961d0412dbc05d18182747421703f3cd24d80d283475bac7f6 595712 libosgearthutil2_2.4.0+dfsg-5_amd64.deb 135904867af08738802ce4a0144edfadeabcacbecaa35dcc0fae8accabbba921 3396878 openscenegraph-plugin-osgearth_2.4.0+dfsg-5_amd64.deb 20961a3d45bba8368d90ea4abb2b293eaf382c7df389c4a96c05e9cec156d302 434138 libosgearth-dev_2.4.0+dfsg-5_amd64.deb Files: d7d574a0526e4afbda342533cfa23192 2412 devel extra osgearth_2.4.0+dfsg-5.dsc 0b981e3731053e05526a9ff7c1da1369 127065 devel extra osgearth_2.4.0+dfsg-5.debian.tar.gz 3ddc86b5aec7cc31c15d89d292f8c526 124784 devel extra osgearth_2.4.0+dfsg-5_amd64.deb 904a127b720d12d41249b9f34416ea19 3944016 devel extra osgearth-data_2.4.0+dfsg-5_all.deb e7f5c26e8e5538e15f7d1b1100da4233 720218 libs extra libosgearth2_2.4.0+dfsg-5_amd64.deb 390e394ff89305a36822d557a0e51e52 192318 libs extra libosgearthannotation2_2.4.0+dfsg-5_amd64.deb 89be0110626062d4a81a0ce8b50214be 244876 libs extra libosgearthfeatures2_2.4.0+dfsg-5_amd64.deb f543dd1acccfe05c23c019250a01444f 181626 libs extra libosgearthqt2_2.4.0+dfsg-5_amd64.deb 6da3c17faeb218611fc436c363b1b297 237512 libs extra libosgearthsymbology2_2.4.0+dfsg-5_amd64.deb 6668c5d4715c3d664acb37029fcbaea4 595712 libs extra libosgearthutil2_2.4.0+dfsg-5_amd64.deb
Bug#723980: marked as done (libosgearth1: transitional package for shared library)
Your message dated Sun, 22 Sep 2013 19:19:13 + with message-id e1vnpbz-0005ck...@franck.debian.org and subject line Bug#723980: fixed in osgearth 2.4.0+dfsg-5 has caused the Debian Bug report #723980, regarding libosgearth1: transitional package for shared library to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 723980: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=723980 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ---BeginMessage--- Package: libosgearth1 Version: 2.4.0+dfsg-4 Severity: serious User: debian...@lists.debian.org Usertags: piuparts Hi, during a test with piuparts I noticed your package is no longer installable in sid: Package: libosgearth1 Source: osgearth Version: 2.4.0+dfsg-4 Depends: libosgearth2, libosgearthannotation2, libosgearthfeatures2, libosgearthqt2, libosgearthsymbology2, libosgearthutil2 Description-en: Transitional dummy package for libosgearth2 Package: libosgearth2 Source: osgearth Version: 2.4.0+dfsg-4 Replaces: libosgearth1, osgearth ( 1.4-2) Provides: libosgearth1 Breaks: libosgearth1, osgearth ( 1.4-2) Library transitions don't work this way. If the soname changes, the libraries are not compatible. Otherwise there would be no need for a soname change. So * turn back the time before the upload of 2.4.0 and request a proper library transition slot (reportbug release.debian.org, select transition - too late now, and as it turns out, there are no rdeps, so this is not needed) * drop the transitional package libosgearth1 * don't Provide its name * fix all rdepends that need manual changes to build against libosgearth2 * request binNMUs for all packages previously built against libosgearth1 (that list looks empty - so nothing to do here) Cheers, Andreas ---End Message--- ---BeginMessage--- Source: osgearth Source-Version: 2.4.0+dfsg-5 We believe that the bug you reported is fixed in the latest version of osgearth, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 723...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Aron Xu a...@debian.org (supplier of updated osgearth package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Mon, 23 Sep 2013 02:51:33 +0800 Source: osgearth Binary: osgearth osgearth-data libosgearth2 libosgearthannotation2 libosgearthfeatures2 libosgearthqt2 libosgearthsymbology2 libosgearthutil2 openscenegraph-plugin-osgearth libosgearth-dev Architecture: source amd64 all Version: 2.4.0+dfsg-5 Distribution: unstable Urgency: low Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Aron Xu a...@debian.org Description: libosgearth-dev - osgEarth development files libosgearth2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (shared l libosgearthannotation2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth libosgearthfeatures2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth libosgearthqt2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth libosgearthsymbology2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth libosgearthutil2 - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarth openscenegraph-plugin-osgearth - OpenSceneGraph plugins for osgEarth osgearth - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (binaries osgearth-data - Dynamic 3D terrain rendering toolkit for OpenSceneGraph (data) Closes: 723980 Changes: osgearth (2.4.0+dfsg-5) unstable; urgency=low . [ Bas Couwenberg ] * Add versioned Breaks/Replaces for libosgearth2. * Drop transitional package libosgearth1. (closes: #723980) . [ Aron Xu ] * Allow parallel building. Checksums-Sha1: 2143f571ad95d8127af8171509d5e09231e623a1 2412 osgearth_2.4.0+dfsg-5.dsc 25aed41429585eed20ec67e5cf663037d923114b 127065 osgearth_2.4.0+dfsg-5.debian.tar.gz 84e572e5df1222d1a35c189361334bbfdb7198b3 124784 osgearth_2.4.0+dfsg-5_amd64.deb 854bd0ed5160313cc752d918ae0ea5c6c21b3419 3944016 osgearth-data_2.4.0+dfsg-5_all.deb 3ceb892e10760cac574aa70e3c2b9531067e0035 720218 libosgearth2_2.4.0+dfsg-5_amd64.deb
[SCM] osgearth tag, debian/2.4-5, updated. debian/1.4.1-1-85-gb4de843
The tag, debian/2.4-5 has been updated to b4de84336916164d2c68c2a33cd6d11c5c59dc5a (commit) from bcb0d9019e3a2ff4ae25aaa4657db159e3f327cb - Shortlog commit b4de84336916164d2c68c2a33cd6d11c5c59dc5a Author: Aron Xu a...@debian.org Date: Mon Sep 23 02:52:35 2013 +0800 Update changelog --- -- osgEarth terrain rendering toolkit ___ 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] osgearth annotated tag, debian/2.4-5, updated. debian/2.4-5
The annotated tag, debian/2.4-5 has been updated to 0546618ce44b37fcdeb107d7bdde9334e65c49be (tag) from b4de84336916164d2c68c2a33cd6d11c5c59dc5a (which is now obsolete) tagging b4de84336916164d2c68c2a33cd6d11c5c59dc5a (commit) replaces debian/1.4.1-1 tagged by Aron Xu on Mon Sep 23 03:29:24 2013 +0800 - Shortlog Debian revision 2.4.0+dfsg-5 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJSP0UhAAoJEGa1A/2e4BN5brwH/14Le/Wgn685/7clYZ1Xo5YU jDjg5UJkcAquqIoY/PXfCDAAr3pTCkDDDRVKna3AxYMirHD/YKlZTDvSb8kUsbOE ndcp1wymjLrZMRG7Q0IK4xhwaXBzQkStFy4af5EOt3OQvc6gabHcTrdv+XX8KuBL yEj1RDzXDnjRFqy7iR/2RiOSHF23QBkfLYxJeJcFuChGFMdZiMybwfg8bS0XWIOT xe+pLNf6MVS+FQ9EXATCMHcwYNJgzNMXfI6yop0YlUe3OtRFGNNZYszJCL5O29++ Bhm+TV37tW/ty7qApJhpoGOh1+CMh03KjebnPho+Wm2UqwMjnvWtdo4xjfjLBuQ= =34Nl -END PGP SIGNATURE- --- -- osgEarth terrain rendering toolkit ___ 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] mapserver branch, jessie, updated. upstream/6.4.0_rc1-155-ge40ea6a
The following commit has been merged in the jessie branch:
commit e40ea6a90908f8d66f757adbd0692c3a4dfd0e57
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Sep 22 22:38:44 2013 +0200
Improve patch to export cmake package for external projects.
diff --git a/debian/changelog b/debian/changelog
index e357c45..c020044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.4.0-3) UNRELEASED; urgency=low
+
+ * Improve patch to export mapserver.cmake for external projects.
+
+ -- Bas Couwenberg sebas...@xs4all.nl Sun, 22 Sep 2013 22:27:32 +0200
+
mapserver (6.4.0-2) unstable; urgency=low
* Also include mapserver-config.h and mapserver-version.h in dev package.
diff --git a/debian/patches/cmake-mapserver-export.patch
b/debian/patches/cmake-mapserver-export.patch
index af32a55..2d3bf6c 100644
--- a/debian/patches/cmake-mapserver-export.patch
+++ b/debian/patches/cmake-mapserver-export.patch
@@ -1,17 +1,368 @@
-Description: Export mapserver.cmake for outside projects.
+Description: Install headers and export cmake package for outside projects.
Author: Bas Couwenberg sebas...@xs4all.nl
Last-Update: 2013-10-21
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -885,8 +885,9 @@ if(USE_SDE92)
-INSTALL(TARGETS msplugin_sde92 DESTINATION lib)
+@@ -31,6 +31,24 @@ if (APPLE)
+ set(CMAKE_FIND_FRAMEWORK LAST)
+ endif (APPLE)
+
++# Offer the user the choice of overriding the installation directories
++set(INSTALL_LIB_DIR lib CACHE PATH Installation directory for libraries)
++set(INSTALL_BIN_DIR bin CACHE PATH Installation directory for executables)
++set(INSTALL_INCLUDE_DIR include CACHE PATH Installation directory for header
files)
++if(WIN32 AND NOT CYGWIN)
++ set(DEF_INSTALL_CMAKE_DIR CMake)
++else()
++ set(DEF_INSTALL_CMAKE_DIR share/mapserver/cmake)
++endif()
++set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH Installation
directory for CMake files)
++
++# Make relative paths absolute (needed later on)
++foreach(p LIB BIN INCLUDE CMAKE)
++ set(var INSTALL_${p}_DIR)
++ if(NOT IS_ABSOLUTE ${${var}})
++set(${var} ${CMAKE_INSTALL_PREFIX}/${${var}})
++ endif()
++endforeach()
+
+ macro (ms_link_libraries)
+ target_link_libraries(mapserver ${ARGV})
+@@ -198,11 +216,20 @@ mapgeomtransform.c mapogroutput.c mapsde
+ mapgeomutil.cpp mapkmlrenderer.cpp
+ mapogr.cpp mapcontour.c mapsmoothing.c ${REGEX_SOURCES})
+
++set(mapserver_HEADERS
++cgiutil.h dxfcolor.h hittest.h mapaxisorder.h mapcopy.h mapentities.h
++maperror.h mapfile.h mapgml.h maphash.h maphttp.h mapio.h mapkmlrenderer.h
++maplibxml2.h mapogcfilter.h mapogcsld.h mapoglcontext.h mapoglrenderer.h
++mapowscommon.h mapows.h mapparser.h mappostgis.h mapprimitive.h mapproject.h
++mapraster.h mapregex.h mapresample.h mapserver-api.h mapserver.h mapserv.h
++mapshape.h mapsymbol.h maptemplate.h mapthread.h maptile.h maptime.h maptree.h
++mapwcs.h)
++
+ add_library(mapserver SHARED ${mapserver_SOURCES} ${agg_SOURCES})
+ set_target_properties( mapserver PROPERTIES
+ VERSION ${MapServer_VERSION_STRING}
+ SOVERSION 1
+-)
++)
+ if(BUILD_STATIC)
+ add_library(mapserver_static STATIC ${mapserver_SOURCES} ${agg_SOURCES})
+ set_target_properties( mapserver_static PROPERTIES
+@@ -244,6 +271,7 @@ find_package(PNG)
+ if(PNG_FOUND)
+ include_directories(${PNG_INCLUDE_DIR})
+ ms_link_libraries( ${PNG_LIBRARIES})
++ list(APPEND ALL_INCLUDE_DIRS ${PNG_INCLUDE_DIR})
+ set(USE_PNG 1)
+ else(PNG_FOUND)
+ report_mandatory_not_found(PNG)
+@@ -253,6 +281,7 @@ find_package(JPEG)
+ if(JPEG_FOUND)
+ include_directories(${JPEG_INCLUDE_DIR})
+ ms_link_libraries( ${JPEG_LIBRARY})
++ list(APPEND ALL_INCLUDE_DIRS ${JPEG_INCLUDE_DIR})
+ set(USE_JPEG 1)
+ else(JPEG_FOUND)
+ report_mandatory_not_found(JPEG)
+@@ -264,6 +293,7 @@ if(NOT FREETYPE_FOUND)
+ endif(NOT FREETYPE_FOUND)
+ include_directories(${FREETYPE_INCLUDE_DIR})
+ ms_link_libraries( ${FREETYPE_LIBRARY})
++list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
+
+
+ if(WITH_PROJ)
+@@ -273,6 +303,7 @@ if(WITH_PROJ)
+ else(NOT PROJ_FOUND)
+ include_directories(${PROJ_INCLUDE_DIR})
+ ms_link_libraries( ${PROJ_LIBRARY})
++list(APPEND ALL_INCLUDE_DIRS ${PROJ_INCLUDE_DIR})
+ set (USE_PROJ 1)
+ endif(NOT PROJ_FOUND)
+ endif (WITH_PROJ)
+@@ -293,6 +324,7 @@ if(WITH_GD)
+ else(NOT GD_FOUND)
+ include_directories(${GD_INCLUDE_DIR})
+ ms_link_libraries( ${GD_LIBRARY})
++list(APPEND ALL_INCLUDE_DIRS ${GD_INCLUDE_DIR})
+ set (USE_GD 1)
+ if(GD_SUPPORTS_PNG)
+ set(USE_GD_PNG 1)
+@@ -316,6 +348,7 @@ if(WITH_FRIBIDI)
+ else(NOT FRIBIDI_FOUND)
+ include_directories(${FRIBIDI_INCLUDE_DIR})
+ ms_link_libraries( ${FRIBIDI_LIBRARY})
++list(APPEND ALL_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
+ set (USE_FRIBIDI 1)
+ if(FRIBIDI_LEGACY)
+ message(WARNING Old Fribidi found, upgrade recommended)
+@@ -328,6 +361,7 @@ if(WITH_ICONV)
+ if(ICONV_FOUND)
+ include_directories(${ICONV_INCLUDE_DIR})
+
[SCM] mapserver branch, master, updated. upstream/6.4.0_rc1-155-ge40ea6a
The following commit has been merged in the master branch:
commit e40ea6a90908f8d66f757adbd0692c3a4dfd0e57
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Sep 22 22:38:44 2013 +0200
Improve patch to export cmake package for external projects.
diff --git a/debian/changelog b/debian/changelog
index e357c45..c020044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.4.0-3) UNRELEASED; urgency=low
+
+ * Improve patch to export mapserver.cmake for external projects.
+
+ -- Bas Couwenberg sebas...@xs4all.nl Sun, 22 Sep 2013 22:27:32 +0200
+
mapserver (6.4.0-2) unstable; urgency=low
* Also include mapserver-config.h and mapserver-version.h in dev package.
diff --git a/debian/patches/cmake-mapserver-export.patch
b/debian/patches/cmake-mapserver-export.patch
index af32a55..2d3bf6c 100644
--- a/debian/patches/cmake-mapserver-export.patch
+++ b/debian/patches/cmake-mapserver-export.patch
@@ -1,17 +1,368 @@
-Description: Export mapserver.cmake for outside projects.
+Description: Install headers and export cmake package for outside projects.
Author: Bas Couwenberg sebas...@xs4all.nl
Last-Update: 2013-10-21
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -885,8 +885,9 @@ if(USE_SDE92)
-INSTALL(TARGETS msplugin_sde92 DESTINATION lib)
+@@ -31,6 +31,24 @@ if (APPLE)
+ set(CMAKE_FIND_FRAMEWORK LAST)
+ endif (APPLE)
+
++# Offer the user the choice of overriding the installation directories
++set(INSTALL_LIB_DIR lib CACHE PATH Installation directory for libraries)
++set(INSTALL_BIN_DIR bin CACHE PATH Installation directory for executables)
++set(INSTALL_INCLUDE_DIR include CACHE PATH Installation directory for header
files)
++if(WIN32 AND NOT CYGWIN)
++ set(DEF_INSTALL_CMAKE_DIR CMake)
++else()
++ set(DEF_INSTALL_CMAKE_DIR share/mapserver/cmake)
++endif()
++set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH Installation
directory for CMake files)
++
++# Make relative paths absolute (needed later on)
++foreach(p LIB BIN INCLUDE CMAKE)
++ set(var INSTALL_${p}_DIR)
++ if(NOT IS_ABSOLUTE ${${var}})
++set(${var} ${CMAKE_INSTALL_PREFIX}/${${var}})
++ endif()
++endforeach()
+
+ macro (ms_link_libraries)
+ target_link_libraries(mapserver ${ARGV})
+@@ -198,11 +216,20 @@ mapgeomtransform.c mapogroutput.c mapsde
+ mapgeomutil.cpp mapkmlrenderer.cpp
+ mapogr.cpp mapcontour.c mapsmoothing.c ${REGEX_SOURCES})
+
++set(mapserver_HEADERS
++cgiutil.h dxfcolor.h hittest.h mapaxisorder.h mapcopy.h mapentities.h
++maperror.h mapfile.h mapgml.h maphash.h maphttp.h mapio.h mapkmlrenderer.h
++maplibxml2.h mapogcfilter.h mapogcsld.h mapoglcontext.h mapoglrenderer.h
++mapowscommon.h mapows.h mapparser.h mappostgis.h mapprimitive.h mapproject.h
++mapraster.h mapregex.h mapresample.h mapserver-api.h mapserver.h mapserv.h
++mapshape.h mapsymbol.h maptemplate.h mapthread.h maptile.h maptime.h maptree.h
++mapwcs.h)
++
+ add_library(mapserver SHARED ${mapserver_SOURCES} ${agg_SOURCES})
+ set_target_properties( mapserver PROPERTIES
+ VERSION ${MapServer_VERSION_STRING}
+ SOVERSION 1
+-)
++)
+ if(BUILD_STATIC)
+ add_library(mapserver_static STATIC ${mapserver_SOURCES} ${agg_SOURCES})
+ set_target_properties( mapserver_static PROPERTIES
+@@ -244,6 +271,7 @@ find_package(PNG)
+ if(PNG_FOUND)
+ include_directories(${PNG_INCLUDE_DIR})
+ ms_link_libraries( ${PNG_LIBRARIES})
++ list(APPEND ALL_INCLUDE_DIRS ${PNG_INCLUDE_DIR})
+ set(USE_PNG 1)
+ else(PNG_FOUND)
+ report_mandatory_not_found(PNG)
+@@ -253,6 +281,7 @@ find_package(JPEG)
+ if(JPEG_FOUND)
+ include_directories(${JPEG_INCLUDE_DIR})
+ ms_link_libraries( ${JPEG_LIBRARY})
++ list(APPEND ALL_INCLUDE_DIRS ${JPEG_INCLUDE_DIR})
+ set(USE_JPEG 1)
+ else(JPEG_FOUND)
+ report_mandatory_not_found(JPEG)
+@@ -264,6 +293,7 @@ if(NOT FREETYPE_FOUND)
+ endif(NOT FREETYPE_FOUND)
+ include_directories(${FREETYPE_INCLUDE_DIR})
+ ms_link_libraries( ${FREETYPE_LIBRARY})
++list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
+
+
+ if(WITH_PROJ)
+@@ -273,6 +303,7 @@ if(WITH_PROJ)
+ else(NOT PROJ_FOUND)
+ include_directories(${PROJ_INCLUDE_DIR})
+ ms_link_libraries( ${PROJ_LIBRARY})
++list(APPEND ALL_INCLUDE_DIRS ${PROJ_INCLUDE_DIR})
+ set (USE_PROJ 1)
+ endif(NOT PROJ_FOUND)
+ endif (WITH_PROJ)
+@@ -293,6 +324,7 @@ if(WITH_GD)
+ else(NOT GD_FOUND)
+ include_directories(${GD_INCLUDE_DIR})
+ ms_link_libraries( ${GD_LIBRARY})
++list(APPEND ALL_INCLUDE_DIRS ${GD_INCLUDE_DIR})
+ set (USE_GD 1)
+ if(GD_SUPPORTS_PNG)
+ set(USE_GD_PNG 1)
+@@ -316,6 +348,7 @@ if(WITH_FRIBIDI)
+ else(NOT FRIBIDI_FOUND)
+ include_directories(${FRIBIDI_INCLUDE_DIR})
+ ms_link_libraries( ${FRIBIDI_LIBRARY})
++list(APPEND ALL_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
+ set (USE_FRIBIDI 1)
+ if(FRIBIDI_LEGACY)
+ message(WARNING Old Fribidi found, upgrade recommended)
+@@ -328,6 +361,7 @@ if(WITH_ICONV)
+ if(ICONV_FOUND)
+ include_directories(${ICONV_INCLUDE_DIR})
+
[SCM] mapserver tag, debian/6.4.0-2, updated. upstream/6.4.0_rc1-155-ge40ea6a
The tag, debian/6.4.0-2 has been updated to e40ea6a90908f8d66f757adbd0692c3a4dfd0e57 (commit) from 9791827fe59717e827190fc62ac3c8bae0d385c5 - Shortlog commit e40ea6a90908f8d66f757adbd0692c3a4dfd0e57 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Sep 22 22:38:44 2013 +0200 Improve patch to export cmake package for external projects. --- -- Packaging for MapServer ___ 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] mapcache branch, jessie, updated. upstream/1.2.0-94-gc9506ab
The following commit has been merged in the jessie branch:
commit 3fe3040b9a5e4850b2981f6e8bcb3070883c9625
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Sep 22 02:07:52 2013 +0200
Drop transitional packages.
Drop Breaks/Replaces for libmapcache.
diff --git a/debian/control b/debian/control
index 735d2ec..2008559 100644
--- a/debian/control
+++ b/debian/control
@@ -40,28 +40,12 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-grass/mapcache.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git
Homepage: http://www.mapserver.org/en/mapcache/
-Package: libmapcache0
-Architecture: any
-Section: oldlibs
-Depends: libmapcache1,
- ${misc:Depends}
-Description: Dummy package for libmapcache0 to libmapcache1 transition
- This is a transitional dummy package to ease upgrades from the
- libmapcache0 package to the libmapcache1 package.
- It can safely be removed.
-
Package: libmapcache1
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Breaks: libmapcache (= 1.2.0),
-libmapcache0 (= 1.2.0)
-Provides: libmapcache,
- libmapcache0
-Replaces: libmapcache,
- libmapcache0
Description: tile caching server - shared library
This package contains the shared library.
.
@@ -70,16 +54,6 @@ Description: tile caching server - shared library
offering the essential features (and more!) expected from a tile caching
solution.
-Package: libmapcache0-dev
-Architecture: any
-Section: oldlibs
-Depends: libmapcache1-dev,
- ${misc:Depends}
-Description: Transitional dummy package for libmapcache1-dev
- This is a transitional dummy package to ease upgrades from the
- libmapcache0-dev package to the libmapcache1-dev package.
- It can safely be removed.
-
Package: libmapcache1-dev
Architecture: any
Section: libdevel
@@ -89,12 +63,10 @@ Depends: libmapcache1 (= ${binary:Version}),
Suggests: mapcache-cgi,
mapcache-tools,
libapache2-mod-mapcache
-Breaks: libmapcache-dev (= 1.2.0),
-libmapcache0-dev (= 1.2.0)
-Provides: libmapcache-dev,
- libmapcache0-dev
-Replaces: libmapcache-dev,
- libmapcache0-dev
+Breaks: libmapcache-dev ( 1.2.0-1~),
+libmapcache0-dev ( 1.2.0-1~)
+Replaces: libmapcache-dev ( 1.2.0-1~),
+ libmapcache0-dev ( 1.2.0-1~)
Description: tile caching server - shared library development files
This package contains the development files for the shared library.
.
--
Packaging for MapCache
___
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] mapcache branch, jessie, updated. upstream/1.2.0-94-gc9506ab
The following commit has been merged in the jessie branch:
commit 0cdc0cf75f498a41d4213b808a5f36924113ac35
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Sep 23 02:04:35 2013 +0200
Drop shlibs:Depends for libmapcache1-dev.
diff --git a/debian/control b/debian/control
index 2008559..66acafd 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,6 @@ Package: libmapcache1-dev
Architecture: any
Section: libdevel
Depends: libmapcache1 (= ${binary:Version}),
- ${shlibs:Depends},
${misc:Depends}
Suggests: mapcache-cgi,
mapcache-tools,
--
Packaging for MapCache
___
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] mapcache branch, master, updated. upstream/1.2.0-94-gc9506ab
The following commit has been merged in the master branch:
commit 0cdc0cf75f498a41d4213b808a5f36924113ac35
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Sep 23 02:04:35 2013 +0200
Drop shlibs:Depends for libmapcache1-dev.
diff --git a/debian/control b/debian/control
index 2008559..66acafd 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,6 @@ Package: libmapcache1-dev
Architecture: any
Section: libdevel
Depends: libmapcache1 (= ${binary:Version}),
- ${shlibs:Depends},
${misc:Depends}
Suggests: mapcache-cgi,
mapcache-tools,
--
Packaging for MapCache
___
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] mapcache branch, master, updated. upstream/1.2.0-94-gc9506ab
The following commit has been merged in the master branch:
commit 3fe3040b9a5e4850b2981f6e8bcb3070883c9625
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Sep 22 02:07:52 2013 +0200
Drop transitional packages.
Drop Breaks/Replaces for libmapcache.
diff --git a/debian/control b/debian/control
index 735d2ec..2008559 100644
--- a/debian/control
+++ b/debian/control
@@ -40,28 +40,12 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-grass/mapcache.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git
Homepage: http://www.mapserver.org/en/mapcache/
-Package: libmapcache0
-Architecture: any
-Section: oldlibs
-Depends: libmapcache1,
- ${misc:Depends}
-Description: Dummy package for libmapcache0 to libmapcache1 transition
- This is a transitional dummy package to ease upgrades from the
- libmapcache0 package to the libmapcache1 package.
- It can safely be removed.
-
Package: libmapcache1
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Breaks: libmapcache (= 1.2.0),
-libmapcache0 (= 1.2.0)
-Provides: libmapcache,
- libmapcache0
-Replaces: libmapcache,
- libmapcache0
Description: tile caching server - shared library
This package contains the shared library.
.
@@ -70,16 +54,6 @@ Description: tile caching server - shared library
offering the essential features (and more!) expected from a tile caching
solution.
-Package: libmapcache0-dev
-Architecture: any
-Section: oldlibs
-Depends: libmapcache1-dev,
- ${misc:Depends}
-Description: Transitional dummy package for libmapcache1-dev
- This is a transitional dummy package to ease upgrades from the
- libmapcache0-dev package to the libmapcache1-dev package.
- It can safely be removed.
-
Package: libmapcache1-dev
Architecture: any
Section: libdevel
@@ -89,12 +63,10 @@ Depends: libmapcache1 (= ${binary:Version}),
Suggests: mapcache-cgi,
mapcache-tools,
libapache2-mod-mapcache
-Breaks: libmapcache-dev (= 1.2.0),
-libmapcache0-dev (= 1.2.0)
-Provides: libmapcache-dev,
- libmapcache0-dev
-Replaces: libmapcache-dev,
- libmapcache0-dev
+Breaks: libmapcache-dev ( 1.2.0-1~),
+libmapcache0-dev ( 1.2.0-1~)
+Replaces: libmapcache-dev ( 1.2.0-1~),
+ libmapcache0-dev ( 1.2.0-1~)
Description: tile caching server - shared library development files
This package contains the development files for the shared library.
.
--
Packaging for MapCache
___
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] mapcache branch, master, updated. upstream/1.2.0-94-gc9506ab
The following commit has been merged in the master branch:
commit c9506ab2b8ab13c09bc8344098cfe51d59619eee
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Sep 21 20:13:05 2013 +0200
Add patch to include mapserver cmake package.
diff --git a/debian/changelog b/debian/changelog
index 9f2baa6..a75ca17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ mapcache (1.2.0-1) unstable; urgency=low
* Enable verbose make output.
* Call ldconfig in libmapcache postinst and postrm.
* Update libmapserver dependency for MapServer 6.4.0.
+ * Add patch to include mapserver cmake package.
* Build-Depend on libtiff-dev for libtiff5 transition.
-- Bas Couwenberg sebas...@xs4all.nl Wed, 11 Sep 2013 19:16:06 +0200
diff --git a/debian/control b/debian/control
index 66acafd..752ad6f 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends: debhelper (= 9),
libpixman-1-dev,
libsqlite3-dev,
libtiff-dev,
- libmapserver1,
- libmapserver1-dev,
+ libmapserver1 (= 6.4.0-2),
+ libmapserver1-dev (= 6.4.0-2),
chrpath,
cmake,
pkg-config,
diff --git a/debian/patches/cmake-mapserver-include.patch
b/debian/patches/cmake-mapserver-include.patch
new file mode 100644
index 000..ee74f02
--- /dev/null
+++ b/debian/patches/cmake-mapserver-include.patch
@@ -0,0 +1,45 @@
+Description: Include mapserver cmake package for additional include
directories.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-21
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -218,10 +218,18 @@ if(WITH_GEOTIFF)
+ endif (WITH_GEOTIFF)
+
+ if(WITH_MAPSERVER)
+- find_package(MAPSERVER)
++ find_package(MAPSERVER)
+ if(MAPSERVER_FOUND)
+-include_directories(${MAPSERVER_INCLUDE_DIR})
+-target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
++find_package(mapserver PATHS ${MAPSERVER_CMAKE_PATH})
++if(mapserver_FOUND)
++ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}
${MAPSERVER_CMAKE_PATH})
++ include(mapserverTargets)
++ include_directories(${MAPSERVER_INCLUDE_DIRS})
++ target_link_libraries(mapcache mapserver)
++else(mapserver_FOUND)
++ include_directories(${MAPSERVER_INCLUDE_DIR})
++ target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
++endif(mapserver_FOUND)
+ set (USE_MAPSERVER 1)
+ else(MAPSERVER_FOUND)
+ report_optional_not_found(MAPSERVER)
+--- a/cmake/FindMAPSERVER.cmake
b/cmake/FindMAPSERVER.cmake
+@@ -8,8 +8,13 @@ FIND_LIBRARY(MAPSERVER_LIBRARY
+ NAMES mapserver
+ )
+
++FIND_PATH(MAPSERVER_CMAKE_PATH
++NAMES mapserverTargets.cmake
++PATHS /usr/share/mapserver/cmake
++)
++
+ set(MAPSERVER_INCLUDE_DIRS ${MAPSERVER_INCLUDE_DIR})
+ set(MAPSERVER_LIBRARIES ${MAPSERVER_LIBRARY})
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY
MAPSERVER_INCLUDE_DIR)
+-mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR)
++find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY
MAPSERVER_INCLUDE_DIR MAPSERVER_CMAKE_PATH)
++mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR MAPSERVER_CMAKE_PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 4db24c4..c597b7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
soname.patch
+cmake-mapserver-include.patch
--
Packaging for MapCache
___
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] mapcache branch, jessie, updated. upstream/1.2.0-94-gc9506ab
The following commit has been merged in the jessie branch:
commit c9506ab2b8ab13c09bc8344098cfe51d59619eee
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Sep 21 20:13:05 2013 +0200
Add patch to include mapserver cmake package.
diff --git a/debian/changelog b/debian/changelog
index 9f2baa6..a75ca17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ mapcache (1.2.0-1) unstable; urgency=low
* Enable verbose make output.
* Call ldconfig in libmapcache postinst and postrm.
* Update libmapserver dependency for MapServer 6.4.0.
+ * Add patch to include mapserver cmake package.
* Build-Depend on libtiff-dev for libtiff5 transition.
-- Bas Couwenberg sebas...@xs4all.nl Wed, 11 Sep 2013 19:16:06 +0200
diff --git a/debian/control b/debian/control
index 66acafd..752ad6f 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends: debhelper (= 9),
libpixman-1-dev,
libsqlite3-dev,
libtiff-dev,
- libmapserver1,
- libmapserver1-dev,
+ libmapserver1 (= 6.4.0-2),
+ libmapserver1-dev (= 6.4.0-2),
chrpath,
cmake,
pkg-config,
diff --git a/debian/patches/cmake-mapserver-include.patch
b/debian/patches/cmake-mapserver-include.patch
new file mode 100644
index 000..ee74f02
--- /dev/null
+++ b/debian/patches/cmake-mapserver-include.patch
@@ -0,0 +1,45 @@
+Description: Include mapserver cmake package for additional include
directories.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-21
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -218,10 +218,18 @@ if(WITH_GEOTIFF)
+ endif (WITH_GEOTIFF)
+
+ if(WITH_MAPSERVER)
+- find_package(MAPSERVER)
++ find_package(MAPSERVER)
+ if(MAPSERVER_FOUND)
+-include_directories(${MAPSERVER_INCLUDE_DIR})
+-target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
++find_package(mapserver PATHS ${MAPSERVER_CMAKE_PATH})
++if(mapserver_FOUND)
++ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}
${MAPSERVER_CMAKE_PATH})
++ include(mapserverTargets)
++ include_directories(${MAPSERVER_INCLUDE_DIRS})
++ target_link_libraries(mapcache mapserver)
++else(mapserver_FOUND)
++ include_directories(${MAPSERVER_INCLUDE_DIR})
++ target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
++endif(mapserver_FOUND)
+ set (USE_MAPSERVER 1)
+ else(MAPSERVER_FOUND)
+ report_optional_not_found(MAPSERVER)
+--- a/cmake/FindMAPSERVER.cmake
b/cmake/FindMAPSERVER.cmake
+@@ -8,8 +8,13 @@ FIND_LIBRARY(MAPSERVER_LIBRARY
+ NAMES mapserver
+ )
+
++FIND_PATH(MAPSERVER_CMAKE_PATH
++NAMES mapserverTargets.cmake
++PATHS /usr/share/mapserver/cmake
++)
++
+ set(MAPSERVER_INCLUDE_DIRS ${MAPSERVER_INCLUDE_DIR})
+ set(MAPSERVER_LIBRARIES ${MAPSERVER_LIBRARY})
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY
MAPSERVER_INCLUDE_DIR)
+-mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR)
++find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY
MAPSERVER_INCLUDE_DIR MAPSERVER_CMAKE_PATH)
++mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR MAPSERVER_CMAKE_PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 4db24c4..c597b7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
soname.patch
+cmake-mapserver-include.patch
--
Packaging for MapCache
___
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] mapcache tag, debian/1.2.0-1, updated. upstream/1.2.0-94-gc9506ab
The tag, debian/1.2.0-1 has been updated to c9506ab2b8ab13c09bc8344098cfe51d59619eee (commit) from 230249f8edf840d6737d85098b32eb2e349a636a - Shortlog commit c9506ab2b8ab13c09bc8344098cfe51d59619eee Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Sep 21 20:13:05 2013 +0200 Add patch to include mapserver cmake package. --- -- Packaging for MapCache ___ 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] mapserver branch, jessie, updated. upstream/6.4.0_rc1-156-g6a27df0
The following commit has been merged in the jessie branch: commit 6a27df0ed0b193c46204b757fc7edfefd41373ee Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 23 02:55:11 2013 +0200 Fix changelog. diff --git a/debian/changelog b/debian/changelog index c020044..fae6e86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,10 @@ -mapserver (6.4.0-3) UNRELEASED; urgency=low - - * Improve patch to export mapserver.cmake for external projects. - - -- Bas Couwenberg sebas...@xs4all.nl Sun, 22 Sep 2013 22:27:32 +0200 - mapserver (6.4.0-2) unstable; urgency=low * Also include mapserver-config.h and mapserver-version.h in dev package. Required to build MapCache with MapServer support. * Use php5enmod and php5dismod instead of installing the ini directly. (closes: #667771) - * Add patch to export mapserver.cmake for external projects. + * Add patch to export mapserver cmake package for external projects. * Add versioned Breaks/Replaces for dev package. * Drop transitional packages and Breaks/Replaces for libmapserver. (closes: #723979) -- Packaging for MapServer ___ 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] mapserver branch, master, updated. upstream/6.4.0_rc1-156-g6a27df0
The following commit has been merged in the master branch: commit 6a27df0ed0b193c46204b757fc7edfefd41373ee Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 23 02:55:11 2013 +0200 Fix changelog. diff --git a/debian/changelog b/debian/changelog index c020044..fae6e86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,10 @@ -mapserver (6.4.0-3) UNRELEASED; urgency=low - - * Improve patch to export mapserver.cmake for external projects. - - -- Bas Couwenberg sebas...@xs4all.nl Sun, 22 Sep 2013 22:27:32 +0200 - mapserver (6.4.0-2) unstable; urgency=low * Also include mapserver-config.h and mapserver-version.h in dev package. Required to build MapCache with MapServer support. * Use php5enmod and php5dismod instead of installing the ini directly. (closes: #667771) - * Add patch to export mapserver.cmake for external projects. + * Add patch to export mapserver cmake package for external projects. * Add versioned Breaks/Replaces for dev package. * Drop transitional packages and Breaks/Replaces for libmapserver. (closes: #723979) -- Packaging for MapServer ___ 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] mapserver tag, debian/6.4.0-2, updated. upstream/6.4.0_rc1-156-g6a27df0
The tag, debian/6.4.0-2 has been updated to 6a27df0ed0b193c46204b757fc7edfefd41373ee (commit) from e40ea6a90908f8d66f757adbd0692c3a4dfd0e57 - Shortlog commit 6a27df0ed0b193c46204b757fc7edfefd41373ee Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 23 02:55:11 2013 +0200 Fix changelog. --- -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#724259: mapserver: FTBFS: Could NOT find PerlLibs (missing: PERL_LIBRARY)
Source: mapserver Version: 6.4.0-1 Severity: serious Justification: fails to build from source The automated builds of mapserver on i386 and kfreebsd-i386 failed: -- Found Perl: /usr/bin/perl (found version 5.18.1) CMake Error at /usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:108 (message): Could NOT find PerlLibs (missing: PERL_LIBRARY) Call Stack (most recent call first): /usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:315 (_FPHSA_FAILURE_MESSAGE) cmake/FindPerlLibs.cmake:278 (find_package_handle_standard_args) mapscript/perl/CMakeLists.txt:4 (FIND_PACKAGE) I'd suggest declaring a build dependency on libperl-dev. (I'm not sure offhand why this wasn't an issue elsewhere; i386 is unusual in shipping only a static libperl, but I didn't think kfreebsd-i386 worked the same way, and regardless I'd expect Perl's headers to be necessary.) At any rate, could you please take a look? Thanks! ___ 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] mapserver branch, jessie, updated. upstream/6.4.0_rc1-157-gce04d45
The following commit has been merged in the jessie branch: commit ce04d454304d777232dd1c9de678858807a97faa Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 23 03:46:43 2013 +0200 Build-Depend on libperl-dev so cmake can find PerlLibs. diff --git a/debian/changelog b/debian/changelog index fae6e86..c0890c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ mapserver (6.4.0-2) unstable; urgency=low * Drop transitional packages and Breaks/Replaces for libmapserver. (closes: #723979) * Drop unused lintian-overrides for php5-mapscript. + * Build-Depend on libperl-dev so cmake can find PerlLibs. +(closes: #724259) -- Bas Couwenberg sebas...@xs4all.nl Thu, 19 Sep 2013 19:52:12 +0200 diff --git a/debian/control b/debian/control index 793b3de..0f12091 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: debhelper (= 9), libpq-dev, php5-dev, swig, + libperl-dev, python-all (= 2.6.6-3~), python-all-dev (= 2.6.6-3~), ruby1.9.1, -- Packaging for MapServer ___ 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] mapserver branch, master, updated. upstream/6.4.0_rc1-157-gce04d45
The following commit has been merged in the master branch: commit ce04d454304d777232dd1c9de678858807a97faa Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 23 03:46:43 2013 +0200 Build-Depend on libperl-dev so cmake can find PerlLibs. diff --git a/debian/changelog b/debian/changelog index fae6e86..c0890c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ mapserver (6.4.0-2) unstable; urgency=low * Drop transitional packages and Breaks/Replaces for libmapserver. (closes: #723979) * Drop unused lintian-overrides for php5-mapscript. + * Build-Depend on libperl-dev so cmake can find PerlLibs. +(closes: #724259) -- Bas Couwenberg sebas...@xs4all.nl Thu, 19 Sep 2013 19:52:12 +0200 diff --git a/debian/control b/debian/control index 793b3de..0f12091 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: debhelper (= 9), libpq-dev, php5-dev, swig, + libperl-dev, python-all (= 2.6.6-3~), python-all-dev (= 2.6.6-3~), ruby1.9.1, -- Packaging for MapServer ___ 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] mapserver tag, debian/6.4.0-2, updated. upstream/6.4.0_rc1-157-gce04d45
The tag, debian/6.4.0-2 has been updated to ce04d454304d777232dd1c9de678858807a97faa (commit) from 6a27df0ed0b193c46204b757fc7edfefd41373ee - Shortlog commit ce04d454304d777232dd1c9de678858807a97faa Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 23 03:46:43 2013 +0200 Build-Depend on libperl-dev so cmake can find PerlLibs. --- -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#724259: mapserver: FTBFS: Could NOT find PerlLibs (missing: PERL_LIBRARY)
Hi Aaron, Thanks for bringing reporting this. The problem was indeed the missing build dependency on libperl-dev. I've successfully build the fixed package in a i386 chroot. The fixed package has been uploaded to mentors and is waiting for sponsorship (#723991). Kind Regards, Bas -- GnuPG: 0xE88D4AF1 (new) / 0x77A975AD (old) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: Re: mapserver: FTBFS: Could NOT find PerlLibs (missing: PERL_LIBRARY)
Processing commands for cont...@bugs.debian.org: fixed 724259 6.4.0-2 Bug #724259 [src:mapserver] mapserver: FTBFS: Could NOT find PerlLibs (missing: PERL_LIBRARY) The source 'mapserver' and version '6.4.0-2' do not appear to match any binary packages Marked as fixed in versions mapserver/6.4.0-2. tags 724259 pending Bug #724259 [src:mapserver] mapserver: FTBFS: Could NOT find PerlLibs (missing: PERL_LIBRARY) Added tag(s) pending. thanks Stopping processing here. Please contact me if you need assistance. -- 724259: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724259 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: Re: Please make use of new php5enmod and php5dismod commands in your package
Processing control commands: fixed -1 6.4.0-2 Bug #667771 [php5-mapscript] Please make use of new php5enmod and php5dismod commands in your package There is no source info for the package 'php5-mapscript' at version '6.4.0-2' with architecture '' Unable to make a source version for version '6.4.0-2' Marked as fixed in versions 6.4.0-2. tags 667771 pending Bug #667771 [php5-mapscript] Please make use of new php5enmod and php5dismod commands in your package Added tag(s) pending. -- 667771: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667771 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#667771: Please make use of new php5enmod and php5dismod commands in your package
Control: fixed -1 6.4.0-2 Control: tags 667771 pending Hi Ondřej, An updated mapserver package incorporating the php5enmod/php5sidmod changes has been uploaded to mentors and is waiting for sponsorship (#723991). Kind Regards, Bas ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
