This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch wheezy-backports
in repository mapcache.

commit 81865b4e3a9ac746ab1638368aebc58a78cd101f
Merge: fb876d4 ec88fd6
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Wed Oct 9 17:40:38 2013 +0200

    Merge branch 'jessie' into wheezy-backports
    
    Conflicts:
        debian/changelog
        debian/control
        debian/rules

 .gitignore                                         |    23 +-
 CMakeLists.txt                                     |   281 +
 INSTALL                                            |    58 +-
 Makefile                                           |    45 -
 Makefile.inc.in                                    |   101 -
 Makefile.vc                                        |     4 +-
 acinclude.m4                                       |     0
 aclocal.m4                                         |  8620 ---------
 apache/CMakeLists.txt                              |    48 +
 apache/Makefile.in                                 |    23 -
 apache/mod_mapcache-config.h.in                    |     6 +
 apache/mod_mapcache.c                              |    10 +-
 cgi/CMakeLists.txt                                 |    35 +
 cgi/Makefile.in                                    |    23 -
 cgi/mapcache-cgi-config.h.in                       |     6 +
 cgi/mapcache.c                                     |     1 +
 cmake/FindAPACHE.cmake                             |    32 +
 cmake/FindAPR.cmake                                |    78 +
 cmake/FindBerkeleyDB.cmake                         |    87 +
 cmake/FindFCGI.cmake                               |    11 +
 cmake/FindGEOS.cmake                               |    28 +
 cmake/FindGEOTIFF.cmake                            |    13 +
 cmake/FindMAPSERVER.cmake                          |    15 +
 cmake/FindPCRE.cmake                               |    14 +
 cmake/FindPixman.cmake                             |    25 +
 cmake/FindSQLITE.cmake                             |    15 +
 config.guess                                       |  1517 --
 config.sub                                         |  1760 --
 configure                                          | 18752 -------------------
 configure.in                                       |  1811 --
 debian/changelog                                   |    42 +-
 debian/control                                     |    93 +-
 debian/copyright                                   |     6 +-
 debian/libapache2-mod-mapcache.apache2             |     2 +-
 ...cache0-dev.install => libmapcache1-dev.install} |     1 -
 .../{libmapcache0.install => libmapcache1.install} |     0
 .../{libmapcache0.postrm => libmapcache1.postinst} |     4 +
 .../{libmapcache0.postinst => libmapcache1.postrm} |     4 +
 .../{libmapcache0.symbols => libmapcache1.symbols} |    27 +-
 debian/patches/cmake-mapserver-include.patch       |    45 +
 debian/patches/demo_service_html5_doctype.patch    |    17 -
 debian/patches/demo_service_html_charset.patch     |    79 -
 debian/patches/demo_service_indenting.patch        |    33 -
 debian/patches/demo_service_js_typos.patch         |    65 -
 debian/patches/demo_service_list_newlines.patch    |    25 -
 debian/patches/demo_service_page_height.patch      |    29 -
 debian/patches/demo_service_valid_js_var.patch     |    32 -
 debian/patches/fixwithmapserv.patch                |    14 -
 debian/patches/includepath.patch                   |    14 -
 debian/patches/libmapcache_hardening.patch         |    14 -
 debian/patches/mapcache_seed_delete_mode.patch     |    15 -
 debian/patches/mapcache_seed_non_zero_exit.patch   |    30 -
 debian/patches/mapcache_seed_typo.patch            |    19 -
 debian/patches/series                              |    15 +-
 debian/patches/soname.patch                        |    18 +
 debian/rules                                       |    64 +-
 debian/watch                                       |     3 +-
 include/mapcache-config.h.in                       |    19 +
 include/mapcache-version.h.in                      |    11 +
 include/mapcache.h                                 |    85 +-
 install-sh                                         |   527 -
 lib/Makefile.in                                    |    32 -
 lib/buffer.c                                       |     2 +-
 lib/cache_bdb.c                                    |   117 +-
 lib/cache_disk.c                                   |     2 +-
 lib/cache_memcache.c                               |     1 +
 lib/cache_sqlite.c                                 |   108 +-
 lib/cache_tiff.c                                   |     1 +
 lib/configuration.c                                |    19 +-
 lib/configuration_xml.c                            |    93 +
 lib/core.c                                         |   194 +-
 lib/dimension.c                                    |   373 +
 lib/grid.c                                         |     8 +-
 lib/http.c                                         |    16 +-
 lib/image.c                                        |    16 +-
 lib/imageio_png.c                                  |   152 +-
 lib/service_demo.c                                 |   351 +-
 lib/service_kml.c                                  |     2 +-
 lib/service_mapguide.c                             |   267 +
 lib/service_tms.c                                  |    39 +-
 lib/service_wms.c                                  |   106 +-
 lib/service_wmts.c                                 |   500 +-
 lib/source_mapserver.c                             |     9 +-
 lib/tileset.c                                      |   210 +-
 ltmain.sh                                          |  9661 ----------
 mapcache.xml                                       |     2 +-
 mapcache.xml.sample                                |    20 +-
 nginx/CMakeLists.txt                               |     6 +
 nginx/config.in                                    |     8 +-
 nmake.opt                                          |   101 +-
 packaging/centos/mapcache.spec                     |    46 +
 reconfigure.sh                                     |     8 -
 release-notes.sh                                   |    11 +
 util/CMakeLists.txt                                |    43 +
 util/Makefile.in                                   |    22 -
 util/mapcache-util-config.h.in                     |     7 +
 util/mapcache_seed.c                               |   161 +-
 97 files changed, 3517 insertions(+), 43991 deletions(-)

