pg-comparator_2.2.1-1_amd64.changes ACCEPTED into unstable, unstable

2014-01-09 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Wed, 08 Jan 2014 16:07:50 +0100
Source: pg-comparator
Binary: postgresql-comparator
Architecture: source amd64
Version: 2.2.1-1
Distribution: unstable
Urgency: low
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Changed-By: Ivan Mincik ivan.min...@gmail.com
Description: 
 postgresql-comparator - efficient PostgreSQL table content comparison and 
synchronization
Closes: 646131
Changes: 
 pg-comparator (2.2.1-1) unstable; urgency=low
 .
   * Initial release (Closes: #646131)
Checksums-Sha1: 
 0815627d1adec3a497db15ca0fe526a592f0dd19 1371 pg-comparator_2.2.1-1.dsc
 c88f02a11377021b58f511d9eed2ebb035bdf2b2 41540 pg-comparator_2.2.1.orig.tar.bz2
 6be67d589ff0adcd0f056d3287febdf744621275 2053 
pg-comparator_2.2.1-1.debian.tar.gz
 1af0e156747a92e8cd7d68c25798e85bc08aeca6 61650 
postgresql-comparator_2.2.1-1_amd64.deb
Checksums-Sha256: 
 fbc63a43f5c8cef7aac66116bfa4708cb8b2b24f35757887bdced37a1dbd94ce 1371 
pg-comparator_2.2.1-1.dsc
 07fc9d3ad6384cba035bc8bb7e5a9db1a9f9561290e59a69a3382bd8083911a4 41540 
pg-comparator_2.2.1.orig.tar.bz2
 51b3c4d806bb0edc6f2bb4d3bc6f4bd43d4320464d11ea003684a0309cb673b5 2053 
pg-comparator_2.2.1-1.debian.tar.gz
 8d21a17d90fcd0d3c285fffdf4ec6f034011aedc6275bbe0c0d90c8271976ebb 61650 
postgresql-comparator_2.2.1-1_amd64.deb
Files: 
 9854d564d70fc7f2876c8253bbdd33b7 1371 database optional 
pg-comparator_2.2.1-1.dsc
 59b7c0f6092fab5dda219c557d6a2de5 41540 database optional 
pg-comparator_2.2.1.orig.tar.bz2
 0375589c519cd8d9a13c28259f14f719 2053 database optional 
pg-comparator_2.2.1-1.debian.tar.gz
 bd8997c4bb1fb651f0496e1460d8e766 61650 database optional 
postgresql-comparator_2.2.1-1_amd64.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.15 (GNU/Linux)

iEYEARECAAYFAlLNykMACgkQYDBbMcCf01pHogCfadIyXtSkLF4oIVGoUbx/P1+s
FF0An1DR0xrDEK/bg99EP2VJyFbsMiJ/
=6rqW
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

___
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] saga branch, master, updated. upstream/2.1.0+dfsg-146-g789b795

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit 5874c30f123e6e7116da7021888552336c5eb628
Merge: ec50b3f60857fc7a094a746bd4d8631b5589777c 
8638c88ed05107eb5963baad91ca67d402d42d05
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 10:52:28 2014 -0500

Merge tag 'upstream/2.1.1+dfsg'

Upstream version 2.1.1+dfsg


-- 
Saga GIS

___
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] saga branch, master, updated. upstream/2.1.0+dfsg-146-g789b795

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit ec50b3f60857fc7a094a746bd4d8631b5589777c
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 10:51:20 2014 -0500

Update version check in debian/rules

diff --git a/debian/rules b/debian/rules
index e359d00..28d3822 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 override_dh_auto_configure:
dh_auto_configure -- --enable-unicode --prefix=/usr --enable-python 
$(shell dpkg-buildflags --export=configure)
 
-VERSION := $(shell grep '^AC_INIT' configure.in | \
+VERSION := $(shell grep '^AC_INIT' configure.ac | \
sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g')
 UPSTREAM_URL ?=$(shell uscan --dehs | sed -n 
's/.*upstream-url\(.*\)\/upstream-url.*/\1/p')
 UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 
's/.*upstream-version\(.*\)\/upstream-version.*/\1/p')

-- 
Saga GIS

___
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] saga branch, master, updated. upstream/2.1.0+dfsg-146-g789b795

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit 15c3c5828dfec812f21310c0640901dc3b53527d
Merge: 13fc947dc6f0d2c87ff2903bf221533f11699165 
f836306f1b4ac2b2ca215ed31e56d26d5aa8031f
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 10:34:37 2014 -0500

Merge tag 'upstream/2.1.1'

Upstream version 2.1.1


-- 
Saga GIS

___
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] saga branch, master, updated. upstream/2.1.0+dfsg-146-g789b795

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit 789b795728917cefaae3935e5dd3b81644909b80
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 11:10:23 2014 -0500

Remove patch (included upstream)

diff --git a/debian/patches/0005-Fix-gcc-security-warnings.patch 
b/debian/patches/0005-Fix-gcc-security-warnings.patch
deleted file mode 100644
index 71621f0..000
--- a/debian/patches/0005-Fix-gcc-security-warnings.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Johan Van de Wauw johan.vandew...@gmail.com
-Date: Fri, 15 Nov 2013 01:57:38 -0500
-Subject: Fix gcc security warnings
-

- src/modules_io/grid/io_grid/esri_arcinfo.cpp | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules_io/grid/io_grid/esri_arcinfo.cpp 
b/src/modules_io/grid/io_grid/esri_arcinfo.cpp
-index 477dd41..970eb71 100644
 a/src/modules_io/grid/io_grid/esri_arcinfo.cpp
-+++ b/src/modules_io/grid/io_grid/esri_arcinfo.cpp
-@@ -594,13 +594,13 @@ bool CESRI_ArcInfo_Export::On_Execute(void)
-   {
-   if( x  0 )
-   {
--  fprintf(Stream.Get_Stream(),  );
-+  fputs( ,Stream.Get_Stream());
-   }
- 
--  fprintf(Stream.Get_Stream(), 
Write_Value(pGrid-asDouble(x, y), Precision, bComma).b_str());
-+  fputs(Write_Value(pGrid-asDouble(x, y), 
Precision, bComma).b_str(),Stream.Get_Stream());
-   }
- 
--  fprintf(Stream.Get_Stream(), \n);
-+  fputs(\n, Stream.Get_Stream());
-   }
- 
-   pGrid-Get_Projection().Save(SG_File_Make_Path(NULL, fName, 
SG_T(prj)));
-@@ -671,7 +671,7 @@ bool CESRI_ArcInfo_Export::Write_Header(CSG_File Stream, 
CSG_Grid *pGrid, bool
-   s   += CSG_String::Format(SG_T(%s %s\n)   , 
HDR_BYTEORDER , Parameters(BYTEORD)-asInt() == 1 ? HDR_BYTEORDER_LO : 
HDR_BYTEORDER_HI);
-   }
- 
--  fprintf(Stream.Get_Stream(), s.b_str());
-+  fputs(s.b_str(),Stream.Get_Stream());
- 
-   return( true );
-   }
diff --git a/debian/patches/series b/debian/patches/series
index bc3353f..dc36a48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Remove-references-to-libfire.patch
 0002-Use-debian-version-of-grib2.patch
 0004-Use-qhull-instead-of-triangle.patch
