Skip to content

Commit

Permalink
debian packaging update with workaround for debian #755491
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jul 21, 2014
1 parent fd0ad49 commit 7e815ca
Show file tree
Hide file tree
Showing 60 changed files with 7,174 additions and 11 deletions.
8 changes: 5 additions & 3 deletions debian/control
Expand Up @@ -257,17 +257,19 @@ Description: collection of data providers to QGIS - architecture-independent fil
.
This package contains architecture-independent files for the QGIS providers.

Package: qgis-mapserver
Package: qgis-server
Architecture: any
Replaces: qgis-mapserver
Provides: qgis-mapserver
Depends:
qgis-providers (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Description: QGIS mapserver
Description: QGIS server
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the QGIS mapserver.
This package contains the QGIS server.

Package: libqgis-customwidgets{QGIS_ABI}
Architecture: any
Expand Down
6 changes: 4 additions & 2 deletions debian/control.in
Expand Up @@ -313,8 +313,10 @@ Description: collection of data providers to QGIS - architecture-independent fil
.
This package contains architecture-independent files for the QGIS providers.

Package: qgis-mapserver
Package: qgis-server
Architecture: any
Provides: qgis-mapserver
Replaces: qgis-mapserver
Depends:
qgis-providers (= ${binary:Version}),
${shlibs:Depends},
Expand All @@ -323,7 +325,7 @@ Description: QGIS mapserver
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the QGIS mapserver.
This package contains the QGIS server.

Package: libqgis-customwidgets{QGIS_ABI}
Architecture: any
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion debian/rules
Expand Up @@ -62,7 +62,8 @@ CMAKE_OPTS := \
-DWITH_INTERNAL_PYGMENTS=FALSE \
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_SIX=FALSE
-DWITH_INTERNAL_SIX=FALSE \
-DWITH_INTERNAL_QSCINTILLA2_SIPS=TRUE

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
Expand Down
3 changes: 3 additions & 0 deletions python/CMakeLists.txt
Expand Up @@ -144,6 +144,9 @@ INCLUDE_DIRECTORIES(
FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
IF(WITH_INTERNAL_QSCINTILLA2_SIPS)
SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${CMAKE_SOURCE_DIR}/ext-libs/python-qscintilla2)
ENDIF(WITH_INTERNAL_QSCINTILLA2_SIPS)

IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})
Expand Down
59 changes: 59 additions & 0 deletions python/ext-libs/python-qscintilla2/Qsci/qsciabstractapis.sip
@@ -0,0 +1,59 @@
// This is the SIP interface definition for QsciAbstractAPIs.
//
// Copyright (c) 2014 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
// This file may be used under the terms of the GNU General Public
// License versions 2.0 or 3.0 as published by the Free Software
// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
// included in the packaging of this file. Alternatively you may (at
// your option) use any later version of the GNU General Public
// License if such license has been publicly approved by Riverbank
// Computing Limited (or its successors, if any) and the KDE Free Qt
// Foundation. In addition, as a special exception, Riverbank gives you
// certain additional rights. These rights are described in the Riverbank
// GPL Exception version 1.1, which can be found in the file
// GPL_EXCEPTION.txt in this package.
//
// If you are unsure which license is appropriate for your use, please
// contact the sales department at sales@riverbankcomputing.com.
//
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.


class QsciAbstractAPIs : QObject
{
%TypeHeaderCode
#include <Qsci/qsciabstractapis.h>
%End

public:
%If (Qsci_Qt4)
QsciAbstractAPIs(QsciLexer *lexer /TransferThis/ = 0);
%End
%If (!Qsci_Qt4)
QsciAbstractAPIs(QsciLexer *lexer /TransferThis/ = 0, const char *name = 0);
%End

virtual ~QsciAbstractAPIs();

QsciLexer *lexer() const;

virtual void updateAutoCompletionList(const QStringList &context,
QStringList &list) = 0;
virtual void autoCompletionSelected(const QString &selection);

%If (Qsci_Qt4)
virtual QStringList callTips(const QStringList &context, int commas,
QsciScintilla::CallTipsStyle style, QList<int> &shifts) = 0;
%End
%If (!Qsci_Qt4)
virtual QStringList callTips(const QStringList &context, int commas,
QsciScintilla::CallTipsStyle style, QValueList<int> &shifts) = 0;
%End

private:
QsciAbstractAPIs(const QsciAbstractAPIs &);
};
75 changes: 75 additions & 0 deletions python/ext-libs/python-qscintilla2/Qsci/qsciapis.sip
@@ -0,0 +1,75 @@
// This is the SIP interface definition for QsciAPIs.
//
// Copyright (c) 2014 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
// This file may be used under the terms of the GNU General Public
// License versions 2.0 or 3.0 as published by the Free Software
// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
// included in the packaging of this file. Alternatively you may (at
// your option) use any later version of the GNU General Public
// License if such license has been publicly approved by Riverbank
// Computing Limited (or its successors, if any) and the KDE Free Qt
// Foundation. In addition, as a special exception, Riverbank gives you
// certain additional rights. These rights are described in the Riverbank
// GPL Exception version 1.1, which can be found in the file
// GPL_EXCEPTION.txt in this package.
//
// If you are unsure which license is appropriate for your use, please
// contact the sales department at sales@riverbankcomputing.com.
//
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.