diff --cc debian/changelog
index 67acb61,a75ca17..d938530
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,35 +1,41 @@@
- mapcache (1.0.0-3~bpo70+1linuxminded8) wheezy-backports; urgency=low
++mapcache (1.2.0-1~bpo70+1linuxminded1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Bas Couwenberg <sebas...@xs4all.nl>  Fri, 21 Jun 2013 20:56:28 +0200
 +
+ mapcache (1.2.0-1) unstable; urgency=low
+ 
+   * New upstream release 1.2.0. (closes: #712377)
+   * Update watch file for github releases.
+   * Build system changed from autotools to cmake.
+   * Drop patches:
+     - includepath.patch (no longer required)
+     - fixwithmapserv.patch (libtool no longer used)
+     - libmapcache_hardening.patch (libtool no longer used)
+     - demo_service_js_typos.patch (applied upstream)
+     - demo_service_valid_js_var.patch (applied upstream)
+     - demo_service_html5_doctype.patch (applied upstream)
+     - demo_service_html_charset.patch (applied upstream)
+     - demo_service_list_newlines.patch (applied upstream)
+     - demo_service_page_height.patch (applied upstream)
+     - demo_service_indenting.patch (applied upstream)
+     - mapcache_seed_non_zero_exit.patch (applied upstream)
+     - mapcache_seed_delete_mode.patch (applied upstream)
+     - mapcache_seed_typo.patch (applied upstream)
+   * Use pkgkde-gensymbols & pkgkde-symbolshelper to handle symbols.
+   * Add patch to use a versioned SONAME.
+   * SONAME of libmapcache changed from libmapcache.so.0 to
+     libmapcache.so.1.
+   * Update libmapcache symbols for 1.2.0 on amd64.
+   * 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
+ 
  mapcache (1.0.0-3) UNRELEASED; urgency=low
  
    * Upload for Debian closes: #712377
diff --cc debian/control
index 5a1ab7c,023fa1f..5c19463
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,52 +1,51 @@@
  Source: mapcache
+ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
+ Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
+            Alan Boudreault <aboudrea...@mapgears.com>,
+            Bas Couwenberg <sebas...@xs4all.nl>
  Section: devel
  Priority: extra
- Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
- Uploaders: Francesco Paolo Lovergine <fran...@debian.org>, Alan Boudreault 
<aboudrea...@mapgears.com>, Bas Couwenberg <sebas...@xs4all.nl>
- Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
-  libcurl4-gnutls-dev, libpng-dev, libjpeg-dev, zlib1g-dev (>= 1.1.4),
-  libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9),
-  libgdal1-dev (>=1.9.0), libproj-dev, libgeos-dev (>= 3.3.1-1~),
-  libfribidi-dev, libcairo2-dev,
-  apache2-prefork-dev, libfcgi-dev,
-  libpcre3-dev, libpixman-1-dev,
-  libsqlite3-dev, libtiff4-dev,
-  libmapserver-6.2.1, libmapserver-6.2.1-dev,
-  autoconf, dh-autoreconf, chrpath,
-  docbook2x, docbook-xsl, docbook-xml, xsltproc
+ Build-Depends: debhelper (>= 9),
+                dpkg-dev (>= 1.16.1.1),
+                libcurl4-gnutls-dev,
+                libpng-dev,
+                libjpeg-dev,
+                zlib1g-dev,
 -               libgd-dev,
++               libgd2-xpm-dev (>= 2.0.1-10),
+                libfreetype6-dev,
+                libgdal1-dev (>= 1.9.0),
+                libproj-dev,
+                libgeos-dev (>= 3.3.1-1~),
+                libfribidi-dev,
+                libcairo2-dev,
+                librsvg2-dev,
 -               apache2-dev,
 -               dh-apache2,
++               apache2-prefork-dev,
+                libfcgi-dev,
+                libpcre3-dev,
+                libpixman-1-dev,
+                libsqlite3-dev,
+                libtiff-dev,
 -               libmapserver1 (>= 6.4.0-2),
 -               libmapserver1-dev (>= 6.4.0-2),
++               libmapserver1 (>= 6.4.0-2~),
++               libmapserver1-dev (>= 6.4.0-2~),
+                chrpath,
+                cmake,
+                pkg-config,
+                pkg-kde-tools,
+                docbook2x,
+                docbook-xsl,
+                docbook-xml,
+                xsltproc
  Standards-Version: 3.9.4
- Homepage: http://mapserver.org/en/mapcache/
  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
- Provides: libmapcache
- Breaks: libmapcache (<= 1.0.0)
- Section: libs
+ Package: libmapcache1
  Architecture: any
+ Section: libs
+ Depends: ${shlibs:Depends},
+          ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
- Depends: ${shlibs:Depends}, ${misc:Depends}
  Description: tile caching server - shared library
   This package contains the shared library.
   .
@@@ -75,10 -103,10 +102,12 @@@ Description: tile caching server - tool
   solution.
  
  Package: libapache2-mod-mapcache
- Section: web
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends},
-  apache2-mpm-prefork | apache2-mpm-itk, apache2.2-common
+ Section: web
+ Depends: ${shlibs:Depends},
 -         ${misc:Depends}
