Bug#693694: Please package geos 3.3.6

2012-11-19 Thread Tom Feiner
Package: geos
Severity: wishlist

Hi,

There's is a new geos version out (3.3.6). Are there plans of packaging it ?
I'd be glad to help with the packaging/testing if needed.

Thank you,
Tom Feiner
___
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.0.1-38-g726c38d

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit 3b4c722608724b81ea5d7798800e750529ac8537
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 13:53:09 2012 +

New upstream release: 6.2.0

diff --git a/debian/changelog b/debian/changelog
index c50d8df..06fdabb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mapserver (6.2.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Added libmapserver package
+  * Added patch to fix mapscriptvars to send the right argument to ld
+  * Changed php5-mapscript dependencies, removed misc:depends and added
+libapache2-mod-php5 explicitly
+
+ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
13:43:51 +
+
 mapserver (6.0.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index ec63514..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+8
diff --git a/debian/control b/debian/control
index 73679f0..f71de52 100644
--- a/debian/control
+++ b/debian/control
@@ -4,22 +4,35 @@ Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault 
aboudrea...@mapgears.com
 Standards-Version: 3.9.3
-Build-Depends: debhelper (= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
- libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal1-dev (=1.4.0), libproj-dev,
- libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (= 
2.6.6-3~), libgeos-dev (= 3.3.1-1~),
+Build-Depends: debhelper (= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
+ libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal1-dev (=1.9.0), libproj-dev,
+ libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (= 
2.6.6-3~), libgeos-dev (= 3.2.1-1~),
  ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
- sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
+ sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
  libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, 
libreadline-dev, 
- libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev, libcairo2-dev
+ libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
 Build-Conflicts: libcurl3-openssl-dev
 Homepage: http://www.mapserver.org
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/mapserver.git
 
+Package: libmapserver
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+Description: Shared library for MapServer
+ This package contains the shared library.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards. Scripting
+ functionality in MapScript is provided by the suggested mapscript
+ library packages.
+
 Package: php5-mapscript
 Section: php
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, libapache2-mod-php5
 Suggests: mapserver-bin, mapserver-doc
 Description: php5-cgi module for MapServer
  PHP MapScript provides MapServer functions for PHP scripts.
diff --git a/debian/libmapserver-dev.install b/debian/libmapserver-dev.install
new file mode 100644
index 000..d942dcd
--- /dev/null
+++ b/debian/libmapserver-dev.install
@@ -0,0 +1,3 @@
+usr/bin/mapserver-config
+usr/include
+usr/lib/libmapserver.la
diff --git a/debian/libmapserver.install b/debian/libmapserver.install
new file mode 100644
index 000..6546608
--- /dev/null
+++ b/debian/libmapserver.install
@@ -0,0 +1 @@
+usr/lib/libmapserver*.so*
\ No newline at end of file
diff --git a/debian/mapserver-bin.install b/debian/mapserver-bin.install
index 1df36c6..8cd575d 100644
--- a/debian/mapserver-bin.install
+++ b/debian/mapserver-bin.install
@@ -1 +1,10 @@
-usr/bin/*
+/usr/bin/msencrypt
+/usr/bin/shptreevis
+/usr/bin/tile4ms
+/usr/bin/shptreetst
+/usr/bin/shp2img
+/usr/bin/mapserv
+/usr/bin/sortshp
+/usr/bin/scalebar
+/usr/bin/legend
+/usr/bin/shptree
diff --git a/debian/patches/fixgeos b/debian/patches/fixgeos
deleted file mode 100644
index bf29841..000
--- a/debian/patches/fixgeos
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: mapserver/configure
-===
 mapserver.orig/configure   2012-03-05 11:50:29.0 +0100
-+++ mapserver/configure2012-03-05 12:41:30.0 +0100
-@@ -11567,7 +11567,7 @@
- 
-   GEOS_INCDIR=`$GEOS_CONFIG --includes`
-   GEOS_INC=-I$GEOS_INCDIR
--  GEOS_LIB=`$GEOS_CONFIG --libs`_c
-+  GEOS_LIB=`$GEOS_CONFIG --clibs`
- 
-   GEOS_ENABLED=$GEOS_ENABLED
- 
-Index: mapserver/configure.in
-===
 mapserver.orig/configure.in2012-03-05 11:50:29.0 +0100
-+++ mapserver/configure.in 2012-03-05 

[SCM] mapserver branch, master, updated. upstream/6.0.1-38-g726c38d

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit a48034895e5940b03663f7e7298e76359a917613
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:30:12 2012 +

Fixed libmapserver-dev headers

diff --git a/debian/libmapserver-dev.install b/debian/libmapserver-dev.install
index d942dcd..d2dbbc7 100644
--- a/debian/libmapserver-dev.install
+++ b/debian/libmapserver-dev.install
@@ -1,3 +1,3 @@
 usr/bin/mapserver-config
-usr/include
+usr/include/*
 usr/lib/libmapserver.la
diff --git a/debian/rules b/debian/rules
index 28f3b70..02da4e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -185,7 +185,9 @@ install-arch-stamp: build-arch
 
#echo 'misc:Depends=libapache2-mod-php5'  
debian/php5-mapscript.substvars
 
-   -mkdir -p debian/tmp/usr/include/
+   # libmapserver-dev headers
+   -mkdir -p debian/tmp/usr/include
+   install -m755 mapserver.h debian/tmp/usr/include/
 
touch install-arch-stamp
 

-- 
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.0.1-38-g726c38d

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit 726c38de6320ced3d1ac8e4cd24c090ff4d740be
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 21:28:55 2012 +

Adds all headers file to /usr/include/mapserver/ with libmapserver-dev

diff --git a/debian/libmapserver-dev.install b/debian/libmapserver-dev.install
index d2dbbc7..942bdc2 100644
--- a/debian/libmapserver-dev.install
+++ b/debian/libmapserver-dev.install
@@ -1,3 +1,3 @@
 usr/bin/mapserver-config
-usr/include/*
+usr/include/mapserver/*
 usr/lib/libmapserver.la
diff --git a/debian/rules b/debian/rules
index 02da4e4..3644e6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,8 +186,8 @@ install-arch-stamp: build-arch
#echo 'misc:Depends=libapache2-mod-php5'  
debian/php5-mapscript.substvars
 
# libmapserver-dev headers
-   -mkdir -p debian/tmp/usr/include
-   install -m755 mapserver.h debian/tmp/usr/include/
+   -mkdir -p debian/tmp/usr/include/mapserver/
+   install -m755 *.h debian/tmp/usr/include/mapserver/
 
touch install-arch-stamp
 

-- 
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, ubuntu/lucid, updated. upstream/6.0.1-44-gce923a6

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/lucid branch:
commit b9778c893763b2592756a20b4aa8f0d8c138693b
Merge: 5c4c653fd83d21bb64ef3566c01fd3be33fc6081 
3d9be41a3314308b451a759b7e57d55fc4d90ce8
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:06:05 2012 +

Merge branch 'master' into ubuntu/lucid

diff --combined debian/changelog
index 9ac1cd8,06fdabb..c4faddf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,16 @@@
++mapserver (6.2.0-2~lucid2) lucid; urgency=low
++
++  * Launchpad build for Lucid
++  * Added libmapserver-dev
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:06:17 +
++
 +mapserver (6.2.0-2~lucid1) lucid; urgency=low
 +
 +  * Launchpad build for Lucid
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:49:21 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release
diff --combined debian/control
index 6295f20,ef1aae1..afb8344
--- a/debian/control
+++ b/debian/control
@@@ -6,7 -6,7 +6,7 @@@ Uploaders: Francesco Paolo Lovergine f
  Standards-Version: 3.9.3
  Build-Depends: debhelper (= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
   libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal1-dev (=1.9.0), libproj-dev,
 - libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (= 
2.6.6-3~), libgeos-dev (= 3.2.1-1~),
 + libpq-dev, php5-dev, swig, python-all (= 2.6), python-all-dev (= 2.6), 
libgeos-dev (= 3.2.1-1~),
   ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
   sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
   libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, 
libreadline-dev, 
@@@ -29,6 -29,19 +29,19 @@@ Description: Shared library for MapServ
   functionality in MapScript is provided by the suggested mapscript
   library packages.
  
+ Package: libmapserver-dev
+ Section: libdevel
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+ Description: Shared library for MapServer
+  This package contains the shared library.
+  .
+  MapServer is a CGI-based framework for Internet map services which
+  supports Open Geospatial Consortium (OGC) standards. Scripting
+  functionality in MapScript is provided by the suggested mapscript
+  library packages.
+ 
  Package: php5-mapscript
  Section: php
  Architecture: any
diff --combined debian/rules
index 9b886d2,28f3b70..535f4c0
--- a/debian/rules
+++ b/debian/rules
@@@ -185,6 -185,8 +185,8 @@@ install-arch-stamp: build-arc
  
#echo 'misc:Depends=libapache2-mod-php5'  
debian/php5-mapscript.substvars
  
+   -mkdir -p debian/tmp/usr/include/
+ 
touch install-arch-stamp
  
  binary-indep: install-indep
@@@ -212,7 -214,7 +214,7 @@@ binary-arch: install-arc
dh_installexamples -a
chmod a-x 
debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml
dh_installdebconf -a
 -  dh_python2 -ppython-mapscript
 +  dh_python -ppython-mapscript
dh_compress -a
dh_link -a
# Overrides a mismatched error from lintian

-- 
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, ubuntu/lucid, updated. upstream/6.0.1-44-gce923a6

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/lucid branch:
commit 962282db46896ea9f3c306c970edd765fd9e5660
Merge: b9778c893763b2592756a20b4aa8f0d8c138693b 
a48034895e5940b03663f7e7298e76359a917613
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:54:16 2012 +

Merge branch 'master' into ubuntu/lucid

diff --combined debian/changelog
index c4faddf,06fdabb..20bd6e8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,3 +1,23 @@@
++mapserver (6.2.0-2~lucid3) lucid; urgency=high
++
++  * Launchpad build for Lucid
++  * Fixed libmapserver-dev headers
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:54:34 +
++
 +mapserver (6.2.0-2~lucid2) lucid; urgency=low
 +
 +  * Launchpad build for Lucid
 +  * Added libmapserver-dev
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:06:17 +
 +
 +mapserver (6.2.0-2~lucid1) lucid; urgency=low
 +
 +  * Launchpad build for Lucid
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:49:21 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release
diff --combined debian/rules
index 535f4c0,02da4e4..840777c
--- a/debian/rules
+++ b/debian/rules
@@@ -185,7 -185,9 +185,9 @@@ install-arch-stamp: build-arc
  
#echo 'misc:Depends=libapache2-mod-php5'  
debian/php5-mapscript.substvars
  
-   -mkdir -p debian/tmp/usr/include/
+   # libmapserver-dev headers
+   -mkdir -p debian/tmp/usr/include
+   install -m755 mapserver.h debian/tmp/usr/include/
  
touch install-arch-stamp
  
@@@ -214,7 -216,7 +216,7 @@@ binary-arch: install-arc
dh_installexamples -a
chmod a-x 
debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml
dh_installdebconf -a
 -  dh_python2 -ppython-mapscript
 +  dh_python -ppython-mapscript
dh_compress -a
dh_link -a
# Overrides a mismatched error from lintian

-- 
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, ubuntu/lucid, updated. upstream/6.0.1-44-gce923a6

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/lucid branch:
commit 5c4c653fd83d21bb64ef3566c01fd3be33fc6081
Merge: d2400a50bd13b9f29097a40e94a9eda84bfd359c 
3b4c722608724b81ea5d7798800e750529ac8537
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 15:03:16 2012 +

6.2.0 Update for Lucid

Merge branch 'master' into ubuntu/lucid

diff --combined debian/changelog
index e3ca86b,06fdabb..9ac1cd8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,12 +1,18 @@@
- mapserver (6.0.3-2~lucid2) lucid; urgency=medium
++mapserver (6.2.0-2~lucid1) lucid; urgency=low
 +
-   * Fix bad dependency: libgdal1 - libgdal.
++  * Launchpad build for Lucid
 +
-  -- Alan Boudreault aboudrea...@mapgears.com  Tue, 22 May 2012 23:43:57 
+
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:49:21 +
 +
- mapserver (6.0.3-2~lucid1) lucid; urgency=low
+ mapserver (6.2.0-1) unstable; urgency=low
  
-   * Launchpad build for Lucid.
+   * New upstream release
+   * Added libmapserver package
+   * Added patch to fix mapscriptvars to send the right argument to ld
+   * Changed php5-mapscript dependencies, removed misc:depends and added
+ libapache2-mod-php5 explicitly
  
-  -- Alan Boudreault aboudrea...@mapgears.com  Tue, 22 May 2012 13:56:21 
+
+  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
13:43:51 +
  
  mapserver (6.0.3-1) unstable; urgency=low
  
diff --combined debian/control
index c07ddde,f71de52..6295f20
--- a/debian/control
+++ b/debian/control
@@@ -5,21 -5,34 +5,34 @@@ Maintainer: Debian GIS Project pkg-gra
  Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault 
aboudrea...@mapgears.com
  Standards-Version: 3.9.3
  Build-Depends: debhelper (= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
-  libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal-dev (=1.4.0), libproj-dev,
-  libpq-dev, php5-dev, swig, python-all (= 2.6), python-all-dev (= 2.6), 
libgeos-dev (= 3.2),
+  libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal1-dev (=1.9.0), libproj-dev,
 - libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (= 
2.6.6-3~), libgeos-dev (= 3.2.1-1~),
++ libpq-dev, php5-dev, swig, python-all (= 2.6), python-all-dev (= 2.6), 
libgeos-dev (= 3.2.1-1~),
   ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
-  sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
+  sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
   libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, 
libreadline-dev, 
-  libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev, libcairo2-dev
+  libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
  Build-Conflicts: libcurl3-openssl-dev
  Homepage: http://www.mapserver.org
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
  Vcs-Git: git://git.debian.org/git/pkg-grass/mapserver.git
  
+ Package: libmapserver
+ Section: libs
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+ Description: Shared library for MapServer
+  This package contains the shared library.
+  .
+  MapServer is a CGI-based framework for Internet map services which
+  supports Open Geospatial Consortium (OGC) standards. Scripting
+  functionality in MapScript is provided by the suggested mapscript
+  library packages.
+ 
  Package: php5-mapscript
  Section: php
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Depends: ${shlibs:Depends}, libapache2-mod-php5
  Suggests: mapserver-bin, mapserver-doc
  Description: php5-cgi module for MapServer
   PHP MapScript provides MapServer functions for PHP scripts.
diff --combined debian/rules
index 9d9a3cb,4b4b224..9b886d2
--- a/debian/rules
+++ b/debian/rules
@@@ -15,9 -15,7 +15,7 @@@ version_major=$(shell expr `pwd` : '.*-
  CURDIR := $(shell pwd)
  PYVERS=$(shell pyversions -r debian/control)
  RUBYVERS=1.8 1.9.1
- PHP5API=$(shell php-config5 --phpapi)
- PHP5DIR=$(shell php-config5 --extension-dir)
- 
+ #PHP5API=$(shell php-config5 --phpapi)
  
  # Configure config :
  # Not using non free libpdf
@@@ -26,7 -24,6 +24,6 @@@
  
  
  COMMON_CONFIG=--prefix=/usr \
-   --enable-debug \
--without-tiff \
--without-pdf \
--with-gd=/usr \
@@@ -49,28 -46,20 +46,20 @@@
--with-geos \
--with-fastcgi \
--with-agg \
-   --with-experimental-png \
+   --with-php \
--with-cairo
  
  rstoptions=--stylesheet=mapscript.css --link-stylesheet 
  
- MS_CFLAGS=-g -O2
+ MS_CFLAGS=-O2
  MS_CXXFLAGS=$(MS_CFLAGS)
  
  configure-stamp:
dh_testdir
./configure $(COMMON_CONFIG) CFLAGS=$(MS_CFLAGS) 
CXXFLAGS=$(MS_CXXFLAGS)
  
- 
touch configure-stamp
  
- configure-php5-stamp: clean-first-build
-   dh_testdir
-   

[SCM] mapserver branch, ubuntu/lucid, updated. upstream/6.0.1-44-gce923a6

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/lucid branch:
commit ce923a640a5fcaf07765fa41fae01816db4b5a31
Merge: 962282db46896ea9f3c306c970edd765fd9e5660 
726c38de6320ced3d1ac8e4cd24c090ff4d740be
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 21:50:23 2012 +

Merge branch 'master' into ubuntu/lucid

diff --combined debian/changelog
index 20bd6e8,06fdabb..2fabb1d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,3 +1,31 @@@
++mapserver (6.2.0-2~lucid4) lucid; urgency=medium
++
++  * Launchpad build for Lucid
++  * Added every mapserver headers in libmapserver-dev in
++/usr/include/mapserver/
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
21:50:31 +
++
 +mapserver (6.2.0-2~lucid3) lucid; urgency=high
 +
 +  * Launchpad build for Lucid
 +  * Fixed libmapserver-dev headers
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:54:34 +
 +
 +mapserver (6.2.0-2~lucid2) lucid; urgency=low
 +
 +  * Launchpad build for Lucid
 +  * Added libmapserver-dev
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:06:17 +
 +
 +mapserver (6.2.0-2~lucid1) lucid; urgency=low
 +
 +  * Launchpad build for Lucid
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:49:21 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release
diff --combined debian/rules
index 840777c,3644e6f..be2fd30
--- a/debian/rules
+++ b/debian/rules
@@@ -186,8 -186,8 +186,8 @@@ install-arch-stamp: build-arc
#echo 'misc:Depends=libapache2-mod-php5'  
debian/php5-mapscript.substvars
  
# libmapserver-dev headers
-   -mkdir -p debian/tmp/usr/include
-   install -m755 mapserver.h debian/tmp/usr/include/
+   -mkdir -p debian/tmp/usr/include/mapserver/
+   install -m755 *.h debian/tmp/usr/include/mapserver/
  
touch install-arch-stamp
  
@@@ -216,7 -216,7 +216,7 @@@ binary-arch: install-arc
dh_installexamples -a
chmod a-x 
debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml
dh_installdebconf -a
 -  dh_python2 -ppython-mapscript
 +  dh_python -ppython-mapscript
dh_compress -a
dh_link -a
# Overrides a mismatched error from lintian

-- 
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, ubuntu/oneiric, updated. upstream/6.0.1-45-g5903ccc

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/oneiric branch:
commit 9351250b1e18d1953126442da7816f13fa5a4087
Merge: 25b0b731cd835f85b938e700448369b9e88e319a 
3d9be41a3314308b451a759b7e57d55fc4d90ce8
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:09:31 2012 +

Merge branch 'master' into ubuntu/oneiric

diff --combined debian/changelog
index c1e6671,06fdabb..836fda1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,3 +1,22 @@@
++mapserver (6.2.0-2~oneiric2) oneiric; urgency=low
++
++  * Launchpad build for Oneiric
++  * Added libmapserver-dev
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:09:43 +
++
 +mapserver (6.2.0-2~oneiric1) oneiric; urgency=medium
 +
 +  * Launchpad build for Oneiric
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:38:54 +
 +
 +mapserver (6.2.0-1ubuntu1) oneiric; urgency=low
 +
 +  * Launchpad build for Oneiric
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:38:43 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release

-- 
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, ubuntu/oneiric, updated. upstream/6.0.1-45-g5903ccc

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/oneiric branch:
commit 5903ccc4b47c43736e78e9bd702ef87a4d3e7701
Merge: fc5bd35fd644f93e3515bce501052d4fa5c89c8d 
726c38de6320ced3d1ac8e4cd24c090ff4d740be
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 21:52:14 2012 +

Merge branch 'master' into ubuntu/oneiric

diff --combined debian/changelog
index 0c954b6,06fdabb..0946690
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,3 +1,37 @@@
++mapserver (6.2.0-2~oneiric4) oneiric; urgency=medium
++
++  * Launchpad build for Oneiric
++  * Added every mapserver headers in libmapserver-dev in
++/usr/include/mapserver/
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
21:52:27 +
++
 +mapserver (6.2.0-2~oneiric3) oneiric; urgency=high
 +
 +  * Launchpad build for Oneiric
 +  * Added fix for libmapserver-dev headers
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:59:32 +
 +
 +mapserver (6.2.0-2~oneiric2) oneiric; urgency=low
 +
 +  * Launchpad build for Oneiric
 +  * Added libmapserver-dev
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:09:43 +
 +
 +mapserver (6.2.0-2~oneiric1) oneiric; urgency=medium
 +
 +  * Launchpad build for Oneiric
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:38:54 +
 +
 +mapserver (6.2.0-1ubuntu1) oneiric; urgency=low
 +
 +  * Launchpad build for Oneiric
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:38:43 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release

-- 
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, ubuntu/oneiric, updated. upstream/6.0.1-45-g5903ccc

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/oneiric branch:
commit 25b0b731cd835f85b938e700448369b9e88e319a
Merge: 57b125fb6e3b8078b1899de8f353438cef688533 
3b4c722608724b81ea5d7798800e750529ac8537
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 14:44:48 2012 +

6.2.0 Update for Oneiric

Merge branch 'master' into ubuntu/oneiric

diff --combined debian/changelog
index 128629f,06fdabb..c1e6671
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,12 +1,24 @@@
- mapserver (6.0.3-2~oneiric4) oneiric; urgency=low
++mapserver (6.2.0-2~oneiric1) oneiric; urgency=medium
 +
 +  * Launchpad build for Oneiric
-   * Added back fixgeos patch
 +
-  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Fri, 08 Jun 2012 
17:53:12 +
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:38:54 +
 +
- mapserver (6.0.3-2~oneiric2) oneiric; urgency=medium
++mapserver (6.2.0-1ubuntu1) oneiric; urgency=low
 +
-   * Fix bad dependency: libgdal1 - libgdal.
++  * Launchpad build for Oneiric
 +
-  -- Alan Boudreault aboudrea...@mapgears.com  Tue, 22 May 2012 23:48:53 
+
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:38:43 +
 +
- mapserver (6.0.3-2~oneiric1) oneiric; urgency=low
+ mapserver (6.2.0-1) unstable; urgency=low
  
-   * Launchpad build for oneiric.
+   * New upstream release
+   * Added libmapserver package
+   * Added patch to fix mapscriptvars to send the right argument to ld
+   * Changed php5-mapscript dependencies, removed misc:depends and added
+ libapache2-mod-php5 explicitly
  
-  -- Alan Boudreault aboudrea...@mapgears.com  Tue, 22 May 2012 14:35:51 
+
+  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
13:43:51 +
  
  mapserver (6.0.3-1) unstable; urgency=low
  

-- 
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, ubuntu/oneiric, updated. upstream/6.0.1-45-g5903ccc

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/oneiric branch:
commit fc5bd35fd644f93e3515bce501052d4fa5c89c8d
Merge: 9351250b1e18d1953126442da7816f13fa5a4087 
a48034895e5940b03663f7e7298e76359a917613
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:59:23 2012 +

Merge branch 'master' into ubuntu/oneiric

diff --combined debian/changelog
index 836fda1,06fdabb..0c954b6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,3 +1,29 @@@
++mapserver (6.2.0-2~oneiric3) oneiric; urgency=high
++
++  * Launchpad build for Oneiric
++  * Added fix for libmapserver-dev headers
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:59:32 +
++
 +mapserver (6.2.0-2~oneiric2) oneiric; urgency=low
 +
 +  * Launchpad build for Oneiric
 +  * Added libmapserver-dev
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:09:43 +
 +
 +mapserver (6.2.0-2~oneiric1) oneiric; urgency=medium
 +
 +  * Launchpad build for Oneiric
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:38:54 +
 +
 +mapserver (6.2.0-1ubuntu1) oneiric; urgency=low
 +
 +  * Launchpad build for Oneiric
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:38:43 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release

-- 
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, ubuntu/precise, updated. upstream/6.0.1-48-gf3172af

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/precise branch:
commit bc25ed5a66ce680a2e9e9bbb44897973c0ba3edc
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 19:39:33 2012 +

Added libmapserver-dev package

diff --git a/debian/control b/debian/control
index f71de52..ef1aae1 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,19 @@ Description: Shared library for MapServer
  functionality in MapScript is provided by the suggested mapscript
  library packages.
 
+Package: libmapserver-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+Description: Shared library for MapServer
+ This package contains the shared library.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards. Scripting
+ functionality in MapScript is provided by the suggested mapscript
+ library packages.
+
 Package: php5-mapscript
 Section: php
 Architecture: any

-- 
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, ubuntu/precise, updated. upstream/6.0.1-48-gf3172af

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/precise branch:
commit fe31c1cdf99c44c8dee03322239eb02f2c17b060
Merge: 2e3e846b273cdec1a8c72accf59ce316df7df79b 
bc25ed5a66ce680a2e9e9bbb44897973c0ba3edc
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 19:39:43 2012 +

Merge branch 'master' into ubuntu/precise

diff --combined debian/changelog
index 1e96ae4,06fdabb..e780bb8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,16 @@@
++mapserver (6.2.0-2~precise2) precise; urgency=medium
++
++  * Launchpad build for Precise
++  * Added libmapserver-dev
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
19:40:20 +
++
 +mapserver (6.2.0-2~precise1) precise; urgency=low
 +
 +  * Launchpad build for Precise
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:10:22 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release
diff --combined debian/rules
index 4b4b224,4b4b224..28f3b70
--- a/debian/rules
+++ b/debian/rules
@@@ -185,6 -185,6 +185,8 @@@ install-arch-stamp: build-arc
  
#echo 'misc:Depends=libapache2-mod-php5'  
debian/php5-mapscript.substvars
  
++  -mkdir -p debian/tmp/usr/include/
++
touch install-arch-stamp
  
  binary-indep: install-indep

-- 
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, ubuntu/precise, updated. upstream/6.0.1-48-gf3172af

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/precise branch:
commit 2e3e846b273cdec1a8c72accf59ce316df7df79b
Merge: 11fa89eb666e21f7b37f22377bffdcd06d238101 
3b4c722608724b81ea5d7798800e750529ac8537
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 14:36:10 2012 +

6.2.0 Precise Update

Merge branch 'master' into ubuntu/precise

diff --combined debian/changelog
index 92e9fab,06fdabb..1e96ae4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,12 +1,18 @@@
- mapserver (6.0.3-2~precise4) precise; urgency=low
++mapserver (6.2.0-2~precise1) precise; urgency=low
 +
-   [Jerome Villeneuve Larouche]
 +  * Launchpad build for Precise
-   * Added back the fixgeos patch
 +
-   [Alan Boudreault]
-   * Added multi-arch patch.
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:10:22 +
 +
-  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Fri, 08 Jun 2012 
13:34:12 +
+ mapserver (6.2.0-1) unstable; urgency=low
+ 
+   * New upstream release
+   * Added libmapserver package
+   * Added patch to fix mapscriptvars to send the right argument to ld
+   * Changed php5-mapscript dependencies, removed misc:depends and added
+ libapache2-mod-php5 explicitly
+ 
+  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
13:43:51 +
  
  mapserver (6.0.3-1) unstable; urgency=low
  
diff --combined debian/changelog.orig
index 92e9fab,06fdabb..1e96ae4
--- a/debian/changelog.orig
+++ b/debian/changelog.orig
@@@ -1,13 -1,12 +1,18 @@@
- mapserver (6.0.3-2~precise4) precise; urgency=low
++mapserver (6.2.0-2~precise1) precise; urgency=low
 +
-   [Jerome Villeneuve Larouche]
 +  * Launchpad build for Precise
-   * Added back the fixgeos patch
 +
-   [Alan Boudreault]
-   * Added multi-arch patch.
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:10:22 +
 +
-  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Fri, 08 Jun 2012 
13:34:12 +
+ mapserver (6.2.0-1) unstable; urgency=low
+ 
+   * New upstream release
+   * Added libmapserver package
+   * Added patch to fix mapscriptvars to send the right argument to ld
+   * Changed php5-mapscript dependencies, removed misc:depends and added
+ libapache2-mod-php5 explicitly
+ 
+  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
13:43:51 +
  
  mapserver (6.0.3-1) unstable; urgency=low
  
diff --combined debian/control.orig
index 34adfc4,f71de52..7b316b6
--- a/debian/control.orig
+++ b/debian/control.orig
@@@ -4,22 -4,35 +4,41 @@@ Priority: optiona
  Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
  Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault 
aboudrea...@mapgears.com
  Standards-Version: 3.9.3
++ HEAD
 +Build-Depends: debhelper (= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
 + libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal-dev (=1.4.0), libproj-dev,
 + libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (= 
2.6.6-3~), libgeos-dev (= 3.2),
++===
+ Build-Depends: debhelper (= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
+  libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal1-dev (=1.9.0), libproj-dev,
+  libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (= 
2.6.6-3~), libgeos-dev (= 3.2.1-1~),
++ master
   ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
-  sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
+  sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
   libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, 
libreadline-dev, 
-  libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev, libcairo2-dev
+  libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
  Build-Conflicts: libcurl3-openssl-dev
  Homepage: http://www.mapserver.org
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
  Vcs-Git: git://git.debian.org/git/pkg-grass/mapserver.git
  
+ Package: libmapserver
+ Section: libs
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+ Description: Shared library for MapServer
+  This package contains the shared library.
+  .
+  MapServer is a CGI-based framework for Internet map services which
+  supports Open Geospatial Consortium (OGC) standards. Scripting
+  functionality in MapScript is provided by the suggested mapscript
+  library packages.
+ 
  Package: php5-mapscript
  Section: php
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Depends: ${shlibs:Depends}, libapache2-mod-php5
  Suggests: mapserver-bin, mapserver-doc
  Description: php5-cgi module for MapServer
   PHP MapScript provides MapServer functions for PHP scripts.
diff --combined debian/patches/series.orig
index 000,000..9afac79
new file mode 100644
--- /dev/null
+++ b/debian/patches/series.orig
@@@ -1,0 -1,0 +1,7 @@@
++ HEAD

[SCM] mapserver branch, ubuntu/precise, updated. upstream/6.0.1-48-gf3172af

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/precise branch:
commit 656f54dc70ca5c8d579038ddbe97164ff6c53ef2
Merge: fe31c1cdf99c44c8dee03322239eb02f2c17b060 
a48034895e5940b03663f7e7298e76359a917613
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:50:56 2012 +

Merge branch 'master' into ubuntu/precise

diff --combined debian/changelog
index e780bb8,06fdabb..331f05d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,3 +1,23 @@@
++mapserver (6.2.0-2~precise3) precise; urgency=high
++
++  * Launchpad build for Precise
++  * Fixed libmapserver-dev headers
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:51:27 +
++
 +mapserver (6.2.0-2~precise2) precise; urgency=medium
 +
 +  * Launchpad build for Precise
 +  * Added libmapserver-dev
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
19:40:20 +
 +
 +mapserver (6.2.0-2~precise1) precise; urgency=low
 +
 +  * Launchpad build for Precise
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:10:22 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release

-- 
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, ubuntu/precise, updated. upstream/6.0.1-48-gf3172af

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/precise branch:
commit f3172af693ab1ec80221d09d87a66da547712d61
Merge: 656f54dc70ca5c8d579038ddbe97164ff6c53ef2 
726c38de6320ced3d1ac8e4cd24c090ff4d740be
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 21:46:45 2012 +

Merge branch 'master' into ubuntu/precise

diff --combined debian/changelog
index 331f05d,06fdabb..32dd3d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,3 +1,30 @@@
++mapserver (6.2.0-2~precise4) precise; urgency=high
++
++  * Launchpad build for Precise
++  * Added all mapserver headers in libmapserver-dev in /usr/include/mapserver/
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
21:47:08 +
++
 +mapserver (6.2.0-2~precise3) precise; urgency=high
 +
 +  * Launchpad build for Precise
 +  * Fixed libmapserver-dev headers
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
20:51:27 +
 +
 +mapserver (6.2.0-2~precise2) precise; urgency=medium
 +
 +  * Launchpad build for Precise
 +  * Added libmapserver-dev
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
19:40:20 +
 +
 +mapserver (6.2.0-2~precise1) precise; urgency=low
 +
 +  * Launchpad build for Precise
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 15 Nov 2012 
14:10:22 +
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
* New upstream release

-- 
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, ubuntu/quantal, created. upstream/6.0.1-42-g5f2d73c

2012-11-19 Thread Jerome Villeneuve Larouche
The branch, ubuntu/quantal has been created
at  5f2d73c6e9669459f7bcd084a5c6a0f8e726b29f (commit)

- Shortlog 
commit 5f2d73c6e9669459f7bcd084a5c6a0f8e726b29f
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 21:33:57 2012 +

Added all headers to libmapserver-dev

commit 705ff9a676c3b18298adbbc095dbf1dc87428272
Merge: 450792c 26e8553
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:31:18 2012 +

Merge branch 'master' into ubuntu/quantal

commit 26e8553d19183ba5ffca2aea574713adebac95b2
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:30:12 2012 +

Fixed libmapserver-dev headers

commit 450792c1147a3812607ff0581e9cca730cd6bffe
Merge: cf4daf7 3d9be41
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 20:02:39 2012 +

Merge branch 'master' into ubuntu/quantal

commit cf4daf7783277bfae36889014039d66108d85c7d
Merge: 44c135b 3b4c722
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 15 14:05:57 2012 +

6.2.0 Update for Quantal

Merge branch 'master' into ubuntu/quantal

commit 44c135b8270604f0e2a6ef26fa3d32ecae79de35
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 8 14:19:46 2012 +

Initial release for Quantal

---

-- 
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, 6.2, deleted. upstream/6.0.1-32-ge97c54a

2012-11-19 Thread Alan Boudreault
The branch, 6.2 has been deleted
   was  e97c54a7aba7b15dbb6e835b7efc7b582d0975b4

---
e97c54a7aba7b15dbb6e835b7efc7b582d0975b4 Fix a bunch of lintian errors
---

-- 
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] proj branch, master, updated. upstream/4.7.0-5-g97bd85b

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit 97bd85b2da6fd2fa71eafaa3a261e9540db4aa33
Merge: 1bdd55773033dcaa59217afb4d79df192e541fba 
c363b2306f3835c24097cf4c0a66aaeccd126bdd
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 1 13:19:38 2012 +

Merge commit 'upstream/4.8.0'

Update for new 4.8.0 upstream release

diff --combined config.guess
index cc7a3a1,0f0fe71..278f9e9
--- a/config.guess
+++ b/config.guess
@@@ -4,11 -4,7 +4,7 @@@
  #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
  #   Inc.
  
-  HEAD
 -timestamp='2007-03-06'
 +timestamp='2007-07-22'
- ===
- timestamp='2007-03-06'
-  upstream/4.7.0
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
@@@ -334,11 -330,7 +330,7 @@@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:
  sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
-  HEAD
 -i86pc:SunOS:5.*:*)
 +i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- ===
- i86pc:SunOS:5.*:*)
-  upstream/4.7.0
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
  sun4*:SunOS:6*:*)
@@@ -801,11 -793,7 +793,7 @@@ EO
exit ;;
  *:Interix*:[3456]*)
case ${UNAME_MACHINE} in
-  HEAD
 -  x86) 
 +  x86)
- ===
-   x86) 
-  upstream/4.7.0
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --combined config.sub
index 252a594,5defff6..1761d8b
--- a/config.sub
+++ b/config.sub
@@@ -4,11 -4,7 +4,7 @@@
  #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
  #   Inc.
  
-  HEAD
 -timestamp='2007-01-18'
 +timestamp='2007-06-28'
- ===
- timestamp='2007-01-18'
-  upstream/4.7.0
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@@ -479,13 -475,8 +475,8 @@@ case $basic_machine i
basic_machine=craynv-cray
os=-unicosmp
;;
-  HEAD
 -  cr16c)
 -  basic_machine=cr16c-unknown
 +  cr16)
 +  basic_machine=cr16-unknown
- ===
-   cr16c)
-   basic_machine=cr16c-unknown
-  upstream/4.7.0
os=-elf
;;
crds | unos)
@@@ -692,13 -683,6 +683,10 @@@
basic_machine=i386-pc
os=-mingw32
;;
-  HEAD
 +  mingw32ce)
 +  basic_machine=arm-unknown
 +  os=-mingw32ce
 +  ;;
- ===
-  upstream/4.7.0
miniframe)
basic_machine=m68000-convergent
;;
diff --combined debian/changelog
index cc45cc5,000..7712fc6
mode 100644,00..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,251 -1,0 +1,260 @@@
++proj (4.8.0-1) unstable; urgency=low
++
++  * New Upstream Release
++  * Modified libproj-dev.install to remove nad_list.h and projects.h
++  * Modified proj-bin.install to remove nad2nad
++  * Modified proj-bin.manpages to remove nad2nad man
++
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 01 Nov 2012 
13:23:08 +
++
 +proj (4.7.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Datum grids files updated to version 1.5.
 +(closes: #548297)
 +  * Removed manpages.dpatch, applied upstream.
 +  * Generalized libproj0.install file.
 +  * Policy changed to 3.8.3, without futher changes.
 +  * Minor change to nad2bin.1 man page.
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Mon, 05 Oct 2009 16:28:55 
+0200
 +
 +proj (4.6.1-5) unstable; urgency=high
 +
 +  * Changed proj-data in an arch-dependent package, because one half of the 
files
 +are non endianess-aware and generated at build time on the host. That
 +could possibly change in the future, so better still having a single 
package.
 +(closes: #530818)
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Thu, 28 May 2009 21:10:23 
+0200
 +
 +proj (4.6.1-4) unstable; urgency=low
 +
 +  * Added Replaces/Conflicts for old proj into proj-data and changed revision
 +numbers.
 +(closes: #521402)
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Fri, 27 Mar 2009 12:59:57 
+0100
 +
 +proj (4.6.1-3) unstable; urgency=low
 +
 +  * Sigh, dh_clean and dh_prep called in the wrong targets caused missing
 +indep binaries in .changes.
 +(closes: #521100)
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Tue, 24 Mar 2009 22:09:24 
+0100
 +
 +proj (4.6.1-2) unstable; urgency=low
 +
 +  * Reordered dh_* rules.
 +  * Now moving to a usual set of packages, with libraries, tools and 
 +dev files split in different packages. The old proj package
 +is now a pure transitional meta-package, to be removed after Squeeze
 +release.
 +  * Removed dummy 

[SCM] postgis tag, ubuntu/lucid-1.5.3, created. upstream/1.5.3-20-gf779457

2012-11-19 Thread Jerome Villeneuve Larouche
The tag, ubuntu/lucid-1.5.3 has been created
at  f7794577c05c24adee4b524dc56132aaf78b8373 (commit)

- Shortlog 
commit f7794577c05c24adee4b524dc56132aaf78b8373
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Fri Jun 8 18:08:07 2012 +

Intial release for Ubuntu Lucid
---

-- 
PostGIS for PostgreSQL

___
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] postgis tag, ubuntu/precise-1.5.3, created. upstream/1.5.3-20-ge615445

2012-11-19 Thread Jerome Villeneuve Larouche
The tag, ubuntu/precise-1.5.3 has been created
at  e615445f2f3439f3f733380d531475e78cf13d6e (commit)

- Shortlog 
commit e615445f2f3439f3f733380d531475e78cf13d6e
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Fri Jun 8 18:02:54 2012 +

Initial release for Precise
---

-- 
PostGIS for PostgreSQL

___
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] postgis annotated tag, upstream/2.0.1, created. upstream/2.0.1

2012-11-19 Thread Jerome Villeneuve Larouche
The annotated tag, upstream/2.0.1 has been created
at  653365d30d6515cb17d3ede17b6f8d0509f5b939 (tag)
   tagging  330f3d8dd7e01cc2ae899b3a1092c9afa4a97d92 (commit)
  replaces  upstream/1.5.3
 tagged by  Jerome Villeneuve Larouche
on  Fri Aug 17 14:51:12 2012 +

- Shortlog 
Upstream version 2.0.1

Jerome Villeneuve Larouche (1):
  Imported Upstream version 2.0.1

---

-- 
PostGIS for PostgreSQL

___
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.9.0-118-g9e821f5

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit 9e821f5923c8e0954d9c024aee28f44705cf9e4b
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 1 20:54:55 2012 +

Removed OGDI

diff --git a/debian/changelog b/debian/changelog
index 3f407d8..b20f43c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gdal (1.9.2-1) unstable; urgency=low
 
   * New Upstream release
+  * Removed OGDI
 
  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 01 Nov 2012 
18:52:53 +
 
diff --git a/debian/control b/debian/control
index 2a96323..dd5833a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 
1:4.0.0),
  libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
  libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c2-dev, 
unixodbc-dev (= 2.2.11),
  python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, 
python-all-dev (= 2.6.6-3~),
- libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
+ libcurl4-gnutls-dev, libsqlite3-dev, 
  ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
  libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev 
(= 0.9.1),
  libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, 
libfreexl-dev (= 1.0.0),
diff --git a/debian/rules b/debian/rules
index ba41a6e..ff06a8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,6 @@ configure-stamp:
--with-sqlite3 \
--with-curl \
--with-pg \
-   --with-ogdi \
--with-mysql \
--with-perl \
--with-ruby \

-- 
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.9.0-118-g9e821f5

2012-11-19 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit 5ce87928868eab5225d2c972013bf850bf12311d
Merge: 8c436afd940b390494ac3b3bf923dd1b739f9976 
7a06d2527e18500d45c5db6c444bba008df70457
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 1 18:06:09 2012 +

Merge commit 'upstream/1.9.2'

diff --combined debian/changelog
index da69ca4,000..3f407d8
mode 100644,00..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,993 -1,0 +1,980 @@@
-  HEAD
- gdal (1.9.1-2) unstable; urgency=low
- ===
- gdal (1.9.0-3) UNRELEASED; urgency=low
- 
-   * New package for Python 3 bindings
- 
-  -- Antonio Valentino antonio.valent...@tiscali.it  Wed, 30 May 2012 
19:15:21 +0200
++gdal (1.9.2-1) unstable; urgency=low
 +
- gdal (1.9.0-2) unstable; urgency=low
-  d1ddee88eeedac0f87e3fc4ea117a138fbb43af6
++  * New Upstream release
 +
-   * Fixed debian/control to b-depend on ruby 1.8. 
- (closes: #675972)
-   * Now depending on poppler-private dev package. 
- (closes: #672405)
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 01 Nov 2012 
18:52:53 +
 +
-  -- Francesco Paolo Lovergine fran...@debian.org  Tue, 05 Jun 2012 14:08:23 
+0200
- 
- gdal (1.9.1-1) unstable; urgency=low
++gdal (1.9.1-2) unstable; urgency=low
 +
 +  [ Jerome Villeneuve Larouche ]
 +  * New upstream release.
 +
 +  [ Francesco Paolo Lovergine ]
 +  * Reintroducing libgdal1-dev as a transitional package to allow r-deps
 +to build in any environment.
 +  * Removed old depndency on libcurl3-dev for libgdal-dev and added a 
 +preferred dep on libcurl4-gnutls-dev to make lintian happy.
 +  * Added build-{arch|indep} targets in debian/rules.
 +
 + -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Fri, 25 May 2012 
13:04:34 +
 +
 +gdal (1.9.0-1) unstable; urgency=low
 +
 +  * Ready for sid, starting transition.
 +  * All symfiles updated to latest builds.
 +  * Added dh_numpy call in debian/rules to depend on numpy ABI.
 +  * Policy bumped to 3.9.3, no changes required.
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Mon, 07 May 2012 15:04:42 
+0200
 +
 +gdal (1.9.0-1~exp5) experimental; urgency=low
 +
 +  * Added a build-dep on liburiparser-dev to satisfy configure test. Without
 +that GDAL reverts to the old KML support anyway :-(.
 +  * Explicitly enabled Armadillo and LZMA supports.
 +  * OpenJPEG is enabled in debian/rules, but still unsupported because current
 +library is obsolete. GDAL requires at least 1.4.
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Mon, 05 Mar 2012 17:44:59 
+0100
 +
 +gdal (1.9.0-1~exp4) experimental; urgency=low
 +
 +  * Moving from old KML to new libkml based.
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Fri, 02 Mar 2012 14:44:23 
+0100
 +
 +gdal (1.9.0-1~exp3) experimental; urgency=low
 +
 +  * Added b-deps and enabled a few new supports: 
 +Poppler, Armadillo, OpenJPEG, FreeXL and libZMA.
 +  * Revised copyright file for format 1.0.
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Sun, 26 Feb 2012 17:24:24 
+0100
 +
 +gdal (1.9.0-1~exp2) experimental; urgency=low
 +
 +  * Fixed mipsel, mips, powerpc and s390 files for syntax errors that caused
 +FTBS on all those archs.
 +  * Updated sparc, amd64 and ia64 symbol files to 1.9 series.
 +  * Updated README.source to document symbol versioning and script.
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Thu, 23 Feb 2012 11:53:59 
+0100
 +
 +gdal (1.9.0-1~exp1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * New tool: gdalsrsinfo.
 +  * Dropped patch epsilon.
 +  * All patches refreshed for current version.
 +  * Regenerating all symfiles from scratch. But for the usual stock of
 +internal C++ changes (with both adding and removing of methods) a couple
 +of TIFF related C functions have been dropped:
 +   TIFFFindFieldInfo
 +   TIFFFindFieldInfoByName
 +which is due to Tiff/GeoTiff resyncing against upstream. This is ignored,
 +but we already introduced a SONAME change, and it will not impact sid
 +builds and library use.
 +  * Removed superfluous break/replaces against libgdal1-version package.
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Tue, 21 Feb 2012 15:28:45 
+0100
 +
 +gdal (1.8.1-2~exp3) experimental; urgency=low
 +
 +  * Fixed .common symbol file to drop conditionals.
 +
 + -- Francesco Paolo Lovergine fran...@debian.org  Wed, 23 Nov 2011 14:23:29 
+0100
 +
 +gdal (1.8.1-2~exp2) experimental; urgency=low
 +
 +  * Changed organization of symbol files in one common file and
 +multiple .symbols.arch file.
 +  * Now normalized to conventional GDAL library name and dropping the Debian 
 +specific versioned naming scheme for the library. 
 +Dropped patch: libname, python.
 +  * Added sparc and mipsel symbol files.
 +  * Updated NEWS file with basic information about changes in the package.
 +  * Removed now obsolete libtool build-dep.
 +(closes: #639887)
 +  * Now