[SCM] mapserver branch, squeeze, updated. upstream/5.6.5-5-g48f3bd1

2014-01-08 Thread Bas Couwenberg
The following commit has been merged in the squeeze branch:
commit 16090f442da34832deb4623e0dcfafffaea915cc
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Jan 8 22:51:50 2014 +0100

Remove debhelper log files to allow clean builds.

diff --git a/debian/cgi-mapserver.debhelper.log 
b/debian/cgi-mapserver.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/cgi-mapserver.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/changelog b/debian/changelog
index a4eb6e0..6b93b1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (5.6.5-2+squeeze3) squeeze-security; urgency=high
   * 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
 
diff --git a/debian/libmapscript-ruby.debhelper.log 
b/debian/libmapscript-ruby.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/libmapscript-ruby.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/libmapscript-ruby1.8.debhelper.log 
b/debian/libmapscript-ruby1.8.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/libmapscript-ruby1.8.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/libmapscript-ruby1.9.1.debhelper.log 
b/debian/libmapscript-ruby1.9.1.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/libmapscript-ruby1.9.1.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/mapserver-bin.debhelper.log 
b/debian/mapserver-bin.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/mapserver-bin.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/mapserver-doc.debhelper.log 
b/debian/mapserver-doc.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/mapserver-doc.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/perl-mapscript.debhelper.log 
b/debian/perl-mapscript.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/perl-mapscript.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/php5-mapscript.debhelper.log 
b/debian/php5-mapscript.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/php5-mapscript.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/python-mapscript.debhelper.log 
b/debian/python-mapscript.debhelper.log
deleted file mode 100644
index 8e81117..000
--- a/debian/python-mapscript.debhelper.log
+++ /dev/null
@@ -1,3 +0,0 @@
-dh_prep
-dh_prep
-dh_prep
diff --git a/debian/rules b/debian/rules
index e87e0e1..b90bec4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,7 @@ clean-first-build:
 clean: unpatch clean-first-build
dh_testdir
dh_prep
+   -$(RM) debian/*.debhelper.log
-$(RM) configure-php5-stamp build-php5-stamp install-arch-stamp 
install-indep-stamp install-php5-stamp
[ ! -f Makefile ] || $(MAKE) distclean
 

-- 
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-5-g48f3bd1

2014-01-08 Thread Bas Couwenberg
The following commit has been merged in the squeeze branch:
commit 48f3bd110eb7dda8b1ae88cb04026c0ae84da15e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Jan 8 22:54:44 2014 +0100

Changed dpatch permissions.

diff --git a/debian/patches/01_wfs_sql_injection.dpatch 
b/debian/patches/01_wfs_sql_injection.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/cve-2013-7262.dpatch 
b/debian/patches/cve-2013-7262.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/symbol_index_overflow.dpatch 
b/debian/patches/symbol_index_overflow.dpatch
old mode 100644
new mode 100755

-- 
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