[QGIS Commit] r10721 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-05-04 07:27:38 -0400 (Mon, 04 May 2009)
New Revision: 10721

Added:
   trunk/qgis/debian/libqgis1.2.0-dev.README.Debian
   trunk/qgis/debian/libqgis1.2.0-dev.install
   trunk/qgis/debian/libqgis1.2.0.install
Removed:
   trunk/qgis/debian/libqgis1.1.0-dev.README.Debian
   trunk/qgis/debian/libqgis1.1.0-dev.install
   trunk/qgis/debian/libqgis1.1.0.install
Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control
   trunk/qgis/debian/python-qgis.install
Log:
debian packaging update for 1.2.0



Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2009-05-04 10:29:07 UTC (rev 10720)
+++ trunk/qgis/debian/changelog	2009-05-04 11:27:38 UTC (rev 10721)
@@ -1,3 +1,9 @@
+qgis (1.2.0) UNRELEASED; urgency=low
+
+  * new development version after 1.1 branch
+
+ -- Juergen E. Fischer <jef at norbit.de>  Sun, 03 May 2009 22:52:09 +0200
+
 qgis (1.1.0-5) UNRELEASED; urgency=low
 
   * rename {qgis,qgis_help}.man to {qgis,qgis_help}.1

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2009-05-04 10:29:07 UTC (rev 10720)
+++ trunk/qgis/debian/control	2009-05-04 11:27:38 UTC (rev 10721)
@@ -9,7 +9,7 @@
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev
-Build-Conflicts: libqgis1.1.0-dev
+Build-Conflicts: libqgis1.2.0-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -39,7 +39,7 @@
  This package contains architecture-independent supporting data files for use 
  with Quantum GIS.
 
-Package: libqgis1.1.0
+Package: libqgis1.2.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
@@ -50,10 +50,10 @@
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis1.1.0-dev
+Package: libqgis1.2.0-dev
 Architecture: any
 Section: libdevel
-Depends: libqgis1.1.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
+Depends: libqgis1.2.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
  libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1), grass-dev,
  libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),

Deleted: trunk/qgis/debian/libqgis1.1.0-dev.README.Debian
===================================================================
--- trunk/qgis/debian/libqgis1.1.0-dev.README.Debian	2009-05-04 10:29:07 UTC (rev 10720)
+++ trunk/qgis/debian/libqgis1.1.0-dev.README.Debian	2009-05-04 11:27:38 UTC (rev 10721)
@@ -1,8 +0,0 @@
-QGIS for Debian
----------------
- 
-Before building a QGIS plugin you'll need to tell it where to look for Qt:
-
-  export QTDIR=/usr/share/qt3
- 
- -- Steve Halasz <debian at adkgis.org>  Thu, 14 Apr 2005 11:03:20 -0400

Deleted: trunk/qgis/debian/libqgis1.1.0-dev.install
===================================================================
--- trunk/qgis/debian/libqgis1.1.0-dev.install	2009-05-04 10:29:07 UTC (rev 10720)
+++ trunk/qgis/debian/libqgis1.1.0-dev.install	2009-05-04 11:27:38 UTC (rev 10721)
@@ -1,3 +0,0 @@
-usr/include/qgis/*
-usr/lib/libqgis_gui.so
-usr/lib/libqgis_core.so

Deleted: trunk/qgis/debian/libqgis1.1.0.install
===================================================================
--- trunk/qgis/debian/libqgis1.1.0.install	2009-05-04 10:29:07 UTC (rev 10720)
+++ trunk/qgis/debian/libqgis1.1.0.install	2009-05-04 11:27:38 UTC (rev 10721)
@@ -1,2 +0,0 @@
-usr/lib/libqgis_core.so.*
-usr/lib/libqgis_gui.so.*

Copied: trunk/qgis/debian/libqgis1.2.0-dev.README.Debian (from rev 10711, trunk/qgis/debian/libqgis1.1.0-dev.README.Debian)
===================================================================
--- trunk/qgis/debian/libqgis1.2.0-dev.README.Debian	                        (rev 0)
+++ trunk/qgis/debian/libqgis1.2.0-dev.README.Debian	2009-05-04 11:27:38 UTC (rev 10721)
@@ -0,0 +1,8 @@
+QGIS for Debian
+---------------
+ 
+Before building a QGIS plugin you'll need to tell it where to look for Qt:
+
+  export QTDIR=/usr/share/qt3
+ 
+ -- Steve Halasz <debian at adkgis.org>  Thu, 14 Apr 2005 11:03:20 -0400

Copied: trunk/qgis/debian/libqgis1.2.0-dev.install (from rev 10711, trunk/qgis/debian/libqgis1.1.0-dev.install)
===================================================================
--- trunk/qgis/debian/libqgis1.2.0-dev.install	                        (rev 0)
+++ trunk/qgis/debian/libqgis1.2.0-dev.install	2009-05-04 11:27:38 UTC (rev 10721)
@@ -0,0 +1,3 @@
+usr/include/qgis/*
+usr/lib/libqgis_gui.so
+usr/lib/libqgis_core.so

Copied: trunk/qgis/debian/libqgis1.2.0.install (from rev 10711, trunk/qgis/debian/libqgis1.1.0.install)
===================================================================
--- trunk/qgis/debian/libqgis1.2.0.install	                        (rev 0)
+++ trunk/qgis/debian/libqgis1.2.0.install	2009-05-04 11:27:38 UTC (rev 10721)
@@ -0,0 +1,2 @@
+usr/lib/libqgis_core.so.*
+usr/lib/libqgis_gui.so.*

Modified: trunk/qgis/debian/python-qgis.install
===================================================================
--- trunk/qgis/debian/python-qgis.install	2009-05-04 10:29:07 UTC (rev 10720)
+++ trunk/qgis/debian/python-qgis.install	2009-05-04 11:27:38 UTC (rev 10721)
@@ -1,4 +1,4 @@
-usr/lib/python*/site-packages/qgis/__init__.py
-usr/lib/python*/site-packages/qgis/qgisconfig.py
-usr/lib/python*/site-packages/qgis/*.so
+usr/lib/python*/{dist,site}-packages/qgis/__init__.py
+usr/lib/python*/{dist,site}-packages/qgis/qgisconfig.py
+usr/lib/python*/{dist,site}-packages/qgis/*.so
 usr/lib/libqgispython.so*