Skip to content

Commit e671351

Browse files
timlinuxtimlinux
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents 44ef220 + 8898e6b commit e671351

File tree

2,189 files changed

+87923
-226
lines changed

Some content is hidden

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

2,189 files changed

+87923
-226
lines changed

‎.project

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>sextante</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.python.pydev.PyDevBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.python.pydev.pythonNature</nature>
16+
</natures>
17+
</projectDescription>

‎.pydevproject

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?eclipse-pydev version="1.0"?>
3+
4+
<pydev_project>
5+
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
6+
<path>/sextante/src</path>
7+
</pydev_pathproperty>
8+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
9+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
10+
</pydev_project>

‎build.xml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<project name="SEXTANTE_LIB" default="copy" basedir=".">
2+
<description>
3+
SEXTANTE
4+
</description>
5+
<property name="version.number" value="1.0"/>
6+
<target name="copy"
7+
description="copy files">
8+
<copy todir="C:/Users/volaya/.qgis/python/plugins">
9+
<fileset dir="src" includes="**"/>
10+
</copy>
11+
</target>
12+
</project>

‎debian/changelog

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ qgis (1.9.0) UNRELEASED; urgency=low
66
* symbology-ng-style now in sqlite3
77
* include cpt-city files
88
* support DEB_BUILD_OPTIONS' parallel=n
9+
* add python-unittest2 build dependency for lucid, maverick and squeeze
10+
* add python-qscintilla2 dependency to python-qgis
911

10-
-- Jürgen E. Fischer <jef@norbit.de> Sat, 08 Sep 2012 12:59:40 +0200
12+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 15 Sep 2012 22:51:38 +0200
1113

1214
qgis (1.8.0) UNRELEASED; urgency=low
1315

‎debian/control.lucid

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Build-Depends:
2929
python-qt4-dev (>=4.1.0),
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
32+
python-unittest2,
3233
git-core,
3334
doxygen,
3435
graphviz,
@@ -125,7 +126,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
125126
Package: python-qgis
126127
Section: python
127128
Architecture: any
128-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
129+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
129130
Provides: ${python:Provides}
130131
XB-Python-Version: ${python:Versions}
131132
Description: Python bindings to Quantum GIS

‎debian/control.maverick

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Build-Depends:
3030
python-qt4-dev (>=4.1.0),
3131
python-sip (>= 4.5.0),
3232
python-sip-dev (>= 4.5.0),
33+
python-unittest2,
3334
git,
3435
doxygen,
3536
graphviz,
@@ -126,7 +127,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
126127
Package: python-qgis
127128
Section: python
128129
Architecture: any
129-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
130+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
130131
Provides: ${python:Provides}
131132
XB-Python-Version: ${python:Versions}
132133
Description: Python bindings to Quantum GIS

‎debian/control.natty

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
126126
Package: python-qgis
127127
Section: python
128128
Architecture: any
129-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
129+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
130130
Provides: ${python:Provides}
131131
XB-Python-Version: ${python:Versions}
132132
Description: Python bindings to Quantum GIS

‎debian/control.oneiric

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
126126
Package: python-qgis
127127
Section: python
128128
Architecture: any
129-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
129+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
130130
Provides: ${python:Provides}
131131
XB-Python-Version: ${python:Versions}
132132
Description: Python bindings to Quantum GIS

‎debian/control.precise

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
129129
Package: python-qgis
130130
Section: python
131131
Architecture: any
132-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
132+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
133133
Provides: ${python:Provides}
134134
XB-Python-Version: ${python:Versions}
135135
Description: Python bindings to Quantum GIS

‎debian/control.sid

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
130130
Package: python-qgis
131131
Section: python
132132
Architecture: any
133-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
133+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
134134
Description: Python bindings to Quantum GIS
135135
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
136136
and display databases of geographic information.

‎debian/control.squeeze

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Build-Depends:
2929
python-qt4-dev (>=4.1.0),
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
32+
python-unittest2,
3233
git,
3334
doxygen,
3435
graphviz,
@@ -125,7 +126,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
125126
Package: python-qgis
126127
Section: python
127128
Architecture: any
128-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
129+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
129130
Provides: ${python:Provides}
130131
XB-Python-Version: ${python:Versions}
131132
Description: Python bindings to Quantum GIS

‎debian/control.wheezy

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
130130
Package: python-qgis
131131
Section: python
132132
Architecture: any
133-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
133+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
134134
Provides: ${python:Provides}
135135
Description: Python bindings to Quantum GIS
136136
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

‎doc/AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,4 @@ Sergey Yakushev <yakushevs at gmail.com >
4848
René-Luc D'Hont <rldhont at gmail.com>
4949
Etienne Tourigny <etourigny.dev at gmail.com>
5050
Larry Shaffer <larrys at dakotacarto.com>
51+
Victor Olaya <volayaf at gmail.com>

0 commit comments

Comments
 (0)