debian packaging update: merge downstream debian changes

qgis · Apr 6, 2014 · e9f43c4 · e9f43c4
1 parent 0305be7
commit e9f43c4
Show file tree

Hide file tree

Showing 79 changed files with 550 additions and 2,219 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -3,8 +3,10 @@ qgis (2.3.0) UNRELEASED; urgency=medium
   * New development version 2.3 after branch of 2.2
   * enable globe on jessie
   * add dependency on libqt4-sql-sqlite to qgis-provider
+  * merge debian packageing changes
+  * merge distribution specific file templates into one file template
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sun, 23 Feb 2014 11:36:30 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Sun, 06 Apr 2014 00:30:34 +0200
 
 qgis (2.2.0) unstable; urgency=medium
 

diff --git a/debian/compat.in b/debian/compat.in
@@ -0,0 +1,3 @@
+#sid jessie sid-oracle#9
+#wheezy quantal jessie#8
+#trusty saucy raring precise#7
diff --git a/debian/compat.jessie b/debian/compat.jessie
diff --git a/debian/compat.precise b/debian/compat.precise
diff --git a/debian/compat.quantal b/debian/compat.quantal
diff --git a/debian/compat.raring b/debian/compat.raring
diff --git a/debian/compat.saucy b/debian/compat.saucy
diff --git a/debian/compat.sid b/debian/compat.sid
diff --git a/debian/compat.trusty b/debian/compat.trusty
diff --git a/debian/compat.wheezy b/debian/compat.wheezy
diff --git a/debian/control b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  grass-dev,
  libexpat1-dev,
  libfcgi-dev,
- libgdal1-dev,
+ libgdal1-dev | libgdal-dev,
  libgeos-dev (>= 3.0.0),
  libgsl0-dev,
  libpq-dev,