Skip to content
Permalink
Browse files

debian packaging update - also moved python console files and icons

  • Loading branch information
jef-n committed Oct 5, 2012
1 parent eae523d commit 1aa4c1eb6356edf7d945623d7f1b246b3fbacd77
@@ -10,6 +10,7 @@ qgis (1.9.0) UNRELEASED; urgency=low
* disable PyQgsRectangle test on lucid (depends on unittest2)
* add python-qscintilla2 dependency to python-qgis
* add support for ubuntu quantal
* remove js files and add libjs-jquery/libjs-underscore dependency

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

@@ -138,7 +138,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, ${python:Depends}
Depends: gdal-bin, python-gdal, libjs-jquery, ${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
@@ -191,6 +191,7 @@ Description: Quantum GIS sql anywhere plugin and provider
Package: qgis-api-doc
Architecture: all
Section: doc
Depends: libjs-jquery
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -142,7 +142,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, ${python:Depends}
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${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
@@ -195,6 +195,7 @@ Description: Quantum GIS sql anywhere plugin and provider
Package: qgis-api-doc
Architecture: all
Section: doc
Depends: libjs-jquery
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -142,7 +142,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, ${python:Depends}
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${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
@@ -195,6 +195,7 @@ Description: Quantum GIS sql anywhere plugin and provider
Package: qgis-api-doc
Architecture: all
Section: doc
Depends: libjs-jquery
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -141,7 +141,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, ${misc:Depends}
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${misc:Depends}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -194,6 +194,7 @@ Description: Quantum GIS sql anywhere plugin and provider
Package: qgis-api-doc
Architecture: all
Section: doc
Depends: libjs-jquery
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -139,7 +139,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, ${python:Depends}
Depends: gdal-bin, python-gdal, libjs-jquery, ${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
@@ -192,6 +192,7 @@ Description: Quantum GIS sql anywhere plugin and provider
Package: qgis-api-doc
Architecture: all
Section: doc
Depends: libjs-jquery
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -142,7 +142,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, ${misc:Depends}
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${misc:Depends}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -195,6 +195,7 @@ Description: Quantum GIS sql anywhere plugin and provider
Package: qgis-api-doc
Architecture: all
Section: doc
Depends: libjs-jquery
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -171,7 +171,12 @@ install: build

# remove unwanted files
! [ -f debian/tmp/usr/share/qgis/doc/api/installdox ] || rm debian/tmp/usr/share/qgis/doc/api/installdox
! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || rm debian/tmp/usr/share/qgis/doc/api/jquery.js
! [ -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
! [ -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
! [ -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
ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
! [ -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
endif

# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -465,6 +465,17 @@
<file>themes/default/text.png</file>
<file>themes/default/histogram.png</file>
<file>themes/default/pie-chart.png</file>
<file>console/iconClassConsole.png</file>
<file>console/iconSaveConsole.png</file>
<file>console/iconHelpConsole.png</file>
<file>console/iconTempConsole.png</file>
<file>console/iconOpenConsole.png</file>
<file>console/iconClearConsole.png</file>
<file>console/imgHelpDialog.png</file>
<file>console/iconSextanteConsole.png</file>
<file>console/iconScriptConsole.png</file>
<file>console/iconIfaceConsole.png</file>
<file>console/iconRunConsole.png</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
@@ -136,12 +136,11 @@ IF(WITH_QSCIAPI)
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Generating pyqgis api file" VERBATIM)

INSTALL(FILES ${QGIS_PYTHON_API_FILE} DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/qsci_apis")
INSTALL(FILES ${QGIS_PYTHON_API_FILE} DESTINATION "${QGIS_DATA_DIR}/python/qsci_apis")
ENDIF(WITH_QSCIAPI)

ADD_CUSTOM_TARGET(compile_python_files ALL)

ADD_SUBDIRECTORY(iconConsole)
ADD_SUBDIRECTORY(helpConsole)

ADD_CUSTOM_COMMAND(TARGET compile_python_files
@@ -101,7 +101,7 @@ def __init__(self, parent=None):
self.clearButton = QAction(parent)
self.clearButton.setCheckable(False)
self.clearButton.setEnabled(True)
self.clearButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconClearConsole.png"))
self.clearButton.setIcon(QIcon( ":/images/console/iconClearConsole.png"))
self.clearButton.setMenuRole(QAction.PreferencesRole)
self.clearButton.setIconVisibleInMenu(True)
self.clearButton.setToolTip(clearBt)
@@ -118,7 +118,7 @@ def __init__(self, parent=None):
self.actionClass = QAction(parent)
self.actionClass.setCheckable(False)
self.actionClass.setEnabled(True)
self.actionClass.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconClassConsole.png"))
self.actionClass.setIcon(QIcon(":/images/console/iconClassConsole.png"))
self.actionClass.setMenuRole(QAction.PreferencesRole)
self.actionClass.setIconVisibleInMenu(True)
self.actionClass.setToolTip(actionClassBt)
@@ -128,7 +128,7 @@ def __init__(self, parent=None):
self.actionScript = QAction(parent)
self.actionScript.setCheckable(False)
self.actionScript.setEnabled(True)
self.actionScript.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconScriptConsole.png"))
self.actionScript.setIcon(QIcon(":/images/console/iconScriptConsole.png"))
self.actionScript.setMenuRole(QAction.PreferencesRole)
self.actionScript.setIconVisibleInMenu(True)
self.actionScript.setToolTip(actionScriptBt)
@@ -138,7 +138,7 @@ def __init__(self, parent=None):
self.loadSextanteButton = QAction(parent)
self.loadSextanteButton.setCheckable(False)
self.loadSextanteButton.setEnabled(True)
self.loadSextanteButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconSextanteConsole.png"))
self.loadSextanteButton.setIcon(QIcon(":/images/console/iconSextanteConsole.png"))
self.loadSextanteButton.setMenuRole(QAction.PreferencesRole)
self.loadSextanteButton.setIconVisibleInMenu(True)
self.loadSextanteButton.setToolTip(loadSextanteBt)
@@ -148,7 +148,7 @@ def __init__(self, parent=None):
self.loadIfaceButton = QAction(parent)
self.loadIfaceButton.setCheckable(False)
self.loadIfaceButton.setEnabled(True)
self.loadIfaceButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconIfaceConsole.png"))
self.loadIfaceButton.setIcon(QIcon(":/images/console/iconIfaceConsole.png"))
self.loadIfaceButton.setMenuRole(QAction.PreferencesRole)
self.loadIfaceButton.setIconVisibleInMenu(True)
self.loadIfaceButton.setToolTip(loadIfaceBt)
@@ -158,7 +158,7 @@ def __init__(self, parent=None):
self.openFileButton = QAction(parent)
self.openFileButton.setCheckable(False)
self.openFileButton.setEnabled(True)
self.openFileButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconOpenConsole.png"))
self.openFileButton.setIcon(QIcon(":/images/console/iconOpenConsole.png"))
self.openFileButton.setMenuRole(QAction.PreferencesRole)
self.openFileButton.setIconVisibleInMenu(True)
self.openFileButton.setToolTip(openFileBt)
@@ -168,7 +168,7 @@ def __init__(self, parent=None):
self.saveFileButton = QAction(parent)
self.saveFileButton.setCheckable(False)
self.saveFileButton.setEnabled(True)
self.saveFileButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconSaveConsole.png"))
self.saveFileButton.setIcon(QIcon(":/images/console/iconSaveConsole.png"))
self.saveFileButton.setMenuRole(QAction.PreferencesRole)
self.saveFileButton.setIconVisibleInMenu(True)
self.saveFileButton.setToolTip(saveFileBt)
@@ -178,7 +178,7 @@ def __init__(self, parent=None):
self.runButton = QAction(parent)
self.runButton.setCheckable(False)
self.runButton.setEnabled(True)
self.runButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconRunConsole.png"))
self.runButton.setIcon(QIcon(":/images/console/iconRunConsole.png"))
self.runButton.setMenuRole(QAction.PreferencesRole)
self.runButton.setIconVisibleInMenu(True)
self.runButton.setToolTip(runBt)
@@ -188,7 +188,7 @@ def __init__(self, parent=None):
self.helpButton = QAction(parent)
self.helpButton.setCheckable(False)
self.helpButton.setEnabled(True)
self.helpButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconHelpConsole.png"))
self.helpButton.setIcon(QIcon(":/images/console/iconHelpConsole.png"))
self.helpButton.setMenuRole(QAction.PreferencesRole)
self.helpButton.setIconVisibleInMenu(True)
self.helpButton.setToolTip(helpBt)
@@ -148,12 +148,13 @@ def commandConsole(self, command):
self.append('from sextante.core.Sextante import Sextante')
self.move_cursor_to_end()
elif command == "cLayer":
"""Retrive current Layer from map camvas"""
"""Retrieve current Layer from map camvas"""
self.append('cLayer = iface.mapCanvas().currentLayer()')
self.move_cursor_to_end()
self.setFocus()

def setLexers(self, lexer):
from qgis.core import QgsApplication
if lexer:
font = QFont()
font.setFamily('Mono') ## Courier New
@@ -174,7 +175,8 @@ def setLexers(self, lexer):
self.lexer.setFont(font, 3)
self.lexer.setFont(font, 4)
self.api = QsciAPIs(self.lexer)
self.api.loadPrepared(QString(os.path.dirname(os.path.dirname(__file__)) + "/qsci_apis/pyqgis_master.pap"))
self.api.loadPrepared( QgsApplication.pkgDataPath() + "/python/qsci_apis/pyqgis_master.pap" )

self.setLexer(self.lexer)

## TODO: show completion list for file and directory
@@ -57,7 +57,7 @@ def setupUi(self):
self.setLayout(self.verticalLayout)
jQueryPath = QgsApplication.pkgDataPath()
localeFullName = QSettings().value( "locale/userLocale", QVariant( "" ) ).toString()
filename = os.path.dirname(__file__) + "/helpConsole/help.htm? \
filename = QgsApplication.pkgDataPath() + "/python/helpConsole/help.htm? \
lang=" + localeFullName \
+ "&pkgDir=" + jQueryPath

@@ -2,6 +2,6 @@ FILE(GLOB HTML_FILES *.htm)
FILE(GLOB I18N_FILES i18n/*.properties)
FILE(GLOB JS_FILES js/*.js)

INSTALL(FILES ${HTML_FILES} DESTINATION ${QGIS_PYTHON_DIR}/helpConsole)
INSTALL(FILES ${I18N_FILES} DESTINATION ${QGIS_PYTHON_DIR}/helpConsole/i18n)
INSTALL(FILES ${JS_FILES} DESTINATION ${QGIS_PYTHON_DIR}/helpConsole/js)
INSTALL(FILES ${HTML_FILES} DESTINATION ${QGIS_DATA_DIR}/python/helpConsole)
INSTALL(FILES ${I18N_FILES} DESTINATION ${QGIS_DATA_DIR}/python/helpConsole/i18n)
INSTALL(FILES ${JS_FILES} DESTINATION ${QGIS_DATA_DIR}/python/helpConsole/js)

This file was deleted.

@@ -1,3 +1,3 @@
SET (QSCI_OUTPUT_DIR ${PYTHON_SITE_PACKAGES_DIR}/qsci_apis)
SET (QSCI_OUTPUT_DIR ${QGIS_DATA_DIR}/python/qsci_apis)
FILE(GLOB API_FILES *.pap *.api)
INSTALL(FILES ${API_FILES} DESTINATION ${QSCI_OUTPUT_DIR})

0 comments on commit 1aa4c1e

Please sign in to comment.
You can’t perform that action at this time.