class QsciAPIs : QsciAbstractAPIs
{
%TypeHeaderCode
#include <Qsci/qsciapis.h>
%End

public:
%If (Qsci_Qt4)
QsciAPIs(QsciLexer *lexer /TransferThis/ = 0);
%End
%If (!Qsci_Qt4)
QsciAPIs(QsciLexer *lexer /TransferThis/ = 0, const char *name = 0);
%End

virtual ~QsciAPIs();

void add(const QString &entry);
void clear();
bool load(const QString &fname);
void remove(const QString &entry);
void prepare();
void cancelPreparation();
QString defaultPreparedName() const;
bool isPrepared(const QString &filename = QString()) const;
bool loadPrepared(const QString &filename = QString());
bool savePrepared(const QString &filename = QString()) const;
virtual bool event(QEvent *e);
QStringList installedAPIFiles() const;

virtual void updateAutoCompletionList(const QStringList &context,
QStringList &list);
virtual void autoCompletionSelected(const QString &selection);

%If (Qsci_Qt4)
virtual QStringList callTips(const QStringList &context, int commas,
QsciScintilla::CallTipsStyle style, QList<int> &shifts);
%End
%If (!Qsci_Qt4)
virtual QStringList callTips(const QStringList &context, int commas,
QsciScintilla::CallTipsStyle style, QValueList<int> &shifts);
%End

signals:
void apiPreparationCancelled();
void apiPreparationStarted();
void apiPreparationFinished();

private:
QsciAPIs(const QsciAPIs &);
};
147 changes: 147 additions & 0 deletions python/ext-libs/python-qscintilla2/Qsci/qscicommand.sip
@@ -0,0 +1,147 @@
// This is the SIP interface definition for QsciCommand.
//
// Copyright (c) 2014 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
// This file may be used under the terms of the GNU General Public
// License versions 2.0 or 3.0 as published by the Free Software
// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
// included in the packaging of this file. Alternatively you may (at
// your option) use any later version of the GNU General Public
// License if such license has been publicly approved by Riverbank
// Computing Limited (or its successors, if any) and the KDE Free Qt
// Foundation. In addition, as a special exception, Riverbank gives you
// certain additional rights. These rights are described in the Riverbank
// GPL Exception version 1.1, which can be found in the file
// GPL_EXCEPTION.txt in this package.
//
// If you are unsure which license is appropriate for your use, please
// contact the sales department at sales@riverbankcomputing.com.
//
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.


class QsciCommand
{
%TypeHeaderCode
#include <Qsci/qscicommand.h>
%End

public:
enum Command {
LineDown,
LineDownExtend,
LineDownRectExtend,
LineScrollDown,
LineUp,
LineUpExtend,
LineUpRectExtend,
LineScrollUp,
ScrollToStart,
ScrollToEnd,
VerticalCentreCaret,
ParaDown,
ParaDownExtend,
ParaUp,
ParaUpExtend,
CharLeft,
CharLeftExtend,
CharLeftRectExtend,
CharRight,
CharRightExtend,
CharRightRectExtend,
WordLeft,
WordLeftExtend,
WordRight,
WordRightExtend,
WordLeftEnd,
WordLeftEndExtend,
WordRightEnd,
WordRightEndExtend,
WordPartLeft,
WordPartLeftExtend,
WordPartRight,
WordPartRightExtend,
Home,
HomeExtend,
HomeRectExtend,
HomeDisplay,
HomeDisplayExtend,
HomeWrap,
HomeWrapExtend,
VCHome,
VCHomeExtend,
VCHomeRectExtend,
VCHomeWrap,
VCHomeWrapExtend,
LineEnd,
LineEndExtend,
LineEndRectExtend,
LineEndDisplay,
LineEndDisplayExtend,
LineEndWrap,
LineEndWrapExtend,
DocumentStart,
DocumentStartExtend,
DocumentEnd,
DocumentEndExtend,
PageUp,
PageUpExtend,
PageUpRectExtend,
PageDown,
PageDownExtend,
PageDownRectExtend,
StutteredPageUp,
StutteredPageUpExtend,
StutteredPageDown,
StutteredPageDownExtend,
Delete,
DeleteBack,
DeleteBackNotLine,
DeleteWordLeft,
DeleteWordRight,
DeleteWordRightEnd,
DeleteLineLeft,
DeleteLineRight,
LineDelete,
LineCut,
LineCopy,
LineTranspose,
LineDuplicate,
SelectAll,
MoveSelectedLinesUp,
MoveSelectedLinesDown,
SelectionDuplicate,
SelectionLowerCase,
SelectionUpperCase,
SelectionCut,
SelectionCopy,
Paste,
EditToggleOvertype,
Newline,
Formfeed,
Tab,
Backtab,
Cancel,
Undo,
Redo,
ZoomIn,
ZoomOut,
};

Command command() const;
void execute();
void setKey(int key);
void setAlternateKey(int altkey);
int key() const;
int alternateKey() const;
static bool validKey(int key);
QString description() const;

private:
QsciCommand(QsciScintilla *qs, Command cmd, int key, int altkey,
const char *desc);
QsciCommand(const QsciCommand &);
};

0 comments on commit 7e815ca

Please sign in to comment.