From 6874b10cdd8f0e5f537bfafadff913beaeddeb2d Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Sat, 17 May 2014 11:37:42 +0200
Subject: [PATCH] debian packaging update

---
 debian/changelog                              |  3 +-
 debian/control                                | 93 +++++++++++++++++--
 debian/control.in                             | 13 ++-
 ...bqgis-analysis{QGIS_ABI}.lintian-overrides |  2 +
 .../libqgis-core{QGIS_ABI}.lintian-overrides  |  2 +
 .../libqgis-gui{QGIS_ABI}.lintian-overrides   |  1 +
 ...etworkanalysis{QGIS_ABI}.lintian-overrides |  1 +
 .../libqgisgrass{QGIS_ABI}.lintian-overrides  |  1 +
 debian/libqgispython{QGIS_ABI}.install        |  1 +
 .../libqgispython{QGIS_ABI}.lintian-overrides |  1 +
 ...lanyconnection{QGIS_ABI}.lintian-overrides |  1 +
 debian/libqgis{QGIS_ABI}.lintian-overrides    |  3 -
 debian/python-qgis.lintian-overrides.in       |  1 +
 .../qgis-plugin-globe-common.lintian-override |  1 +
 .../qgis-providers-common.lintian-overrides   |  2 +
 debian/qgis-sqlanywhere.lintian-overrides     |  2 -
 debian/rules                                  | 42 +++++----
 17 files changed, 133 insertions(+), 37 deletions(-)
 create mode 100644 debian/libqgis-analysis{QGIS_ABI}.lintian-overrides
 create mode 100644 debian/libqgis-core{QGIS_ABI}.lintian-overrides
 create mode 100644 debian/libqgis-gui{QGIS_ABI}.lintian-overrides
 create mode 100644 debian/libqgis-networkanalysis{QGIS_ABI}.lintian-overrides
 create mode 100644 debian/libqgisgrass{QGIS_ABI}.lintian-overrides
 create mode 100644 debian/libqgispython{QGIS_ABI}.install
 create mode 100644 debian/libqgispython{QGIS_ABI}.lintian-overrides
 create mode 100644 debian/libqgissqlanyconnection{QGIS_ABI}.lintian-overrides
 delete mode 100644 debian/libqgis{QGIS_ABI}.lintian-overrides
 create mode 100644 debian/qgis-plugin-globe-common.lintian-override
 create mode 100644 debian/qgis-providers-common.lintian-overrides
 delete mode 100644 debian/qgis-sqlanywhere.lintian-overrides

diff --git a/debian/changelog b/debian/changelog
index b1a5b99b640..05d854572e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ qgis (2.3.0) UNRELEASED; urgency=medium
   * add dependency on libqt4-sql-sqlite to qgis-provider
   * merge debian packageing changes
   * merge distribution specific file templates into one file template
+  * include metasearch plugins and add it's dependencies
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sun, 06 Apr 2014 00:30:34 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 17 May 2014 11:39:25 +0200
 
 qgis (2.2.0) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index f7c662f1b61..afa744d09cf 100644
--- a/debian/control
+++ b/debian/control
@@ -71,24 +71,97 @@ Description: QGIS - architecture-independent data
  This package contains architecture-independent supporting data files for use
  with QGIS.
 
-Package: libqgis{QGIS_ABI}
+Package: libqgis-core2.3.0
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis2.3.0
+Description: QGIS - shared core library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared core library.
+
+Package: libqgis-gui2.3.0
 Architecture: any
 Section: libs
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces:
- qgis (<=0.9.2rc1),
- libqgis-core1,
- libqgis-gui1,
- libqgis0,
- libqgis1
-Description: QGIS - shared libraries
+ libqgis2.3.0
+Description: QGIS - shared gui library
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains the shared core and gui library that provide an
- interface for plugins and stand-alone applications.
+ This package contains the shared gui library.
+
+Package: libqgis-analysis2.3.0
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis2.3.0
+Description: QGIS - shared analysis library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared analysis library.
+
+Package: libqgis-networkanalysis2.3.0
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis2.3.0
+Description: QGIS - shared network analysis library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared network analysis library.
+
+Package: libqgisgrass2.3.0
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis2.3.0
+Description: QGIS - shared grass library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared grass library.
+
+Package: libqgispython2.3.0
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis2.3.0
+Description: QGIS - shared Python library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared Python library.
+
+Package: libqgissqlanyconnection2.3.0
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis2.3.0
+Description: QGIS - shared sqlanywhere connection library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared sqlanywhere connection library.
 
 Package: libqgis-dev
 Architecture: any
