Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Sep 14, 2012 · 76badc7 · 76badc7
2 parents db59e1b + 3a4d5e0
commit 76badc7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -6,8 +6,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
   * symbology-ng-style now in sqlite3
   * include cpt-city files
   * support DEB_BUILD_OPTIONS' parallel=n
+  * add python-unittest2 build dependency for lucid, maverick and squeeze
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 08 Sep 2012 12:59:40 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 14 Sep 2012 16:53:29 +0200
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -29,6 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
+ python-unittest2,
  git-core,
  doxygen,
  graphviz,

diff --git a/debian/control.maverick b/debian/control.maverick
@@ -30,6 +30,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
+ python-unittest2,
  git,
  doxygen,
  graphviz,

diff --git a/debian/control.squeeze b/debian/control.squeeze
@@ -29,6 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
+ python-unittest2,
  git,
  doxygen,
  graphviz,