Skip to content

Commit

Permalink
debian packaging fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed May 24, 2011
1 parent f88f721 commit 28ad8f2
Show file tree
Hide file tree
Showing 61 changed files with 218 additions and 195 deletions.
4 changes: 2 additions & 2 deletions debian/control.hardy
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -104,7 +104,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
4 changes: 2 additions & 2 deletions debian/control.intrepid
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
4 changes: 2 additions & 2 deletions debian/control.jaunty
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
4 changes: 2 additions & 2 deletions debian/control.karmic
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
4 changes: 2 additions & 2 deletions debian/control.lenny
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -135,7 +135,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand Down
4 changes: 2 additions & 2 deletions debian/control.lucid
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -136,7 +136,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand Down
4 changes: 2 additions & 2 deletions debian/control.maverick
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand Down
4 changes: 2 additions & 2 deletions debian/control.natty
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand Down
4 changes: 2 additions & 2 deletions debian/control.sid
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand Down
4 changes: 2 additions & 2 deletions debian/control.squeeze
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -136,7 +136,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand Down
1 change: 1 addition & 0 deletions debian/python-qgis.lintian-overrides.in
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
python-qgis: package-name-doesnt-match-sonames
python-qgis: no-symbols-control-file
1 change: 0 additions & 1 deletion debian/qgis-plugin-grass.lintian-overrides
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
qgis-plugin-grass: binary-without-manpage
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
2 changes: 2 additions & 0 deletions debian/qgis-sqlanywhere{QGIS_ABI}.lintian-overrides
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
qgis-sqlanywhere{QGIS_ABI}: package-name-doesnt-match-sonames
qgis-sqlanywhere{QGIS_ABI}: no-symbols-control-file
6 changes: 5 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ endif
# Add here commands to install the package into debian/tmp.
$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp

# remove unwanted files
rm debian/tmp/usr/share/qgis/doc/api/installdox
rm debian/tmp/usr/share/qgis/doc/api/jquery.js

# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
Expand Down Expand Up @@ -162,7 +166,7 @@ binary-arch: build install
ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
dh_desktop
endif
dh_installman -pqgis qgis.1
dh_installman -pqgis qgis.1 qbrowser.1
dh_installmime -pqgis
dh_link
if which dh_lintian >/dev/null; then dh_lintian; fi
Expand Down
8 changes: 4 additions & 4 deletions i18n/qgis_af.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7152,7 +7152,7 @@ This binary was compiled against Qt %1,and is currently running against Qt %2</s
</message>
<message>
<location filename="../src/app/qgisapp.cpp" line="2050"/>
<source>Removed ogr convertor plugin - use &apos;save as&apos; context menu rather.</source>
<source>Removed ogr converter plugin - use &apos;save as&apos; context menu rather.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -8743,7 +8743,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../src/ui/qgsattributetypeedit.ui" line="150"/>
<source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -28990,7 +28990,7 @@ Overwrite?</source>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="100"/>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows to move the map content within a map frame.</source>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -30554,7 +30554,7 @@ Should the existing classes be deleted before classification?</source>
</message>
<message>
<location filename="../src/ui/qgsvectorlayersaveasdialogbase.ui" line="139"/>
<source>This allows to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<source>This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
8 changes: 4 additions & 4 deletions i18n/qgis_ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7924,7 +7924,7 @@ QWT Version: %1.</source>
</message>
<message>
<location filename="../src/app/qgisapp.cpp" line="2050"/>
<source>Removed ogr convertor plugin - use &apos;save as&apos; context menu rather.</source>
<source>Removed ogr converter plugin - use &apos;save as&apos; context menu rather.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -9233,7 +9233,7 @@ Error was:%2</source>
</message>
<message>
<location filename="../src/ui/qgsattributetypeedit.ui" line="150"/>
<source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -29505,7 +29505,7 @@ Overwrite?</source>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="100"/>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows to move the map content within a map frame.</source>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -31117,7 +31117,7 @@ Should the existing classes be deleted before classification?</source>
</message>
<message>
<location filename="../src/ui/qgsvectorlayersaveasdialogbase.ui" line="139"/>
<source>This allows to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<source>This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
8 changes: 4 additions & 4 deletions i18n/qgis_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8647,7 +8647,7 @@ This copy of QGIS writes debugging output.</source>
</message>
<message>
<location filename="../src/app/qgisapp.cpp" line="2050"/>
<source>Removed ogr convertor plugin - use &apos;save as&apos; context menu rather.</source>
<source>Removed ogr converter plugin - use &apos;save as&apos; context menu rather.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -10390,7 +10390,7 @@ Error was:%2</source>
</message>
<message>
<location filename="../src/ui/qgsattributetypeedit.ui" line="150"/>
<source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -30633,7 +30633,7 @@ Overwrite?</source>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="100"/>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows to move the map content within a map frame.</source>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -32197,7 +32197,7 @@ Should the existing classes be deleted before classification?</source>
</message>
<message>
<location filename="../src/ui/qgsvectorlayersaveasdialogbase.ui" line="139"/>
<source>This allows to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<source>This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
Loading

0 comments on commit 28ad8f2

Please sign in to comment.