Skip to content

Commit 1aa4c1e

Browse files
jef-njef-n
committed
debian packaging update - also moved python console files and icons
1 parent eae523d commit 1aa4c1e

27 files changed

Lines changed: 49 additions & 41 deletions

‎debian/changelog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ qgis (1.9.0) UNRELEASED; urgency=low
1010
* disable PyQgsRectangle test on lucid (depends on unittest2)
1111
* add python-qscintilla2 dependency to python-qgis
1212
* add support for ubuntu quantal
13+
* remove js files and add libjs-jquery/libjs-underscore dependency
1314

1415
-- Jürgen E. Fischer <jef@norbit.de> Tue, 18 Sep 2012 22:18:25 +0200
1516

‎debian/control.lucid‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Package: python-qgis-common
138138
Section: python
139139
Architecture: all
140140
Provides: ${python:Provides}
141-
Depends: gdal-bin, python-gdal, ${python:Depends}
141+
Depends: gdal-bin, python-gdal, libjs-jquery, ${python:Depends}
142142
XB-Python-Version: ${python:Versions}
143143
Description: Python bindings to Quantum GIS - architecture-independent files
144144
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -191,6 +191,7 @@ Description: Quantum GIS sql anywhere plugin and provider
191191
Package: qgis-api-doc
192192
Architecture: all
193193
Section: doc
194+
Depends: libjs-jquery
194195
Description: Quantum GIS API documentation
195196
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
196197
and display databases of geographic information.

‎debian/control.precise‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Package: python-qgis-common
142142
Section: python
143143
Architecture: all
144144
Provides: ${python:Provides}
145-
Depends: gdal-bin, python-gdal, ${python:Depends}
145+
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${python:Depends}
146146
XB-Python-Version: ${python:Versions}
147147
Description: Python bindings to Quantum GIS - architecture-independent files
148148
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -195,6 +195,7 @@ Description: Quantum GIS sql anywhere plugin and provider
195195
Package: qgis-api-doc
196196
Architecture: all
197197
Section: doc
198+
Depends: libjs-jquery
198199
Description: Quantum GIS API documentation
199200
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
200201
and display databases of geographic information.

‎debian/control.quantal‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Package: python-qgis-common
142142
Section: python
143143
Architecture: all
144144
Provides: ${python:Provides}
145-
Depends: gdal-bin, python-gdal, ${python:Depends}
145+
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${python:Depends}
146146
XB-Python-Version: ${python:Versions}
147147
Description: Python bindings to Quantum GIS - architecture-independent files
148148
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -195,6 +195,7 @@ Description: Quantum GIS sql anywhere plugin and provider
195195
Package: qgis-api-doc
196196
Architecture: all
197197
Section: doc
198+
Depends: libjs-jquery
198199
Description: Quantum GIS API documentation
199200
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
200201
and display databases of geographic information.

‎debian/control.sid‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Package: python-qgis-common
141141
Section: python
142142
Architecture: all
143143
Provides: ${python:Provides}
144-
Depends: gdal-bin, python-gdal, ${misc:Depends}
144+
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${misc:Depends}
145145
Description: Python bindings to Quantum GIS - architecture-independent files
146146
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
147147
and display databases of geographic information.
@@ -194,6 +194,7 @@ Description: Quantum GIS sql anywhere plugin and provider
194194
Package: qgis-api-doc
195195
Architecture: all
196196
Section: doc
197+
Depends: libjs-jquery
197198
Description: Quantum GIS API documentation
198199
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
199200
and display databases of geographic information.

‎debian/control.squeeze‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Package: python-qgis-common
139139
Section: python
140140
Architecture: all
141141
Provides: ${python:Provides}
142-
Depends: gdal-bin, python-gdal, ${python:Depends}
142+
Depends: gdal-bin, python-gdal, libjs-jquery, ${python:Depends}
143143
XB-Python-Version: ${python:Versions}
144144
Description: Python bindings to Quantum GIS - architecture-independent files
145145
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -192,6 +192,7 @@ Description: Quantum GIS sql anywhere plugin and provider
192192
Package: qgis-api-doc
193193
Architecture: all
194194
Section: doc
195+
Depends: libjs-jquery
195196
Description: Quantum GIS API documentation
196197
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
197198
and display databases of geographic information.

‎debian/control.wheezy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Package: python-qgis-common
142142
Section: python
143143
Architecture: all
144144
Provides: ${python:Provides}
145-
Depends: gdal-bin, python-gdal, ${misc:Depends}
145+
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${misc:Depends}
146146
Description: Python bindings to Quantum GIS - architecture-independent files
147147
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
148148
and display databases of geographic information.
@@ -195,6 +195,7 @@ Description: Quantum GIS sql anywhere plugin and provider
195195
Package: qgis-api-doc
196196
Architecture: all
197197
Section: doc
198+
Depends: libjs-jquery
198199
Description: Quantum GIS API documentation
199200
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
200201
and display databases of geographic information.

‎debian/rules‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,12 @@ install: build
171171

172172
# remove unwanted files
173173
! [ -f debian/tmp/usr/share/qgis/doc/api/installdox ] || rm debian/tmp/usr/share/qgis/doc/api/installdox
174-
! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || rm debian/tmp/usr/share/qgis/doc/api/jquery.js
174+
! [ -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
175+
! [ -f debian/tmp/usr/share/qgis/python/plugins/sextante/help/_static/jquery.js ] || ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/qgis/python/plugins/sextante/help/_static/jquery.js
176+
! [ -f debian/tmp/usr/share/qgis/python/helpConsole/js/jquery-1.8.2.min.js ] || ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/qgis/python/helpConsole/js/jquery-1.8.2.min.js
177+
ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
178+
! [ -f debian/tmp/usr/share/qgis/python/plugins/sextante/help/_static/underscore.js ] || ln -sf /usr/share/javascript/underscore/underscore.js debian/tmp/usr/share/qgis/python/plugins/sextante/help/_static/underscore.js
179+
endif
175180

176181
# Install menu pixmap
177182
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps

python/iconConsole/iconClassConsole.png renamed to images/console/iconClassConsole.png

File renamed without changes.

python/iconConsole/iconClearConsole.png renamed to images/console/iconClearConsole.png

File renamed without changes.

0 commit comments

Comments
 (0)