Skip to content

Commit 23a1822

Browse files
jef-njef-n
committed
debian and osgeo4w packaging update: include qbrowser
1 parent 4549d0e commit 23a1822

17 files changed

+22
-1
lines changed

‎debian/changelog

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
qgis (1.8.0) UNRELEASED; urgency=low
22

33
* new development version 1.8 after branch
4+
* add qgis browser (qbrowser)
45

5-
-- Jürgen E. Fischer <jef@norbit.de> Sat, 07 May 2011 00:47:20 +0200
6+
-- Jürgen E. Fischer <jef@norbit.de> Mon, 23 May 2011 18:08:18 +0200
67

78
qgis (1.7.0) UNRELEASED; urgency=low
89

‎debian/control.intrepid

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
148148

149149
Package: qgis-api-doc
150150
Architecture: all
151+
Section: doc
151152
Description: Quantum GIS API documentation
152153
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
153154
and display databases of geographic information.

‎debian/control.jaunty

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
148148

149149
Package: qgis-api-doc
150150
Architecture: all
151+
Section: doc
151152
Description: Quantum GIS API documentation
152153
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
153154
and display databases of geographic information.

‎debian/control.karmic

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
148148

149149
Package: qgis-api-doc
150150
Architecture: all
151+
Section: doc
151152
Description: Quantum GIS API documentation
152153
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
153154
and display databases of geographic information.

‎debian/control.lenny

+1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ Description: Quantum GIS sql anywhere plugin and provider
186186

187187
Package: qgis-api-doc
188188
Architecture: all
189+
Section: doc
189190
Description: Quantum GIS API documentation
190191
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
191192
and display databases of geographic information.

‎debian/control.lucid

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider
187187

188188
Package: qgis-api-doc
189189
Architecture: all
190+
Section: doc
190191
Description: Quantum GIS API documentation
191192
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
192193
and display databases of geographic information.

‎debian/control.maverick

+1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
188188

189189
Package: qgis-api-doc
190190
Architecture: all
191+
Section: doc
191192
Description: Quantum GIS API documentation
192193
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
193194
and display databases of geographic information.

‎debian/control.natty

+1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
188188

189189
Package: qgis-api-doc
190190
Architecture: all
191+
Section: doc
191192
Description: Quantum GIS API documentation
192193
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
193194
and display databases of geographic information.

‎debian/control.sid

+1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
188188

189189
Package: qgis-api-doc
190190
Architecture: all
191+
Section: doc
191192
Description: Quantum GIS API documentation
192193
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
193194
and display databases of geographic information.

‎debian/control.squeeze

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider
187187

188188
Package: qgis-api-doc
189189
Architecture: all
190+
Section: doc
190191
Description: Quantum GIS API documentation
191192
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
192193
and display databases of geographic information.

‎debian/qgis-plugin-grass.postrm

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -e
44

55
if [ "$1" = "remove" ]; then
66
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
7+
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
78
fi
89

910
#DEBHELPER#

‎debian/qgis-plugin-grass.preinst

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -e
44

55
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
66
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
7+
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
78
fi
89

910
#DEBHELPER#

‎debian/rules

+2
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,11 @@ binary-arch: build install
150150

151151
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
152152
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
153+
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin
153154

154155
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
155156
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
157+
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
156158

157159
dh_pycentral
158160
dh_installmenu

‎ms-windows/osgeo4w/package-nightly.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ cd ..
137137
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
138138
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' preremove.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
139139
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
140+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' browser.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser.bat.tmpl
140141
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.reg.tmpl >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.reg.tmpl
141142

142143
REM sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl

‎ms-windows/osgeo4w/package.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ cd ..
136136
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' postinstall.bat >%OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
137137
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' preremove.bat >%OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
138138
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
139+
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' browser.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser.bat.tmpl
139140
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.reg.tmpl >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.reg.tmpl
140141

141142
REM sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl

‎ms-windows/osgeo4w/postinstall.bat

+2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ textreplace -std -t bin\@package@.bat
22

33
mkdir "%OSGEO4W_STARTMENU%"
44
xxmklink "%OSGEO4W_STARTMENU%\Quantum GIS (@version@).lnk" "%OSGEO4W_ROOT%\bin\@package@.bat" " " \ "Quantum GIS - Desktop GIS (@version@)" 1 "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
5+
xxmklink "%OSGEO4W_STARTMENU%\Quantum GIS Browser (@version@).lnk" "%OSGEO4W_ROOT%\bin\@package@-browser.bat" " " \ "Quantum GIS Browser (@version@)" 1 "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
56
xxmklink "%ALLUSERSPROFILE%\Desktop\Quantum GIS (@version@).lnk" "%OSGEO4W_ROOT%\bin\@package@.bat" " " \ "Quantum GIS - Desktop GIS (@version@)" 1 "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
7+
xxmklink "%ALLUSERSPROFILE%\Desktop\Quantum GIS Browser (@version@).lnk" "%OSGEO4W_ROOT%\bin\@package@-browser.bat" " " \ "Quantum GIS - Browser (@version@)" 1 "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
68

79
set O4W_ROOT=%OSGEO4W_ROOT%
810
set OSGEO4W_ROOT=%OSGEO4W_ROOT:\=\\%

‎ms-windows/osgeo4w/preremove.bat

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
del "%OSGEO4W_STARTMENU%\Quantum GIS (@version@).lnk"
2+
del "%OSGEO4W_STARTMENU%\Quantum GIS Browser (@version@).lnk"
23
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (@version@).lnk"
4+
del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Browser (@version@).lnk"
35
del "%OSGEO4W_ROOT%"\bin\@package@.bat
6+
del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat
47
del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py
58
del "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.reg

0 commit comments

Comments
 (0)