++         ${misc:Depends},
++         apache2-mpm-prefork | apache2-mpm-itk,
++         apache2.2-common
  Description: tile caching server - Apache module
   This is the MapCache module for the Apache web server implementing OGC web
   services. An alternative mapcache FastCGI program is available in
diff --cc debian/rules
index c90f35e,b185364..310ccf0
--- a/debian/rules
+++ b/debian/rules
@@@ -26,8 -28,29 +28,29 @@@ LDFLAGS:=$(shell dpkg-buildflags --get 
  CFLAGS+=$(CPPFLAGS)
  CFLAGS+=$(LDFLAGS)
  
+ MAPCACHE_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: 
\(.*\)-.*/\1/p' | sed -e 's/^\(.*\)~.*/\1/' | sed -e 's/dev.*/.0/')
+ 
+ MAKE_VERBOSE=1
+ 
+ COMMON_CONFIG = -DCMAKE_INSTALL_PREFIX=/usr \
+               -DWITH_PIXMAN=1 \
+               -DWITH_SQLITE=1 \
+               -DWITH_BERKELEY_DB=0 \
+               -DWITH_MEMCACHE=0 \
+               -DWITH_TIFF=1 \
+               -DWITH_TIFF_WRITE_SUPPORT=0 \
+               -DWITH_GEOTIFF=0 \
+               -DWITH_MAPSERVER=1 \
+               -DWITH_PCRE=1 \
+               -DWITH_APACHE=1 \
+               -DWITH_VERSION_STRING=1 \
+               -DWITH_CGI=1 \
+               -DWITH_FCGI=1 \
+               -DWITH_GEOS=1 \
+               -DWITH_OGR=1
+ 
  %:
-       dh $@ --with autoreconf
 -      dh $@ --with apache2,pkgkde_symbolshelper
++      dh $@ --with pkgkde_symbolshelper
  
  override_dh_clean:
        dh_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapcache.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to