@@ -142,7 +215,7 @@ Architecture: any
 Section: python
 Depends:
  python-qt4,
- python-sip4,
+ python-sip,
  python-qgis-common (= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
diff --git a/debian/control.in b/debian/control.in
index 41b35bdb490..f91b7cfd2e1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -164,11 +164,11 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: libqgis{QGIS_ABI}
-Description: QGIS - shared python library
+Description: QGIS - shared Python library
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains the shared python library.
+ This package contains the shared Python library.
 
 Package: libqgissqlanyconnection{QGIS_ABI}
 Architecture: any
@@ -259,6 +259,13 @@ Depends:
  python-qgis-common (= ${source:Version}),
  python-psycopg2,
  python-qscintilla2,
+ python-httplib2,
+ python-jinja2,
+ python-markupsafe,
+ python-pygments,
+ python-dateutil,
+ python-tz,
+ python-six,
 #sid jessie quantal trusty sid-oracle# python-pyspatialite,
  libqgispython{QGIS_ABI},
  ${shlibs:Depends},
@@ -386,7 +393,7 @@ Description: OSG globe plugin for QGIS - architecture-independent data
 #sid-oracle#Package: qgis-oracle-provider
 #sid-oracle#Architecture: any
 #sid-oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
-#sid-oracle#Section: contrib/databases
+#sid-oracle#Section: contrib/database
 #sid-oracle#Description: QGIS oracle provider
 #sid-oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
 #sid-oracle# display databases of geographic information.
diff --git a/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides b/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides
new file mode 100644
index 00000000000..ead8655cd5d
--- /dev/null
+++ b/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides
@@ -0,0 +1,2 @@
+libqgis-analysis{QGIS_ABI}: no-symbols-control-file
+libqgis-analysis{QGIS_ABI}: shlib-calls-exit
diff --git a/debian/libqgis-core{QGIS_ABI}.lintian-overrides b/debian/libqgis-core{QGIS_ABI}.lintian-overrides
new file mode 100644
index 00000000000..1adba617fbe
--- /dev/null
+++ b/debian/libqgis-core{QGIS_ABI}.lintian-overrides
@@ -0,0 +1,2 @@
+libqgis-core{QGIS_ABI}: no-symbols-control-file
+libqgis-core{QGIS_ABI}: shlib-calls-exit
diff --git a/debian/libqgis-gui{QGIS_ABI}.lintian-overrides b/debian/libqgis-gui{QGIS_ABI}.lintian-overrides
new file mode 100644
index 00000000000..6207827017b
--- /dev/null
+++ b/debian/libqgis-gui{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
+libqgis-gui{QGIS_ABI}: no-symbols-control-file
diff --git a/debian/libqgis-networkanalysis{QGIS_ABI}.lintian-overrides b/debian/libqgis-networkanalysis{QGIS_ABI}.lintian-overrides
new file mode 100644
index 00000000000..d44aa9f2cc6
--- /dev/null
+++ b/debian/libqgis-networkanalysis{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
+libqgis-networkanalysis{QGIS_ABI}: no-symbols-control-file
diff --git a/debian/libqgisgrass{QGIS_ABI}.lintian-overrides b/debian/libqgisgrass{QGIS_ABI}.lintian-overrides
new file mode 100644
index 00000000000..3f37c8ca1f7
--- /dev/null
+++ b/debian/libqgisgrass{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
+libqgisgrass{QGIS_ABI}: no-symbols-control-file
diff --git a/debian/libqgispython{QGIS_ABI}.install b/debian/libqgispython{QGIS_ABI}.install
new file mode 100644
index 00000000000..7926376ed25
--- /dev/null
+++ b/debian/libqgispython{QGIS_ABI}.install
@@ -0,0 +1 @@
+usr/lib/libqgispython.so.*
diff --git a/debian/libqgispython{QGIS_ABI}.lintian-overrides b/debian/libqgispython{QGIS_ABI}.lintian-overrides
new file mode 100644
index 00000000000..5804cab6d5c
--- /dev/null
+++ b/debian/libqgispython{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
+libqgispython{QGIS_ABI}: no-symbols-control-file
diff --git a/debian/libqgissqlanyconnection{QGIS_ABI}.lintian-overrides b/debian/libqgissqlanyconnection{QGIS_ABI}.lintian-overrides
new file mode 100644
index 00000000000..20fbe2393e9
--- /dev/null
+++ b/debian/libqgissqlanyconnection{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
+libqgissqlanyconnection{QGIS_ABI}: no-symbols-control-file
diff --git a/debian/libqgis{QGIS_ABI}.lintian-overrides b/debian/libqgis{QGIS_ABI}.lintian-overrides
deleted file mode 100644
index 88e0b600d44..00000000000
--- a/debian/libqgis{QGIS_ABI}.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libqgis{QGIS_ABI}: package-name-doesnt-match-sonames
-libqgis{QGIS_ABI}: no-symbols-control-file
-libqgis{QGIS_ABI}: shlib-calls-exit
diff --git a/debian/python-qgis.lintian-overrides.in b/debian/python-qgis.lintian-overrides.in
index 72dbe1cc032..321de6b1fcf 100644
--- a/debian/python-qgis.lintian-overrides.in
+++ b/debian/python-qgis.lintian-overrides.in
@@ -1,2 +1,3 @@
+python-qgis: hardening-no-fortify-functions
 python-qgis: package-name-doesnt-match-sonames
 python-qgis: no-symbols-control-file
diff --git a/debian/qgis-plugin-globe-common.lintian-override b/debian/qgis-plugin-globe-common.lintian-override
new file mode 100644
index 00000000000..6147c5316b9
--- /dev/null
+++ b/debian/qgis-plugin-globe-common.lintian-override
@@ -0,0 +1 @@
+qgis-plugin-globe-common: package-contains-broken-symlink usr/share/qgis/globe/world.tif ../../osgearth/data/world.tif
diff --git a/debian/qgis-providers-common.lintian-overrides b/debian/qgis-providers-common.lintian-overrides
new file mode 100644
index 00000000000..071c91098ac
--- /dev/null
+++ b/debian/qgis-providers-common.lintian-overrides
@@ -0,0 +1,2 @@
+qgis-providers-common: privacy-breach-generic
+qgis-providers-common: extra-license-file
diff --git a/debian/qgis-sqlanywhere.lintian-overrides b/debian/qgis-sqlanywhere.lintian-overrides
deleted file mode 100644
index 990f1e977ba..00000000000
--- a/debian/qgis-sqlanywhere.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-qgis-sqlanywhere: package-name-doesnt-match-sonames
-qgis-sqlanywhere: no-symbols-control-file
diff --git a/debian/rules b/debian/rules
index 6c01baa3492..902b10be393 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,13 @@ CMAKE_OPTS := \
 	-DMAPSERVER_SKIP_ECW=TRUE \
 	-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-DWITH_APIDOC=TRUE \
-	-DWITH_GLOBE=TRUE
+	-DWITH_GLOBE=TRUE \
+	-DWITH_INTERNAL_HTTPLIB2=FALSE \
+	-DWITH_INTERNAL_JINJA2=FALSE \
+	-DWITH_INTERNAL_MARKUPSAFE=FALSE \
+	-DWITH_INTERNAL_PYGMENTS=FALSE \
+	-DWITH_INTERNAL_DATEUTIL=FALSE \
+	-DWITH_INTERNAL_PYTZ=FALSE
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -87,7 +93,7 @@ else
 	CMAKE_OPTS += -DENABLE_TESTS=TRUE
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy trusty sid"))
+ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy trusty sid sid-oracle"))
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS   := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
@@ -116,7 +122,7 @@ define gentemplate
 $(2): $(1)
 	sed -r \
 		-e 's/^#(.* |)$(DISTRIBUTION)( .*|)#//' \
-		-e '/^#/d' \
+		-e '/^#($|[^!])/d' \
 		-e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \
 		-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \
 		-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
@@ -165,21 +171,6 @@ endif
 override_dh_auto_install-arch:
 	dh_auto_install --arch
 
-	# remove unwanted files
-	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
-	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
-	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE
-
-	# Don't include a copy of the world.tif also included in osgearth-data
-	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
-
-	# remove extra license files
-	-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
-
-	# Man pages are installed by dh_installman
-	$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
-	$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
-
 	# Install menu pixmap
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
@@ -227,6 +218,21 @@ override_dh_install:
 
 	perl -i -pe 's=#!/usr/bin/env python=#!/usr/bin/python2.7=;' $$(find debian/tmp -name "*.py")
 
+	# remove unwanted files
+	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
+	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
+	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE
+
+	# Don't include a copy of the world.tif also included in osgearth-data
+	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
+
+	# remove extra license files
+	-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
+
+	# Man pages are installed by dh_installman
+	$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
+	$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
+
 	dh_install --autodest --list-missing
 
 override_dh_installchangelogs: