Skip to content

Commit 7e815ca

Browse files
jef-njef-n
committed
debian packaging update with workaround for debian #755491
1 parent fd0ad49 commit 7e815ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+7174
-11
lines changed

‎debian/control‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,17 +257,19 @@ Description: collection of data providers to QGIS - architecture-independent fil
257257
.
258258
This package contains architecture-independent files for the QGIS providers.
259259

260-
Package: qgis-mapserver
260+
Package: qgis-server
261261
Architecture: any
262+
Replaces: qgis-mapserver
263+
Provides: qgis-mapserver
262264
Depends:
263265
qgis-providers (= ${binary:Version}),
264266
${shlibs:Depends},
265267
${misc:Depends}
266-
Description: QGIS mapserver
268+
Description: QGIS server
267269
QGIS is a Geographic Information System (GIS) which manages, analyzes and
268270
display databases of geographic information.
269271
.
270-
This package contains the QGIS mapserver.
272+
This package contains the QGIS server.
271273

272274
Package: libqgis-customwidgets{QGIS_ABI}
273275
Architecture: any

‎debian/control.in‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,10 @@ Description: collection of data providers to QGIS - architecture-independent fil
313313
.
314314
This package contains architecture-independent files for the QGIS providers.
315315

316-
Package: qgis-mapserver
316+
Package: qgis-server
317317
Architecture: any
318+
Provides: qgis-mapserver
319+
Replaces: qgis-mapserver
318320
Depends:
319321
qgis-providers (= ${binary:Version}),
320322
${shlibs:Depends},
@@ -323,7 +325,7 @@ Description: QGIS mapserver
323325
QGIS is a Geographic Information System (GIS) which manages, analyzes and
324326
display databases of geographic information.
325327
.
326-
This package contains the QGIS mapserver.
328+
This package contains the QGIS server.
327329

328330
Package: libqgis-customwidgets{QGIS_ABI}
329331
Architecture: any

‎debian/qgis-mapserver.install‎ renamed to ‎debian/qgis-server.install‎

File renamed without changes.

‎debian/rules‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ CMAKE_OPTS := \
6262
-DWITH_INTERNAL_PYGMENTS=FALSE \
6363
-DWITH_INTERNAL_DATEUTIL=FALSE \
6464
-DWITH_INTERNAL_PYTZ=FALSE \
65-
-DWITH_INTERNAL_SIX=FALSE
65+
-DWITH_INTERNAL_SIX=FALSE \
66+
-DWITH_INTERNAL_QSCINTILLA2_SIPS=TRUE
6667

6768
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
6869
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

‎python/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ INCLUDE_DIRECTORIES(
144144
FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
145145
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
146146
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
147+
IF(WITH_INTERNAL_QSCINTILLA2_SIPS)
148+
SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${CMAKE_SOURCE_DIR}/ext-libs/python-qscintilla2)
149+
ENDIF(WITH_INTERNAL_QSCINTILLA2_SIPS)
147150

148151
IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
149152
SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})

‎python/ext-libs/python-qscintilla2/Qsci/qsciabstractapis.sip‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// This is the SIP interface definition for QsciAbstractAPIs.
2+
//
3+
// Copyright (c) 2014 Riverbank Computing Limited <info@riverbankcomputing.com>
4+
//
5+
// This file is part of QScintilla.
6+
//
7+
// This file may be used under the terms of the GNU General Public
8+
// License versions 2.0 or 3.0 as published by the Free Software
9+
// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
10+
// included in the packaging of this file. Alternatively you may (at
11+
// your option) use any later version of the GNU General Public
12+
// License if such license has been publicly approved by Riverbank
13+
// Computing Limited (or its successors, if any) and the KDE Free Qt
14+
// Foundation. In addition, as a special exception, Riverbank gives you
15+
// certain additional rights. These rights are described in the Riverbank
16+
// GPL Exception version 1.1, which can be found in the file
17+
// GPL_EXCEPTION.txt in this package.
18+
//
19+
// If you are unsure which license is appropriate for your use, please
20+
// contact the sales department at sales@riverbankcomputing.com.
21+
//
22+
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
23+
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
25+
26+
class QsciAbstractAPIs : QObject
27+
{
28+
%TypeHeaderCode
29+
#include <Qsci/qsciabstractapis.h>
30+
%End
31+
32+
public:
33+
%If (Qsci_Qt4)
34+
QsciAbstractAPIs(QsciLexer *lexer /TransferThis/ = 0);
35+
%End
36+
%If (!Qsci_Qt4)
37+
QsciAbstractAPIs(QsciLexer *lexer /TransferThis/ = 0, const char *name = 0);
38+
%End
39+
40+
virtual ~QsciAbstractAPIs();
41+
42+
QsciLexer *lexer() const;
43+
44+
virtual void updateAutoCompletionList(const QStringList &context,
45+
QStringList &list) = 0;
46+
virtual void autoCompletionSelected(const QString &selection);
47+
48+
%If (Qsci_Qt4)
49+
virtual QStringList callTips(const QStringList &context, int commas,
50+
QsciScintilla::CallTipsStyle style, QList<int> &shifts) = 0;
51+
%End
52+
%If (!Qsci_Qt4)
53+
virtual QStringList callTips(const QStringList &context, int commas,
54+
QsciScintilla::CallTipsStyle style, QValueList<int> &shifts) = 0;
55+
%End
56+
57+
private:
58+
QsciAbstractAPIs(const QsciAbstractAPIs &);
59+
};

‎python/ext-libs/python-qscintilla2/Qsci/qsciapis.sip‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
// This is the SIP interface definition for QsciAPIs.
2+
//
3+
// Copyright (c) 2014 Riverbank Computing Limited <info@riverbankcomputing.com>
4+
//
5+
// This file is part of QScintilla.
6+
//
7+
// This file may be used under the terms of the GNU General Public
8+
// License versions 2.0 or 3.0 as published by the Free Software
9+
// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
10+
// included in the packaging of this file. Alternatively you may (at
11+
// your option) use any later version of the GNU General Public
12+
// License if such license has been publicly approved by Riverbank
13+
// Computing Limited (or its successors, if any) and the KDE Free Qt
14+
// Foundation. In addition, as a special exception, Riverbank gives you
15+
// certain additional rights. These rights are described in the Riverbank
16+
// GPL Exception version 1.1, which can be found in the file
17+
// GPL_EXCEPTION.txt in this package.
18+
//
19+
// If you are unsure which license is appropriate for your use, please
20+
// contact the sales department at sales@riverbankcomputing.com.
21+
//
22+
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
23+
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
25+
26+
class QsciAPIs : QsciAbstractAPIs
27+
{
28+
%TypeHeaderCode
29+
#include <Qsci/qsciapis.h>
30+
%End
31+
32+
public:
33+
%If (Qsci_Qt4)
34+
QsciAPIs(QsciLexer *lexer /TransferThis/ = 0);
35+
%End
36+
%If (!Qsci_Qt4)
37+
QsciAPIs(QsciLexer *lexer /TransferThis/ = 0, const char *name = 0);
38+
%End
39+
40+
virtual ~QsciAPIs();
41+
42+
void add(const QString &entry);
43+
void clear();
44+
bool load(const QString &fname);
45+
void remove(const QString &entry);
46+
void prepare();
47+
void cancelPreparation();
48+
QString defaultPreparedName() const;
49+
bool isPrepared(const QString &filename = QString()) const;
50+
bool loadPrepared(const QString &filename = QString());
51+
bool savePrepared(const QString &filename = QString()) const;
52+
virtual bool event(QEvent *e);
53+
QStringList installedAPIFiles() const;
54+
55+
virtual void updateAutoCompletionList(const QStringList &context,
56+
QStringList &list);
57+
virtual void autoCompletionSelected(const QString &selection);
58+
59+
%If (Qsci_Qt4)
60+
virtual QStringList callTips(const QStringList &context, int commas,
61+
QsciScintilla::CallTipsStyle style, QList<int> &shifts);
62+
%End
63+
%If (!Qsci_Qt4)
64+
virtual QStringList callTips(const QStringList &context, int commas,
65+
QsciScintilla::CallTipsStyle style, QValueList<int> &shifts);
66+
%End
67+
68+
signals:
69+
void apiPreparationCancelled();
70+
void apiPreparationStarted();
71+
void apiPreparationFinished();
72+
73+
private:
74+
QsciAPIs(const QsciAPIs &);
75+
};

‎python/ext-libs/python-qscintilla2/Qsci/qscicommand.sip‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
// This is the SIP interface definition for QsciCommand.
2+
//
3+
// Copyright (c) 2014 Riverbank Computing Limited <info@riverbankcomputing.com>
4+
//
5+
// This file is part of QScintilla.
6+
//
7+
// This file may be used under the terms of the GNU General Public
8+
// License versions 2.0 or 3.0 as published by the Free Software
9+
// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
10+
// included in the packaging of this file. Alternatively you may (at
11+
// your option) use any later version of the GNU General Public
12+
// License if such license has been publicly approved by Riverbank
13+
// Computing Limited (or its successors, if any) and the KDE Free Qt
14+
// Foundation. In addition, as a special exception, Riverbank gives you
15+
// certain additional rights. These rights are described in the Riverbank
16+
// GPL Exception version 1.1, which can be found in the file
17+
// GPL_EXCEPTION.txt in this package.
18+
//
19+
// If you are unsure which license is appropriate for your use, please
20+
// contact the sales department at sales@riverbankcomputing.com.
21+
//
22+
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
23+
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
25+
26+
class QsciCommand
27+
{
28+
%TypeHeaderCode
29+
#include <Qsci/qscicommand.h>
30+
%End
31+
32+
public:
33+
enum Command {
34+
LineDown,
35+
LineDownExtend,
36+
LineDownRectExtend,
37+
LineScrollDown,
38+
LineUp,
39+
LineUpExtend,
40+
LineUpRectExtend,
41+
LineScrollUp,
42+
ScrollToStart,
43+
ScrollToEnd,
44+
VerticalCentreCaret,
45+
ParaDown,
46+
ParaDownExtend,
47+
ParaUp,
48+
ParaUpExtend,
49+
CharLeft,
50+
CharLeftExtend,
51+
CharLeftRectExtend,
52+
CharRight,
53+
CharRightExtend,
54+
CharRightRectExtend,
55+
WordLeft,
56+
WordLeftExtend,
57+
WordRight,
58+
WordRightExtend,
59+
WordLeftEnd,
60+
WordLeftEndExtend,
61+
WordRightEnd,
62+
WordRightEndExtend,
63+
WordPartLeft,
64+
WordPartLeftExtend,
65+
WordPartRight,
66+
WordPartRightExtend,
67+
Home,
68+
HomeExtend,
69+
HomeRectExtend,
70+
HomeDisplay,
71+
HomeDisplayExtend,
72+
HomeWrap,
73+
HomeWrapExtend,
74+
VCHome,
75+
VCHomeExtend,
76+
VCHomeRectExtend,
77+
VCHomeWrap,
78+
VCHomeWrapExtend,
79+
LineEnd,
80+
LineEndExtend,
81+
LineEndRectExtend,
82+
LineEndDisplay,
83+
LineEndDisplayExtend,
84+
LineEndWrap,
85+
LineEndWrapExtend,
86+
DocumentStart,
87+
DocumentStartExtend,
88+
DocumentEnd,
89+
DocumentEndExtend,
90+
PageUp,
91+
PageUpExtend,
92+
PageUpRectExtend,
93+
PageDown,
94+
PageDownExtend,
95+
PageDownRectExtend,
96+
StutteredPageUp,
97+
StutteredPageUpExtend,
98+
StutteredPageDown,
99+
StutteredPageDownExtend,
100+
Delete,
101+
DeleteBack,
102+
DeleteBackNotLine,
103+
DeleteWordLeft,
104+
DeleteWordRight,
105+
DeleteWordRightEnd,
106+
DeleteLineLeft,
107+
DeleteLineRight,
108+
LineDelete,
109+
LineCut,
110+
LineCopy,
111+
LineTranspose,
112+
LineDuplicate,
113+
SelectAll,
114+
MoveSelectedLinesUp,
115+
MoveSelectedLinesDown,
116+
SelectionDuplicate,
117+
SelectionLowerCase,
118+
SelectionUpperCase,
119+
SelectionCut,
120+
SelectionCopy,
121+
Paste,
122+
EditToggleOvertype,
123+
Newline,
124+
Formfeed,
125+
Tab,
126+
Backtab,
127+
Cancel,
128+
Undo,
129+
Redo,
130+
ZoomIn,
131+
ZoomOut,
132+
};
133+
134+
Command command() const;
135+
void execute();
136+
void setKey(int key);
137+
void setAlternateKey(int altkey);
138+
int key() const;
139+
int alternateKey() const;
140+
static bool validKey(int key);
141+
QString description() const;
142+
143+
private:
144+
QsciCommand(QsciScintilla *qs, Command cmd, int key, int altkey,
145+
const char *desc);
146+
QsciCommand(const QsciCommand &);
147+
};

0 commit comments

Comments
 (0)