-0005-Fix-gcc-security-warnings.patch

-- 
Saga GIS

___
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] saga branch, master, updated. upstream/2.1.0+dfsg-146-g789b795

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit 91e4d91fbc49a34156bb6e5bdcaaf57b6e603c46
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 11:09:37 2014 -0500

Remove changes to Makefile.am (autoreconf)

diff --git a/debian/patches/0004-Use-qhull-instead-of-triangle.patch 
b/debian/patches/0004-Use-qhull-instead-of-triangle.patch
index 8b465ba..ee748e2 100644
--- a/debian/patches/0004-Use-qhull-instead-of-triangle.patch
+++ b/debian/patches/0004-Use-qhull-instead-of-triangle.patch
@@ -4,7 +4,6 @@ Subject: Use qhull instead of triangle
 
 ---
  src/modules/grid/grid_gridding/Makefile.am   |  3 +--
- src/modules/grid/grid_gridding/Makefile.in   | 13 ++---
  src/modules/grid/grid_gridding/nn/delaunay.c |  2 +-
  3 files changed, 4 insertions(+), 14 deletions(-)
 
@@ -29,58 +28,7 @@ index 75c79c9..bc55004 100644
  Interpolation.h\
  Interpolation_AngularDistance.h\
  Interpolation_InverseDistance.h\
-diff --git a/src/modules/grid/grid_gridding/Makefile.in 
b/src/modules/grid/grid_gridding/Makefile.in
-index 4ff6a48..1fdaa47 100644
 a/src/modules/grid/grid_gridding/Makefile.in
