[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

Bas Couwenberg sebastic at xs4all.nl
Thu Jun 20 19:57:13 UTC 2013


The following commit has been merged in the master branch:
commit 99939561813d1fa52d28ce5366ecd65def5de645
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 14 22:09:37 2013 +0200

    Drop possible-gpl-code-linked-with-openssl lintian override.

diff --git a/debian/changelog b/debian/changelog
index 188f04c..a92a115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapserver (6.2.1-3) UNRELEASED; urgency=low
 
   * Merge change from 6.0.1-4: Migrated to debhelper level 9.
+  * Drop possible-gpl-code-linked-with-openssl lintian override.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index 81b06de..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-libmapscript-ruby1.8: possible-gpl-code-linked-with-openssl
-mapserver-bin: possible-gpl-code-linked-with-openssl
-php5-mapscript: possible-gpl-code-linked-with-openssl
-perl-mapscript: possible-gpl-code-linked-with-openssl
-cgi-mapserver: possible-gpl-code-linked-with-openssl
-python-mapscript: possible-gpl-code-linked-with-openssl
-libmapscript-ruby1.9.1: possible-gpl-code-linked-with-openss
diff --git a/debian/rules b/debian/rules
index 3644e6f..771c850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -219,11 +219,6 @@ binary-arch: install-arch
 	dh_python2 -ppython-mapscript
 	dh_compress -a
 	dh_link -a
-	# Overrides a mismatched error from lintian
-	for pkg in $$(cat debian/lintian-overrides|cut -d: -f1); do \
-			echo "$$pkg: possible-gpl-code-linked-with-openssl" >debian/$$pkg.lintian-overrides; \
-			cat debian/$$pkg.lintian-overrides; \
-	done
 	dh_lintian -a
 	dh_strip -a
 	dh_fixperms -a

-- 
Mapserver



More information about the Pkg-grass-devel mailing list