[SCM] qgis branch, master, updated. upstream/2.0.1-13436-g7969474
Bas Couwenberg
sebastic at xs4all.nl
Fri Sep 27 22:02:02 UTC 2013
The following commit has been merged in the master branch:
commit 13688884305141f61ba32a399b0e7c02feb15a9a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 27 03:48:34 2013 +0200
Use minimal dh rules.
diff --git a/debian/changelog b/debian/changelog
index c4b33f3..ba146b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qgis (2.0.1-1) UNRELEASED; urgency=low
[ Bas Couwenberg ]
* Add myself to Uploaders.
* Merge changes from control.sid.
+ * Use minimal dh rules.
-- Bas Couwenberg <sebastic at xs4all.nl> Fri, 27 Sep 2013 02:05:32 +0200
diff --git a/debian/control b/debian/control
index 058cc6e..a7355c0 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends: bison,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
- python,
- python-dev (>= 2.6.6-3~),
+ python-all (>= 2.6.6-3~),
+ python-all-dev (>= 2.6.6-3~),
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
@@ -80,7 +80,7 @@ Description: QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with QGIS.
-Package: libqgis1.8.0
+Package: libqgis2.0.1
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -106,7 +106,7 @@ Depends: grass-dev,
libgsl0-dev,
libpq-dev,
libproj-dev,
- libqgis1.8.0 (= ${binary:Version}),
+ libqgis2.0.1 (= ${binary:Version}),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
diff --git a/debian/libqgis-dev.install b/debian/libqgis-dev.install
index 60a5051..ad174cb 100644
--- a/debian/libqgis-dev.install
+++ b/debian/libqgis-dev.install
@@ -3,3 +3,5 @@ usr/lib/libqgis_core.so
usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so
usr/lib/libqgis_networkanalysis.so
+usr/lib/libqgispython.so
+usr/share/qgis/FindQGIS.cmake
diff --git a/debian/libqgis2.0.1.install b/debian/libqgis2.0.1.install
new file mode 100644
index 0000000..9dc5995
--- /dev/null
+++ b/debian/libqgis2.0.1.install
@@ -0,0 +1,4 @@
+usr/lib/libqgis_core.so.2.0.1
+usr/lib/libqgis_gui.so.2.0.1
+usr/lib/libqgis_analysis.so.2.0.1
+usr/lib/libqgis_networkanalysis.so.2.0.1
diff --git a/debian/libqgis{QGIS_ABI}.install b/debian/libqgis{QGIS_ABI}.install
deleted file mode 100644
index 205d78c..0000000
--- a/debian/libqgis{QGIS_ABI}.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libqgis_core.so.{QGIS_ABI}
-usr/lib/libqgis_gui.so.{QGIS_ABI}
-usr/lib/libqgis_analysis.so.{QGIS_ABI}
-usr/lib/libqgis_networkanalysis.so.{QGIS_ABI}
diff --git a/debian/libqgis{QGIS_ABI}.lintian-overrides b/debian/libqgis{QGIS_ABI}.lintian-overrides
deleted file mode 100644
index 88e0b60..0000000
--- 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.install b/debian/python-qgis.install
new file mode 100644
index 0000000..2453ce7
--- /dev/null
+++ b/debian/python-qgis.install
@@ -0,0 +1 @@
+usr/lib/python*/
diff --git a/debian/python-qgis.lintian-overrides.in b/debian/python-qgis.lintian-overrides.in
deleted file mode 100644
index 72dbe1c..0000000
--- a/debian/python-qgis.lintian-overrides.in
+++ /dev/null
@@ -1,2 +0,0 @@
-python-qgis: package-name-doesnt-match-sonames
-python-qgis: no-symbols-control-file
diff --git a/debian/qgis-api-doc.links b/debian/qgis-api-doc.links
new file mode 100644
index 0000000..1f3fedb
--- /dev/null
+++ b/debian/qgis-api-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/api/jquery.js
diff --git a/debian/qgis-common.install b/debian/qgis-common.install
index 19af615..e8f4692 100644
--- a/debian/qgis-common.install
+++ b/debian/qgis-common.install
@@ -1,4 +1,5 @@
usr/share/qgis/doc/CODING
+usr/share/qgis/doc/CODING.html
usr/share/qgis/doc/favicon.ico
usr/share/qgis/doc/index.html
usr/share/qgis/doc/style.css
@@ -9,6 +10,8 @@ usr/share/qgis/doc/TRANSLATORS
usr/share/qgis/doc/DONORS
usr/share/qgis/doc/INSTALL
usr/share/qgis/doc/INSTALL.html
+usr/share/qgis/doc/news
+usr/share/qgis/doc/news.html
usr/share/qgis/doc/images
usr/share/qgis/i18n/*
usr/share/qgis/images/*
diff --git a/debian/qgis-oracle-provider.install b/debian/qgis-oracle-provider.install
new file mode 100644
index 0000000..a6f277f
--- /dev/null
+++ b/debian/qgis-oracle-provider.install
@@ -0,0 +1,2 @@
+usr/lib/qgis/plugins/liboracleprovider.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlocispatial.so
diff --git a/debian/qgis-oracle-provider.install.in b/debian/qgis-oracle-provider.install.in
deleted file mode 100644
index c9a027c..0000000
--- a/debian/qgis-oracle-provider.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/qgis/plugins/liboracleprovider.so
-{QT_PLUGIN_DIR}/sqldrivers/libqsqlocispatial.so
diff --git a/debian/qgis-plugin-grass.install.in b/debian/qgis-plugin-grass.install
similarity index 77%
rename from debian/qgis-plugin-grass.install.in
rename to debian/qgis-plugin-grass.install
index 05a3a01..16f7978b 100644
--- a/debian/qgis-plugin-grass.install.in
+++ b/debian/qgis-plugin-grass.install
@@ -4,4 +4,5 @@ usr/lib/qgis/grass/bin/qgis.g.browser
usr/lib/qgis/plugins/libgrassplugin.so
usr/lib/qgis/plugins/libgrassprovider.so
usr/lib/qgis/plugins/libgrassrasterprovider.so
-usr/lib/libqgisgrass.so.{QGIS_ABI}
+usr/lib/qgis/plugins/libgrass_gis*.so*
+usr/lib/libqgisgrass.so.2.0.1
diff --git a/debian/qgis-providers-common.install b/debian/qgis-providers-common.install
index 88bdfa3..7e0a86e 100644
--- a/debian/qgis-providers-common.install
+++ b/debian/qgis-providers-common.install
@@ -1,5 +1,7 @@
usr/share/qgis/svg/*
usr/share/qgis/resources/qgis.db
usr/share/qgis/resources/srs.db
+usr/share/qgis/resources/customization.xml
+usr/share/qgis/resources/symbology-ng-style.xml
usr/share/qgis/resources/symbology-ng-style.db
usr/share/qgis/resources/cpt-city-qgis-min/*
diff --git a/debian/qgis-providers.install.in b/debian/qgis-providers.install
similarity index 90%
rename from debian/qgis-providers.install.in
rename to debian/qgis-providers.install
index f621f1f..f21a251 100644
--- a/debian/qgis-providers.install.in
+++ b/debian/qgis-providers.install
@@ -11,4 +11,4 @@ usr/lib/qgis/plugins/libspatialiteprovider.so
usr/lib/qgis/plugins/libwfsprovider.so
usr/lib/qgis/plugins/libwmsprovider.so
usr/lib/qgis/plugins/libwcsprovider.so
-{QT_PLUGIN_DIR}/sqldrivers/libqsqlspatialite.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlspatialite.so
diff --git a/debian/qgis-sqlanywhere.install.in b/debian/qgis-sqlanywhere.install
similarity index 66%
rename from debian/qgis-sqlanywhere.install.in
rename to debian/qgis-sqlanywhere.install
index 00d4b98..2d3947c 100644
--- a/debian/qgis-sqlanywhere.install.in
+++ b/debian/qgis-sqlanywhere.install
@@ -1,3 +1,3 @@
usr/lib/qgis/plugins/libsqlanywhereplugin.so
usr/lib/qgis/plugins/libsqlanywhereprovider.so
-usr/lib/libqgissqlanyconnection.so.{QGIS_ABI}
+usr/lib/libqgissqlanyconnection.so.2.0.1
diff --git a/debian/qgis.install b/debian/qgis.install
index 9d98869..d57361e 100644
--- a/debian/qgis.install
+++ b/debian/qgis.install
@@ -16,16 +16,6 @@ usr/lib/qgis/plugins/libtopolplugin.so
usr/lib/qgis/qgis_help
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png
-usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes
-../qgis.desktop usr/share/applications
-../qbrowser.desktop usr/share/applications
-../qgis.xml usr/share/mime/packages
-../mime/application/x-esri-shape.desktop usr/share/mimelnk/application
-../mime/application/x-mapinfo-mif.desktop usr/share/mimelnk/application
-../mime/application/x-esri-crs.desktop usr/share/mimelnk/application
-../mime/application/x-raster-ecw.desktop usr/share/mimelnk/application
-../mime/application/x-adobe-mif.desktop usr/share/mimelnk/application
-../mime/application/x-raster-aig.desktop usr/share/mimelnk/application
-../mime/application/x-qgis-project.desktop usr/share/mimelnk/application
-../mime/application/x-raster-mrsid.desktop usr/share/mimelnk/application
-../mime/application/x-qgis-layer-settings.desktop usr/share/mimelnk/application
+usr/share/applications/
+usr/share/mime/packages
+usr/share/mimelnk/
diff --git a/debian/qgis.manpages b/debian/qgis.manpages
new file mode 100644
index 0000000..f90fa84
--- /dev/null
+++ b/debian/qgis.manpages
@@ -0,0 +1,2 @@
+usr/man/man1/qgis.1
+usr/man/man1/qbrowser.1
diff --git a/debian/qgis.sh.in b/debian/qgis.sh
similarity index 51%
rename from debian/qgis.sh.in
rename to debian/qgis.sh
index ed17522..3164552 100644
--- a/debian/qgis.sh.in
+++ b/debian/qgis.sh
@@ -1,9 +1,9 @@
#!/bin/sh
if [ "$LD_LIBRARY_PATH" = "" ]; then
- LD_LIBRARY_PATH=/usr/lib/{GRASS}/lib
+ LD_LIBRARY_PATH=/usr/lib/grass64/lib
else
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/{GRASS}/lib
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass64/lib
fi
export LD_LIBRARY_PATH
diff --git a/debian/rules b/debian/rules
index 6fb559d..a1c6eaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -12,29 +15,11 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_TEST_TARGET ?= Experimental
-ifeq (,$(DISTRIBUTION))
- DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
-endif
-
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise quantal raring sid-oracle"))
-ifneq (0,$(shell cat debian/control.debiangis 2>/dev/null|wc -l))
-DISTRIBUTION := debiangis
-else
-DISTRIBUTION := sid
-endif
-endif
-
-DEB_BUILD_NAME ?= $(DISTRIBUTION)-$(DEB_BUILD_ARCH)
-
ifeq (,$(DISPLAY))
TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" $(MAKE)
else
TESTMAKE=$(MAKE)
endif
-ifneq (,$(findstring $(DISTRIBUTION),"lucid"))
-# excludes tests requiring unittest2 not available on lucid
-TESTMAKE += ARGS="-E PyQgsRectangle"
-endif
QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
@@ -45,63 +30,39 @@ GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e "s/\.//g" -e "
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
CMAKE_OPTS := \
- -D BUILDNAME=$(DEB_BUILD_NAME) \
- -D GRASS_PREFIX=/usr/lib/grass64 \
- -D CMAKE_INSTALL_PREFIX=/usr \
- -D BINDINGS_GLOBAL_INSTALL=TRUE \
- -D PEDANTIC=TRUE \
- -D WITH_QSPATIALITE=TRUE \
- -D WITH_MAPSERVER=TRUE \
- -D MAPSERVER_SKIP_ECW=TRUE \
- -D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
- -D WITH_APIDOC=TRUE
+ -DGRASS_PREFIX=/usr/lib/grass64 \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBINDINGS_GLOBAL_INSTALL=TRUE \
+ -DPEDANTIC=TRUE \
+ -DWITH_QSPATIALITE=TRUE \
+ -DWITH_MAPSERVER=TRUE \
+ -DMAPSERVER_SKIP_ECW=TRUE \
+ -DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
+ -DWITH_APIDOC=TRUE \
+ -DWITH_PYSPATIALITE=TRUE \
+ -DWITH_GLOBE=FALSE \
+ -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
-MAKEFLAGS += VERBOSE=YES
-
-ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
- CMAKE_OPTS += -D WITH_STAGED_PLUGINS=FALSE
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CMAKE_OPTS += -DCMAKE_BUILD_TYPE=Debug
endif
-ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
- DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
- QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
-else
- QT_PLUGIN_DIR = usr/lib/qt4/plugins
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ CMAKE_OPTS += -DENABLE_TESTS=FALSE
endif
+MAKEFLAGS += VERBOSE=YES
+
+DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
-ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy sid lucid maverick natty oneiric precise raring"))
- CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE
-endif
-
-ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
- CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
-endif
-
-ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
- CMAKE_OPTS += -D WITH_GLOBE=FALSE
-else
- CMAKE_OPTS += -D WITH_GLOBE=TRUE
-endif
-
-ifneq (,$(findstring $(DISTRIBUTION),"raring sid sid-oracle"))
- CMAKE_OPTS += -D PYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
-endif
-
-ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
- CMAKE_OPTS += -D WITH_ORACLE=TRUE
-endif
-
-ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid"))
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-endif
+CFLAGS += $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -111,102 +72,36 @@ else
CXXFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug
-endif
-
-ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- CMAKE_OPTS += -D ENABLE_TESTS=FALSE
-endif
-
ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
CFLAGS += -pg
CXXFLAGS += -pg
LDFLAGS += -pg
endif
-define gentemplate
-$(2): $(1)
- sed \
- -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" \
- -e "s/{GRASS}/$(GRASS)/g" \
- -e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@
-
-templates:: $(2)
-
-templateclean::
- rm -f $(2)
-endef
-
-$(foreach t,$(wildcard debian/*.in debian/*.$(DISTRIBUTION)),$(eval $(call gentemplate,$(t),$(basename $(t)))))
-$(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))))
-
-debian/build/CMakeCache.txt: templates CMakeLists.txt
- dh_testdir
- # Add here commands to configure the package.
- [ -d debian/build ] || mkdir debian/build
- [ ! -e CMakeCache.txt ] || rm CMakeCache.txt
- cd debian/build; CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" cmake $(CMAKE_OPTS) ../..
-
-build: build-stamp
-
-build-stamp: debian/build/CMakeCache.txt
- dh_testdir
-
-ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
- perl -0777 -i.bak -pe 's/^%Module\(name=(.*),\s*version=(\d+),\s*keyword_arguments="Optional"\s*\)/%Module $$1 $$2/m;' python/core/core.sip python/gui/gui.sip python/analysis/analysis.sip python/analysis/network/networkanalysis.sip
-endif
-
- # Add here commands to compile the package.
- $(MAKE) -C debian/build
+%:
+ dh $@ --with python2
-ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
- for i in python/core/core.sip python/gui/gui.sip python/analysis/analysis.sip python/analysis/network/networkanalysis.sip; do mv $$i.bak $$i; done
-endif
-
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- # Code to run the package test suite - and ignore the outcome for now
- -LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
-else
- @echo Skipping tests.
-endif
-
- touch $@
+override_dh_clean:
+ dh_clean
-cleantemplates:
- $(MAKE) -f debian/rules templateclean
- $(MAKE) -f debian/rules debian/control debian/compat
+ -$(RM) -rf build/
-clean: cleantemplates
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -f i18n/*.qm
- rm -rf debian/tmp
+override_dh_auto_configure:
+ mkdir -p build && cd build && cmake .. $(CMAKE_OPTS)
- # Add here commands to clean up after the build process.
- rm -rf debian/build
+override_dh_auto_build:
+ $(MAKE) -C build
- dh_clean
+override_dh_auto_test:
+ -LD_LIBRARY_PATH=$(PWD)/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C build $(DEB_TEST_TARGET)
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp.
- $(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp
+override_dh_auto_install:
+ $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
# remove unwanted files
- ! [ -f debian/tmp/usr/share/qgis/doc/api/installdox ] || rm debian/tmp/usr/share/qgis/doc/api/installdox
- ! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/qgis/doc/api/jquery.js
+ $(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
+ $(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
+ $(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE
# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
@@ -214,53 +109,49 @@ install: build
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+ # Install desktop files
+ install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications
+ install -o root -g root -m 644 $(CURDIR)/debian/qgis.desktop $(CURDIR)/debian/tmp/usr/share/applications
+ install -o root -g root -m 644 $(CURDIR)/debian/qbrowser.desktop $(CURDIR)/debian/tmp/usr/share/applications
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install --sourcedir=debian/tmp
+ # Mime info
+ install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mime/packages
+ install -o root -g root -m 644 $(CURDIR)/debian/qgis.xml $(CURDIR)/debian/tmp/usr/share/mime/packages
+
+ install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mimelnk/application
+ install -o root -g root -m 644 $(CURDIR)/debian/mime/application/* $(CURDIR)/debian/tmp/usr/share/mimelnk/application
+ # qgis binaries
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin
+ $(RM) -f $(CURDIR)/debian/tmp/usr/bin/qgis
+ $(RM) -f $(CURDIR)/debian/tmp/usr/bin/qbrowser
+
+ # qgis binary wrappers
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
-
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"natty oneiric"))
- dh_sip
-endif
-ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid quantal raring"))
- dh_python2 --no-guessing-versions
-else
- dh_pycentral
-endif
- dh_installmenu
- dh_icons
+
+override_dh_install:
+ dh_install --autodest --list-missing
+
+override_dh_installchangelogs:
+ dh_installchangelogs ChangeLog
+
+override_dh_installman:
dh_installman -pqgis qgis.1 qbrowser.1
+
+override_dh_installmime:
dh_installmime -pqgis
- dh_link
- # create lintian overrides file
- echo "libqgis$(QGIS_ABI): embedded-library usr/lib/libqgis_core.so.$(QGIS_ABI): sqlite" \
- >$(CURDIR)/debian/libqgis$(QGIS_ABI).lintian-overrides
- if which dh_lintian >/dev/null; then dh_lintian; fi
- dh_strip
+
+override_dh_python2:
+ dh_python2 --no-guessing-versions
+
+override_dh_compress:
dh_compress --exclude=pdf
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
+
+override_dh_shlibdeps:
dh_shlibdeps -l/usr/lib/$(GRASS)/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install debian/control cleantemplates templateclean
--
The Quantum GIS in Debian project
More information about the Pkg-grass-devel
mailing list