-+++ b/src/modules/grid/grid_gridding/Makefile.in
-@@ -133,7 +133,7 @@ am_libgrid_gridding_la_OBJECTS = Interpolation.lo \
-   Interpolation_NearestNeighbour.lo Interpolation_Shepard.lo \
-   Interpolation_Triangulation.lo kernel_density.lo \
-   MLB_Interface.lo Shapes2Grid.lo Shepard.lo delaunay.lo hash.lo \
--  istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo triangle.lo
-+  istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo
- libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -371,7 +371,7 @@ top_srcdir = @top_srcdir@
- DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
- CXX_INCS = -I$(top_srcdir)/src/saga_core
- AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) 
$(DBGFLAGS) $(GOMPFLAGS)
--AM_LDFLAGS = -fPIC -shared -avoid-version
-+AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull
- pkglib_LTLIBRARIES = libgrid_gridding.la
- libgrid_gridding_la_SOURCES = \
- Interpolation.cpp\
-@@ -392,7 +392,6 @@ Shepard.cpp\
- ./nn/nnai.c\
- ./nn/nncommon.c\
- ./nn/nnpi.c\
--./nn/triangle.c\
- Interpolation.h\
- Interpolation_AngularDistance.h\
- Interpolation_InverseDistance.h\
-@@ -510,7 +509,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nnai.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nncommon.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nnpi.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triangle.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@  $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF 
$(DEPDIR)/$*.Tpo -c -o $@ $
-@@ -582,13 +580,6 @@ nnpi.lo: ./nn/nnpi.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC 
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) 
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) 
$(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c
- 
--triangle.lo: ./nn/triangle.c
--@am__fastdepCC_TRUE@  $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC 
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) 
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) 
$(CFLAGS) -MT triangle.lo -MD -MP -MF $(DEPDIR)/triangle.Tpo -c -o triangle.lo 
`test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c
--@am__fastdepCC_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/triangle.Tpo 
$(DEPDIR)/triangle.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/triangle.c' 
object='triangle.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC 
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) 
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) 
$(CFLAGS) -c -o triangle.lo `test -f './nn/triangle.c' || echo 
'$(srcdir)/'`./nn/triangle.c
--
- .cpp.o:
- @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF 
$(DEPDIR)/$*.Tpo -c -o $@ $
- @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+
 diff --git a/src/modules/grid/grid_gridding/nn/delaunay.c 
b/src/modules/grid/grid_gridding/nn/delaunay.c
 index dc98875..e2952fa 100644
 --- a/src/modules/grid/grid_gridding/nn/delaunay.c

-- 
Saga GIS

___
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] saga branch, master, updated. upstream/2.1.0+dfsg-146-g789b795

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit 284ad72ea7293cdc2bbaa0aaca120796606fab1c
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 11:00:05 2014 -0500

Update version number

diff --git a/debian/changelog b/debian/changelog
index 4426fb6..6ad1947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saga (2.1.1+dfsg-1) UNRELEASED; urgency=medium
+
+  * Import new upstream (closes: #717624)
+
+ -- Johan Van de Wauw johan.vandew...@gmail.com  Thu, 09 Jan 2014 10:53:49 
-0500
+
 saga (2.1.0+dfsg-1) unstable; urgency=low
 
   [ Johan Van de Wauw ]
diff --git a/debian/control b/debian/control
index 808e071..080232a 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Package: libsaga
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libsaga-2.1.0
+Provides: libsaga-2.1.1
 Description: SAGA GIS development files
  SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
  information system used for editing and analysing spatial data.
diff --git a/debian/saga-depends b/debian/saga-depends
index f0a490b..c9854fc 100644
--- a/debian/saga-depends
+++ b/debian/saga-depends
@@ -8,11 +8,11 @@
 
 if [ $# -ne 0 ]; then
 cat debian/${PKG}.substvars EOF
-saga:Depends=libsaga-2.0.8
+saga:Depends=libsaga-2.1.1
 EOF
 else
 cat debian/substvars EOF
-saga:Depends=libsaga-2.0.8
+saga:Depends=libsaga-2.1.1
 EOF
 
 fi

-- 
Saga GIS

___
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] saga tag, beter, created. upstream/2.1.0+dfsg-127-g262eb7a

2014-01-09 Thread Johan Van de Wauw
The tag, beter has been created
at  262eb7a6ee4324b4042232dad42ac382a5099365 (commit)

- Shortlog 
commit 262eb7a6ee4324b4042232dad42ac382a5099365
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Nov 14 20:41:23 2013 -0500

Update control file + remove control.in

control.in was not used
---

-- 
Saga GIS

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

2014-01-09 Thread Johan Van de Wauw
The annotated tag, upstream/2.1.1 has been created
at  7a39dd61c86054159e52301d4a0c5c505cb3c48c (tag)
   tagging  f836306f1b4ac2b2ca215ed31e56d26d5aa8031f (commit)
  replaces  upstream/2.1.0+dfsg
 tagged by  Johan Van de Wauw
on  Thu Jan 9 10:34:34 2014 -0500

- Shortlog 
Upstream version 2.1.1

Johan Van de Wauw (1):
  Imported Upstream version 2.1.1

---

-- 
Saga GIS

___
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] saga tag, goed, created. upstream/2.1.0+dfsg-135-g37f2e54

2014-01-09 Thread Johan Van de Wauw
The tag, goed has been created
at  37f2e54d4fe1526cc9c08aba708a4d1bc2499cbb (commit)

- Shortlog 
commit 37f2e54d4fe1526cc9c08aba708a4d1bc2499cbb
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Fri Nov 15 02:02:20 2013 -0500

Fix gcc security warnings
---

-- 
Saga GIS

___
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] saga annotated tag, upstream/2.1.1+dfsg, created. upstream/2.1.1+dfsg

2014-01-09 Thread Johan Van de Wauw
The annotated tag, upstream/2.1.1+dfsg has been created
at  1b30de2ac09e33ae229298f833a6af876b5f5fc2 (tag)
   tagging  8638c88ed05107eb5963baad91ca67d402d42d05 (commit)
  replaces  upstream/2.1.1
 tagged by  Johan Van de Wauw
on  Thu Jan 9 10:52:28 2014 -0500

- Shortlog 
Upstream version 2.1.1+dfsg

Johan Van de Wauw (1):
  Imported Upstream version 2.1.1+dfsg

---

-- 
Saga GIS

___
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] saga tag, goed, deleted. upstream/2.1.0+dfsg-135-g37f2e54

2014-01-09 Thread Johan Van de Wauw
The tag, goed has been deleted
   was  37f2e54d4fe1526cc9c08aba708a4d1bc2499cbb

---
37f2e54d4fe1526cc9c08aba708a4d1bc2499cbb Fix gcc security warnings
---

-- 
Saga GIS

___
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] saga tag, beter, deleted. upstream/2.1.0+dfsg-127-g262eb7a

2014-01-09 Thread Johan Van de Wauw
The tag, beter has been deleted
   was  262eb7a6ee4324b4042232dad42ac382a5099365

---
262eb7a6ee4324b4042232dad42ac382a5099365 Update control file + remove control.in
---

-- 
Saga GIS

___
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#734781: libhdf5-cpp-7: fails to upgrade from 'sid' - trying to overwrite /usr/lib/x86_64-linux-gnu/libhdf5_cpp.so.7

2014-01-09 Thread Andreas Beckmann
Package: libhdf5-cpp-7
Version: 1.8.12-4
Severity: serious
User: debian...@lists.debian.org
Usertags: piuparts
Control: affects -1 + libhdf5-dev

Hi,

during a test with piuparts I noticed your package fails to upgrade from
'sid' to 'experimental'.
It installed fine in 'sid', then the upgrade to 'experimental' fails
because it tries to overwrite other packages files without declaring a
Breaks+Replaces relation.

See policy 7.6 at
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces

From the attached log (scroll to the bottom...):

  Preparing to unpack .../libhdf5-cpp-7_1.8.12-4_amd64.deb ...
  Unpacking libhdf5-cpp-7:amd64 (1.8.12-4) ...
  dpkg: error processing archive 
/var/cache/apt/archives/libhdf5-cpp-7_1.8.12-4_amd64.deb (--unpack):
   trying to overwrite '/usr/lib/x86_64-linux-gnu/libhdf5_cpp.so.7', which is 
also in package libhdf5-7:amd64 1.8.11-5
  Preparing to unpack .../libhdf5-dev_1.8.12-4_amd64.deb ...
  Unpacking libhdf5-dev (1.8.12-4) over (1.8.11-5) ...
  Preparing to unpack .../libhdf5-7_1.8.12-4_amd64.deb ...
  Unpacking libhdf5-7:amd64 (1.8.12-4) over (1.8.11-5) ...
  Errors were encountered while processing:
   /var/cache/apt/archives/libhdf5-cpp-7_1.8.12-4_amd64.deb


cheers,

Andreas


libhdf5-dev_1.8.12-4.log.gz
Description: GNU Zip compressed data
___
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 branch, master, updated. upstream/2.0.1-103-ge95a0f8

2014-01-09 Thread Markus Wanner
The following commit has been merged in the master branch:
commit e95a0f81c287304dbe3e201a0e6f65b0a3a2d931
Author: Markus Wanner mar...@bluegap.ch
Date:   Thu Jan 9 20:24:48 2014 +0100

* Fix FTBFS on armel, maybe others, with yet another patch.
* debian/control: bumped Standard-Versions to 3.9.5, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 32a6134..7d49b37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgis (2.1.1-2) UNRELEASED; urgency=medium
+
+  * Fix FTBFS on armel, maybe others, with yet another patch.
+  * debian/control: bumped Standard-Versions to 3.9.5, no changes needed.
+
+ -- Markus Wanner mar...@bluegap.ch  Thu, 09 Jan 2014 20:00:54 +0100
+
 postgis (2.1.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 9d1f15a..3d03e5d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | 
openjdk-6-jdk,
  libmaven-clean-plugin-java, libmaven-jar-plugin-java,
  libsurefire-java, libmaven-compiler-plugin-java,
  libmaven-resources-plugin-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://postgis.refractions.net/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/postgis.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
diff --git a/debian/control.in b/debian/control.in
index f3acef2..f4c1fb1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,7 +15,7 @@ Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | 
openjdk-6-jdk,
  libmaven-clean-plugin-java, libmaven-jar-plugin-java,
  libsurefire-java, libmaven-compiler-plugin-java,
  libmaven-resources-plugin-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://postgis.refractions.net/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/postgis.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
diff --git a/debian/patches/fix-armel b/debian/patches/fix-armel
new file mode 100644
index 000..db47b40
--- /dev/null
+++ b/debian/patches/fix-armel
@@ -0,0 +1,163 @@
+Description: Fix FTBSF os armel, at least
+ All point_in_{polygon,multipolygon,polygon_rtree,multipolygon_rtree}
+ functions return an int ranging from -1 to +1. This patch properly
+ preserves that type and prevents the bogus conversion to bool. Thus
+ correcting the return value and fixing multiple tests on armel.
+Author: Markus Wanner mar...@bluegap.ch
+Last-Update: 2014-01-09
+
+--- a/postgis/lwgeom_geos.c
 b/postgis/lwgeom_geos.c
+@@ -1990,6 +1990,7 @@
+   LWPOINT *point;
+   RTREE_POLY_CACHE *poly_cache;
+   bool result;
++  int pip_result;
+   PrepGeomCache *prep_cache;
+ 
+   geom1 = (GSERIALIZED *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+@@ -2037,15 +2038,15 @@
+ 
+   if ( poly_cache  poly_cache-ringIndices )
+   {
+-  result = 
point_in_multipolygon_rtree(poly_cache-ringIndices, poly_cache-polyCount, 
poly_cache-ringCounts, point);
++  pip_result = 
point_in_multipolygon_rtree(poly_cache-ringIndices, poly_cache-polyCount, 
poly_cache-ringCounts, point);
+   }
+   else if ( type1 == POLYGONTYPE )
+   {
+-  result = point_in_polygon((LWPOLY*)lwgeom, point);
++  pip_result = point_in_polygon((LWPOLY*)lwgeom, point);
+   }
+   else if ( type1 == MULTIPOLYGONTYPE )
+   {
+-  result = point_in_multipolygon((LWMPOLY*)lwgeom, point);
++  pip_result = point_in_multipolygon((LWMPOLY*)lwgeom, 
point);
+   }
+   else
+   {
+@@ -2057,7 +2058,7 @@
+   lwpoint_free(point);
+   PG_FREE_IF_COPY(geom1, 0);
+   PG_FREE_IF_COPY(geom2, 1);
+-  if ( result == 1 ) /* completely inside */
++  if ( pip_result == 1 ) /* completely inside */
+   {
+   PG_RETURN_BOOL(TRUE);
+   }
+@@ -2213,6 +2214,7 @@
+   GSERIALIZED *geom1;
+   GSERIALIZED *geom2;
+   bool result;
++  int pip_result;
+   GBOX box1, box2;
+   int type1, type2;
+   LWGEOM *lwgeom;
+@@ -2263,15 +2265,15 @@
+ 
+   if ( poly_cache  poly_cache-ringIndices )
+   {
+-  result = 
point_in_multipolygon_rtree(poly_cache-ringIndices, poly_cache-polyCount, 
poly_cache-ringCounts, point);
++  pip_result = 
point_in_multipolygon_rtree(poly_cache-ringIndices, poly_cache-polyCount, 
poly_cache-ringCounts, point);
+   }
+   else if ( type1 == POLYGONTYPE )
+   {
+-  result = point_in_polygon((LWPOLY*)lwgeom, point);
++  pip_result = point_in_polygon((LWPOLY*)lwgeom, point);
+   }
+   else if ( type1 == MULTIPOLYGONTYPE )
+   

Bug#734781: libhdf5-cpp-7: fails to upgrade from 'sid' - trying to overwrite /usr/lib/x86_64-linux-gnu/libhdf5_cpp.so.7

2014-01-09 Thread Gilles Filippini

Andreas Beckmann a écrit , Le 09/01/2014 19:54:

Package: libhdf5-cpp-7
Version: 1.8.12-4
Severity: serious
User: debian...@lists.debian.org
Usertags: piuparts
Control: affects -1 + libhdf5-dev

Hi,

during a test with piuparts I noticed your package fails to upgrade from
'sid' to 'experimental'.
It installed fine in 'sid', then the upgrade to 'experimental' fails
because it tries to overwrite other packages files without declaring a
Breaks+Replaces relation.

See policy 7.6 at
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces


Oops. Not sure how I missed that. Thanks for the report!

_g.

___
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] saga branch, master, updated. upstream/2.1.1+dfsg-146-g93f2ec9

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit 67cf834dbd471fd99c564642c2400a4c72ff1b4c
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 14:05:46 2014 -0500

Delete missing icons from menu fil

diff --git a/debian/menu b/debian/menu
index beeef30..2300228 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,5 +1,2 @@
 ?package(saga):needs=X11 section=Applications/Science/Geoscience\
-  title=saga command=/usr/bin/saga_gui \
-  icon32x32=/usr/share/pixmaps/saga_icon_32.xpm\
-  icon16x16=/usr/share/pixmaps/saga_icon_16.xpm
-
+  title=saga command=/usr/bin/saga_gui 

-- 
Saga GIS

___
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] saga branch, master, updated. upstream/2.1.1+dfsg-146-g93f2ec9

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit 93f2ec9e377d0912861de01d9ed44a9907f07b64
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 15:02:55 2014 -0500

Bump standards version - no changes needed

diff --git a/debian/control b/debian/control
index 080232a..137e394 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Johan Van de Wauw johan.vandew...@gmail.com, 
Francesco Paolo Loverg
 Build-Depends: libwxgtk3.0-dev, wx-common, libgdal-dev, libexpat-dev,
  libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (=8), swig,
  libqhull-dev, libhpdf-dev, python-dev, liblas-dev, dh-autoreconf
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.saga-gis.org/
 Vcs-Git: git://git.debian.org/pkg-grass/saga.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git

-- 
Saga GIS

___
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] saga branch, debhelper9, created. upstream/2.1.1+dfsg-147-g168fe6c

2014-01-09 Thread Johan Van de Wauw
The branch, debhelper9 has been created
at  168fe6c3edb67fafeeac902991782e8bb3b5f0ca (commit)

- Shortlog 
commit 168fe6c3edb67fafeeac902991782e8bb3b5f0ca
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 16:09:51 2014 -0500

Update to debhelper 9 - enable multiarch

---

-- 
Saga GIS

___
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] saga branch, master, updated. upstream/2.1.1+dfsg-147-g1f55cf2

2014-01-09 Thread Johan Van de Wauw
The following commit has been merged in the master branch:
commit 1f55cf25d2bc525b3ad551685df633c7639505e9
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Thu Jan 9 17:13:12 2014 -0500

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 6ad1947..c7d7aa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 saga (2.1.1+dfsg-1) UNRELEASED; urgency=medium
 
   * Import new upstream (closes: #717624)
+  * Fix patches - remove autoreconf results - rename configure.in
+  * Remove changes to Makefile.am (autoreconf)
+  * Remove patch (included upstream)
+  * Delete missing icons from menu fil
+  * Bump standards version - no changes needed
 
  -- Johan Van de Wauw johan.vandew...@gmail.com  Thu, 09 Jan 2014 10:53:49 
-0500
 

-- 
Saga GIS

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


Saga 2.1.1 - debhelper9 - multiarch

2014-01-09 Thread Johan Van de Wauw
Hello everyone,

I've imported saga 2.1.1 which was released today.
This is mostly a bugfix release [1].

While importing I tried converting the package to debhelper 9. But I
got a bit unsure on how to proceed with the multiarch changes that
this implies.
I was able to build a package that actually installs and works, and
pushed those changes in a seperate branch [2]
However I got lintian errors on saga itself saying that the binaries
should also be in usr/*/bin.
Are there any other packages in debian gis which contain both
libraries and binaries which were converted to multiarch so I can have
a look how this was done?

Johan

[1] 
http://sourceforge.net/apps/trac/saga-gis/attachment/wiki/Changelog%202.1.1/changelog_saga_2.1.1.txt
[2] 
http://anonscm.debian.org/gitweb/?p=pkg-grass/saga.git;a=shortlog;h=refs/heads/debhelper9

___
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#734565: mapserver: CVE-2013-7262

2014-01-09 Thread Salvatore Bonaccorso
Hi Sebastiaan,

On Wed, Jan 08, 2014 at 11:15:56PM +0100, Sebastiaan Couwenberg wrote:
 Hi Salvatore,
 
 On 01/08/2014 10:09 AM, Salvatore Bonaccorso wrote:
  On Wed, Jan 08, 2014 at 08:40:35AM +0100, Sebastiaan Couwenberg wrote:
  On 01/08/2014 08:25 AM, Salvatore Bonaccorso wrote:
  If you fix the vulnerability please also make sure to include the
  CVE (Common Vulnerabilities  Exposures) id in your changelog entry.
 
  The new mapserver packages were prepared before the CVE was available.
 
 I've prepared new mapserver packages for squeeze and wheezy with only
 the fix for this CVE, the new stable upstream release route I initially
 took is not proper to fix this issue.
 
 mapserver (6.0.1-3.2+deb7u2) for wheezy:
 
 http://mentors.debian.net/debian/pool/main/m/mapserver/mapserver_6.0.1-3.2+deb7u2.dsc
 
 mapserver (5.6.5-2+squeeze3) for squeeze:
 
 http://mentors.debian.net/debian/pool/main/m/mapserver/mapserver_5.6.5-2+squeeze3.dsc
 
 The squeeze package contained debhelper.log files in the debian/
 directory, which caused problems for clean pbuilder builds so they were
 removed. And dpatch insisted in changing the permissions. I've included
 these changes in the squeeze package too.
 
  Please adjust the affected versions in the BTS as needed, at least
  unstable from looking at source seems affected.
 
  Unstable is no longer affect with the upload of mapserver 6.4.1, wheezy
  and squeeze still are, but the proposed updates for both are waiting for
  feedback from the release team:
  
  Could you clarify if second commit referenced in
  
  https://github.com/mapserver/mapserver/issues/4834
  (WFS-2 specific fixes for postgis time sql injections (#4834,#4815))
  
  is also needed? Is this relevant for Debian?
 
 No, the WFS-2 specific commit shouldn't be relevant for Debian yet.
 
 The vulnerability was discovered during the implementation of WFS 2.0
 support in MapServer. That support only lives in the master branch for
 now and will be included in the next major upstream release.

Okay thanks for this explanation. Regarding the upload for security:
We have tagged this issue 'no-dsa'[1] meaning that no DSA is planned
for this vulnerability only. So if you are planning to do a
(old)stable-proposed-updates upload, the above can be included there
(either by updating to a update to a upstream version as you propose
or by an isolated patch; depends on what release teams would like to
have for these two opu and pu requests).

 [1] https://security-tracker.debian.org/tracker/CVE-2013-7262

Thanks again for the quick followups,

Regards,
Salvatore


signature.asc
Description: Digital signature
___
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, wheezy, updated. upstream/6.0.1-41-g99c5654

2014-01-09 Thread Bas Couwenberg
The following commit has been merged in the wheezy branch:
commit 99c5654bfa0bf2d5f754175f0408a2a3e8b4b0f3
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 10 04:18:38 2014 +0100

Set distribution to stable-proposed-updates. No DSA, wheezy-security not 
needed.

diff --git a/debian/changelog b/debian/changelog
index 8683fe2..61c0e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mapserver (6.0.1-3.2+deb7u2) wheezy-security; urgency=high
+mapserver (6.0.1-3.2+deb7u2) stable-proposed-updates; urgency=low
 
   * Add patch to fix CVE-2013-7262, an SQL injection vulnerability in the
 msPostGISLayerSetTimeFilter function in mappostgis.c.
 (closes: #734565)
 
- -- Bas Couwenberg sebas...@xs4all.nl  Wed, 08 Jan 2014 21:52:08 +0100
+ -- Bas Couwenberg sebas...@xs4all.nl  Fri, 10 Jan 2014 03:45:58 +0100
 
 mapserver (6.0.1-3.2+deb7u1) stable-proposed-updates; urgency=low
 

-- 
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, squeeze, updated. upstream/5.6.5-6-g6c171e3

2014-01-09 Thread Bas Couwenberg
The following commit has been merged in the squeeze branch:
commit 6c171e37b77675a9d6442eddd5529a0a864fb879
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 10 04:22:12 2014 +0100

Set distribution to oldstable-proposed-updates. No DSA, squeeze-security 
not needed.

diff --git a/debian/changelog b/debian/changelog
index 6b93b1e..19f215c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mapserver (5.6.5-2+squeeze3) squeeze-security; urgency=high
+mapserver (5.6.5-2+squeeze3) oldstable-proposed-updates; urgency=low
 
   * Add patch to fix CVE-2013-7262, an SQL injection vulnerability in the
 msPostGISLayerSetTimeFilter function in mappostgis.c.
 (closes: #734565)
   * Remove debhelper log files to allow clean builds.
 
- -- Bas Couwenberg sebas...@xs4all.nl  Wed, 08 Jan 2014 22:44:27 +0100
+ -- Bas Couwenberg sebas...@xs4all.nl  Fri, 10 Jan 2014 04:21:27 +0100
 
 mapserver (5.6.5-2+squeeze2) stable-security; urgency=high
 

-- 
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#734827: spatialindex: use dh-autoreconf instead of autotools-dev to fix FTBFS on ppc64el

2014-01-09 Thread Logan Rosen
Package: spatialindex
Version: 1.7.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

For the ppc64el architecture in Ubuntu, since this package uses libtool, a full
autoreconf is necessary instead of just config.{sub,guess} updates with
autotools-dev. This is because we need new libtool macros for ppc64el.

In Ubuntu, the attached patch was applied to achieve the following:

  * Use dh-autoreconf instead of autotools-dev to fix FTBFS on ppc64el.

Thanks for considering the patch.

Logan Rosen



-- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-1-generic (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru spatialindex-1.7.0/debian/control spatialindex-1.7.0/debian/control
--- spatialindex-1.7.0/debian/control	2011-11-28 10:04:01.0 -0500
+++ spatialindex-1.7.0/debian/control	2014-01-09 22:32:39.0 -0500
@@ -2,7 +2,7 @@
 Priority: extra
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 8), autotools-dev
+Build-Depends: debhelper (= 8), dh-autoreconf
 Standards-Version: 3.9.2
 Section: science
 Homepage: https://github.com/libspatialindex/libspatialindex
diff -Nru spatialindex-1.7.0/debian/rules spatialindex-1.7.0/debian/rules
--- spatialindex-1.7.0/debian/rules	2011-11-28 10:04:01.0 -0500
+++ spatialindex-1.7.0/debian/rules	2014-01-08 23:17:29.0 -0500
@@ -22,15 +22,8 @@
 
 config.status: configure
 	dh_testdir
+	dh_autoreconf
 	# Add here commands to configure the package.
-ifneq $(wildcard /usr/share/misc/config.sub) 
-	cp -f config.sub config.sub.orig
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess) 
-	cp -f config.guess config.guess.orig
-	cp -f /usr/share/misc/config.guess config.guess
-endif
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 		CFLAGS=$(CFLAGS) LDFLAGS=-Wl,-z,defs \
 		CC=g++ # a dirty hack to force using of g++ at libtool linking time
@@ -51,11 +44,9 @@
 	
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-	[ ! -f config.sub.orig ] || mv -f config.sub.orig config.sub
-	[ ! -f config.guess.orig ] || mv -f config.guess.orig config.guess
 	rm -rf *.log autom4ate.cache
 	rm -rf debian/tmp
-	
+	dh_autoreconf_clean	
 	dh_clean 
 
 install: build
___
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#734829: pu: package mapserver/6.0.1-3.2+deb7u2

2014-01-09 Thread Bas Couwenberg
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: pu

Dear Release Team,

The MapServer project has released stable updates for every major
release from 5.6.x up fixing a security issue which allows a potential
leakage of information through an SQL injection when using TIME filtering in
conjunction with PostGIS backends. More information can be found in the
dedicated upstream issue: #4834

https://github.com/mapserver/mapserver/issues/4834

I've included the patch for this minor vulnerability from MapServer 6.0.4 in
the new mapserver 6.0.1-3.2+deb7u2. 

Is this acceptable for upload to wheezy-proposed-updates?

Kind Regards,

Bas
diff -Nru mapserver-6.0.1/debian/changelog mapserver-6.0.1/debian/changelog
--- mapserver-6.0.1/debian/changelog	2013-09-25 21:15:43.0 +0200
+++ mapserver-6.0.1/debian/changelog	2014-01-10 04:15:18.0 +0100
@@ -1,3 +1,11 @@
+mapserver (6.0.1-3.2+deb7u2) stable-proposed-updates; urgency=low
+
+  * Add patch to fix CVE-2013-7262, an SQL injection vulnerability in the
+msPostGISLayerSetTimeFilter function in mappostgis.c.
+(closes: #734565)
+
+ -- Bas Couwenberg sebas...@xs4all.nl  Fri, 10 Jan 2014 03:45:58 +0100
+
 mapserver (6.0.1-3.2+deb7u1) stable-proposed-updates; urgency=low
 
   [ Francesco Paolo Lovergine ]
diff -Nru mapserver-6.0.1/debian/patches/cve-2013-7262 mapserver-6.0.1/debian/patches/cve-2013-7262
--- mapserver-6.0.1/debian/patches/cve-2013-7262	1970-01-01 01:00:00.0 +0100
+++ mapserver-6.0.1/debian/patches/cve-2013-7262	2014-01-10 03:45:47.0 +0100
@@ -0,0 +1,20 @@
+Description: Fix potential SQL Injection with postgis TIME filters.
+Origin: https://github.com/mapserver/mapserver/commit/3f0ee57b12d482e0ff5611d05afd32408949f7f9
+Author: Even Rouault even.roua...@mines-paris.org
+Bug: https://github.com/mapserver/mapserver/issues/4834
+Bug-Debian: http://bugs.debian.org/734565
+Last-Update: 2013-01-08
+--- a/mappostgis.c
 b/mappostgis.c
+@@ -2961,6 +2961,11 @@ int msPostGISLayerSetTimeFilter(layerObj
+ if (!lp || !timestring || !timefield)
+   return MS_FALSE;
+ 
++if( strchr(timestring,'\'') || strchr(timestring, '\\') ) {
++   msSetError(MS_MISCERR, Invalid time filter., msPostGISLayerSetTimeFilter());
++   return MS_FALSE;
++}
++
+ if (strstr(timestring, ,) == NULL  
+ strstr(timestring, /) == NULL) /* discrete time */
+   tmpstimestring = msStrdup(timestring);
diff -Nru mapserver-6.0.1/debian/patches/series mapserver-6.0.1/debian/patches/series
--- mapserver-6.0.1/debian/patches/series	2013-09-25 21:13:43.0 +0200
+++ mapserver-6.0.1/debian/patches/series	2014-01-10 03:45:47.0 +0100
@@ -2,3 +2,4 @@
 php54
 multiarch-libgd
 contenttype
+cve-2013-7262
___
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 hdf5_1.8.12-5_i386.changes

2014-01-09 Thread Debian FTP Masters
hdf5_1.8.12-5_i386.changes uploaded successfully to localhost
along with the files:
  hdf5_1.8.12-5.dsc
  hdf5_1.8.12-5.debian.tar.gz
  libhdf5-doc_1.8.12-5_all.deb
  libhdf5-7_1.8.12-5_i386.deb
  libhdf5-7-dbg_1.8.12-5_i386.deb
  libhdf5-cpp-7_1.8.12-5_i386.deb
  libhdf5-cpp-7-dbg_1.8.12-5_i386.deb
  libhdf5-dev_1.8.12-5_i386.deb
  libhdf5-openmpi-7_1.8.12-5_i386.deb
  libhdf5-openmpi-dev_1.8.12-5_i386.deb
  libhdf5-openmpi-7-dbg_1.8.12-5_i386.deb
  libhdf5-mpich-7_1.8.12-5_i386.deb
  libhdf5-mpich2-7_1.8.12-5_i386.deb
  libhdf5-mpich-dev_1.8.12-5_i386.deb
  libhdf5-mpich2-dev_1.8.12-5_i386.deb
  libhdf5-mpich-7-dbg_1.8.12-5_i386.deb
  libhdf5-mpich2-7-dbg_1.8.12-5_i386.deb
  libhdf5-mpi-dev_1.8.12-5_i386.deb
  hdf5-helpers_1.8.12-5_i386.deb
  hdf5-tools_1.8.12-5_i386.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


hdf5_1.8.12-5_i386.changes ACCEPTED into experimental

2014-01-09 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Thu, 09 Jan 2014 22:35:58 +0100
Source: hdf5
Binary: libhdf5-7 libhdf5-7-dbg libhdf5-cpp-7 libhdf5-cpp-7-dbg libhdf5-dev 
libhdf5-openmpi-7 libhdf5-openmpi-dev libhdf5-openmpi-7-dbg libhdf5-mpich-7 
libhdf5-mpich2-7 libhdf5-mpich-dev libhdf5-mpich2-dev libhdf5-mpich-7-dbg 
libhdf5-mpich2-7-dbg libhdf5-mpi-dev libhdf5-doc hdf5-helpers hdf5-tools
Architecture: source all i386
Version: 1.8.12-5
Distribution: experimental
Urgency: medium
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Changed-By: Gilles Filippini p...@debian.org
Description: 
 hdf5-helpers - Hierarchical Data Format 5 (HDF5) - Helper tools
 hdf5-tools - Hierarchical Data Format 5 (HDF5) - Runtime tools
 libhdf5-7  - Hierarchical Data Format 5 (HDF5) - runtime files - serial versio
 libhdf5-7-dbg - Hierarchical Data Format 5 (HDF5) - Debug package
 libhdf5-cpp-7 - Hierarchical Data Format 5 (HDF5) - C++ libraries
 libhdf5-cpp-7-dbg - Hierarchical Data Format 5 (HDF5) - C++ Debug package
 libhdf5-dev - Hierarchical Data Format 5 (HDF5) - development files - serial ve
 libhdf5-doc - Hierarchical Data Format 5 (HDF5) - Documentation
 libhdf5-mpi-dev - Hierarchical Data Format 5 (HDF5) - development files - 
default M
 libhdf5-mpich-7 - Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 
versio
 libhdf5-mpich-7-dbg - Hierarchical Data Format 5 (HDF5) - Mpich Debug package
 libhdf5-mpich-dev - Hierarchical Data Format 5 (HDF5) - development files - 
MPICH ver
 libhdf5-mpich2-7 - Hierarchical Data Format 5 (HDF5) - runtime files - MPICH 
version
 libhdf5-mpich2-7-dbg - Hierarchical Data Format 5 (HDF5) - Mpich Debug package
 libhdf5-mpich2-dev - Hierarchical Data Format 5 (HDF5) - development files - 
MPICH ver
 libhdf5-openmpi-7 - Hierarchical Data Format 5 (HDF5) - runtime files - 
OpenMPI versi
 libhdf5-openmpi-7-dbg - Hierarchical Data Format 5 (HDF5) - OpenMPI Debug 
package
 libhdf5-openmpi-dev - Hierarchical Data Format 5 (HDF5) - development files - 
OpenMPI v
Closes: 734781
Changes: 
 hdf5 (1.8.12-5) experimental; urgency=medium
 .
   * Fix missing Breaks+Replaces relation for libhdf5-cpp-7
 (closes: #734781).
   * Bump Standards-Version to 3.9.5 (no changes).
 .
   * rules: drop unneeded compilation and link flags which are automatically
 set by mpicc.
Checksums-Sha1: 
 3491964402241ee3b70ee9a9e1dfbd5639e0da5e 2863 hdf5_1.8.12-5.dsc
 ef040726f1b532935d588706d5ceede078033c59 107237 hdf5_1.8.12-5.debian.tar.gz
 21eaf2b06ccf41dbe6a1c74cefd6fdf284ba372f 101322 libhdf5-doc_1.8.12-5_all.deb
 89ae08b242bcec7e15377c100db7de8a35b57047 927974 libhdf5-7_1.8.12-5_i386.deb
 9a1e68866d1896d429cede1e7a39e1f452a49a1c 2562024 
libhdf5-7-dbg_1.8.12-5_i386.deb
 42cc7f5d38b2bba3c52ca5dd6e4e57a59a0b48a7 106074 libhdf5-cpp-7_1.8.12-5_i386.deb
 701057901347e4bcb56d459180380db8501a9854 348358 
libhdf5-cpp-7-dbg_1.8.12-5_i386.deb
 42218f296e14e261d3526f4734133f41a1b9f616 4339282 libhdf5-dev_1.8.12-5_i386.deb
 20abfd739fef10e2ebdf6bd03d38594fac831a1b 948432 
libhdf5-openmpi-7_1.8.12-5_i386.deb
 43bab74e56f733c227aef9ba2ff9cd725266c97b 4056254 
libhdf5-openmpi-dev_1.8.12-5_i386.deb
 2eecbde108cbb270c918701bbb9431fc5ceefc61 2604022 
libhdf5-openmpi-7-dbg_1.8.12-5_i386.deb
 51c58b5726225875fea7387bb8b81571a7b7c3fa 948608 
libhdf5-mpich-7_1.8.12-5_i386.deb
 be2758e3b97877dd5731990eb522283e92e93711 23624 
libhdf5-mpich2-7_1.8.12-5_i386.deb
 4ab6c3c8b500861d7f7638e318e4c27474e07659 4051570 
libhdf5-mpich-dev_1.8.12-5_i386.deb
 54b66a576a4814413756c45cd730b65af9691f3e 23620 
libhdf5-mpich2-dev_1.8.12-5_i386.deb
 3e35037870f174d892a4ab737711c166c07f5127 2603386 
libhdf5-mpich-7-dbg_1.8.12-5_i386.deb
 ffb4a2c0e88aef6ca576e72d913ee40322f27c8b 23622 
libhdf5-mpich2-7-dbg_1.8.12-5_i386.deb
 700b5d1ca91bfa00d7c511f70a2dde9f7152afe7 23640 
libhdf5-mpi-dev_1.8.12-5_i386.deb
 dddf3967c46c86a85faaa095786883706297e12c 31714 hdf5-helpers_1.8.12-5_i386.deb
 0734890c7f9a861f171c1c1c434c3cbb1810b63a 348534 hdf5-tools_1.8.12-5_i386.deb
Checksums-Sha256: 
 354283819872b526f8120b62b33e32b8384fcc62b7bc71d78372c8517c9e5938 2863 
hdf5_1.8.12-5.dsc
 239ca92c0bde1c1d15925c1573518017a7c24ae74e087fc33072fdf475ecdd59 107237 
hdf5_1.8.12-5.debian.tar.gz
 86e15d3182ee22368a9c5468aa0516264ed07584d507c1e90de2dbb166fff960 101322 
libhdf5-doc_1.8.12-5_all.deb
 fa697c8f99e2efc1645ec0666bf7d0ab212487b203b11eb6b0b9381fe65737b8 927974 
libhdf5-7_1.8.12-5_i386.deb
 10d46997cb189da18ded03db226f60cbe83ad01d1215432e95541f39075e9b76 2562024 
libhdf5-7-dbg_1.8.12-5_i386.deb
 63dc0a3b0cc5b761398d72a1461ff423284b5454c4ca648589f81dffa5c618f7 106074 
libhdf5-cpp-7_1.8.12-5_i386.deb
 0dc373833291aaa50d19991f6f9d2df10d267428b11099decb6235afc22a8572 348358 
libhdf5-cpp-7-dbg_1.8.12-5_i386.deb
 3ed1323f4e839f62cdf89cd6ad2ed161279ed6bf9c11d946543acde596f2798f 4339282 
libhdf5-dev_1.8.12-5_i386.deb
 4bf552d5a93ec0261f44feecfe251a6d3973c63824a19162577accd8c502990b 948432 
libhdf5-openmpi-7_1.8.12-5_i386.deb

Bug#734781: marked as done (libhdf5-cpp-7: fails to upgrade from 'sid' - trying to overwrite /usr/lib/x86_64-linux-gnu/libhdf5_cpp.so.7)

2014-01-09 Thread Debian Bug Tracking System
Your message dated Fri, 10 Jan 2014 07:18:41 +
with message-id e1w1wmb-0005tb...@franck.debian.org
and subject line Bug#734781: fixed in hdf5 1.8.12-5
has caused the Debian Bug report #734781,
regarding libhdf5-cpp-7: fails to upgrade from 'sid' - trying to overwrite 
/usr/lib/x86_64-linux-gnu/libhdf5_cpp.so.7
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.)


-- 
734781: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734781
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Package: libhdf5-cpp-7
Version: 1.8.12-4
Severity: serious
User: debian...@lists.debian.org
Usertags: piuparts
Control: affects -1 + libhdf5-dev

Hi,

during a test with piuparts I noticed your package fails to upgrade from
'sid' to 'experimental'.
It installed fine in 'sid', then the upgrade to 'experimental' fails
because it tries to overwrite other packages files without declaring a
Breaks+Replaces relation.

See policy 7.6 at
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces

From the attached log (scroll to the bottom...):

  Preparing to unpack .../libhdf5-cpp-7_1.8.12-4_amd64.deb ...
  Unpacking libhdf5-cpp-7:amd64 (1.8.12-4) ...
  dpkg: error processing archive 
/var/cache/apt/archives/libhdf5-cpp-7_1.8.12-4_amd64.deb (--unpack):
   trying to overwrite '/usr/lib/x86_64-linux-gnu/libhdf5_cpp.so.7', which is 
also in package libhdf5-7:amd64 1.8.11-5
  Preparing to unpack .../libhdf5-dev_1.8.12-4_amd64.deb ...
  Unpacking libhdf5-dev (1.8.12-4) over (1.8.11-5) ...
  Preparing to unpack .../libhdf5-7_1.8.12-4_amd64.deb ...
  Unpacking libhdf5-7:amd64 (1.8.12-4) over (1.8.11-5) ...
  Errors were encountered while processing:
   /var/cache/apt/archives/libhdf5-cpp-7_1.8.12-4_amd64.deb


cheers,

Andreas


libhdf5-dev_1.8.12-4.log.gz
Description: GNU Zip compressed data
---End Message---
---BeginMessage---
Source: hdf5
Source-Version: 1.8.12-5

We believe that the bug you reported is fixed in the latest version of
hdf5, 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 734...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Gilles Filippini p...@debian.org (supplier of updated hdf5 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: SHA256

Format: 1.8
Date: Thu, 09 Jan 2014 22:35:58 +0100
Source: hdf5
Binary: libhdf5-7 libhdf5-7-dbg libhdf5-cpp-7 libhdf5-cpp-7-dbg libhdf5-dev 
libhdf5-openmpi-7 libhdf5-openmpi-dev libhdf5-openmpi-7-dbg libhdf5-mpich-7 
libhdf5-mpich2-7 libhdf5-mpich-dev libhdf5-mpich2-dev libhdf5-mpich-7-dbg 
libhdf5-mpich2-7-dbg libhdf5-mpi-dev libhdf5-doc hdf5-helpers hdf5-tools
Architecture: source all i386
Version: 1.8.12-5
Distribution: experimental
Urgency: medium
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Changed-By: Gilles Filippini p...@debian.org
Description: 
 hdf5-helpers - Hierarchical Data Format 5 (HDF5) - Helper tools
 hdf5-tools - Hierarchical Data Format 5 (HDF5) - Runtime tools
 libhdf5-7  - Hierarchical Data Format 5 (HDF5) - runtime files - serial versio
 libhdf5-7-dbg - Hierarchical Data Format 5 (HDF5) - Debug package
 libhdf5-cpp-7 - Hierarchical Data Format 5 (HDF5) - C++ libraries
 libhdf5-cpp-7-dbg - Hierarchical Data Format 5 (HDF5) - C++ Debug package
 libhdf5-dev - Hierarchical Data Format 5 (HDF5) - development files - serial ve
 libhdf5-doc - Hierarchical Data Format 5 (HDF5) - Documentation
 libhdf5-mpi-dev - Hierarchical Data Format 5 (HDF5) - development files - 
default M
 libhdf5-mpich-7 - Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 
versio
 libhdf5-mpich-7-dbg - Hierarchical Data Format 5 (HDF5) - Mpich Debug package
 libhdf5-mpich-dev - Hierarchical Data Format 5 (HDF5) - development files - 
MPICH ver
 libhdf5-mpich2-7 - Hierarchical Data Format 5 (HDF5) - runtime files - MPICH 
version
 libhdf5-mpich2-7-dbg - Hierarchical Data Format 5 (HDF5) - Mpich Debug package
 libhdf5-mpich2-dev - Hierarchical Data Format 5 (HDF5) - development files - 
MPICH ver
 libhdf5-openmpi-7 - Hierarchical Data Format 5 (HDF5) - runtime files - 
OpenMPI versi
 libhdf5-openmpi-7-dbg - Hierarchical Data Format 5 (HDF5) - OpenMPI Debug 
package