Skip to content

Commit

Permalink
merge from trunk r11250:11300
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11885 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Nov 2, 2009
1 parent 20b599b commit 5662cdb
Show file tree
Hide file tree
Showing 76 changed files with 4,571 additions and 4,073 deletions.
2 changes: 1 addition & 1 deletion debian/control
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: qgis-plugin-grass (>= ${source:Version})
Depends: qgis-plugin-grass (>= ${source:Version}), python
Description: GRASS plugin for Quantum GIS - architecture-independent data
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
4 changes: 2 additions & 2 deletions debian/libqgis1.2.0.install
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
usr/lib/libqgis_core.so.*
usr/lib/libqgis_gui.so.*
usr/lib/libqgis_core.so.*.*.*
usr/lib/libqgis_gui.so.*.*.*
5 changes: 2 additions & 3 deletions debian/libqgis1.lintian-overrides
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
libqgis1: shlib-calls-exit
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.1
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.1
libqgis1: package-name-doesnt-match-sonames libqgis-core1.1 libqgis-gui1.1
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.2.0
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.2.0
1 change: 0 additions & 1 deletion debian/python-qgis.lintian-overrides
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
python-qgis: package-name-doesnt-match-sonames
python-qgis: non-dev-pkg-with-shlib-symlink
python-qgis: no-symbols-control-file usr/lib/libqgispython.so.1.1
2 changes: 1 addition & 1 deletion debian/qgis-plugin-grass.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
usr/lib/qgis/libgrassplugin.so
usr/lib/qgis/libgrassprovider.so
usr/lib/libqgisgrass.so.*
usr/lib/libqgisgrass.so.*.*.*
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 usr/lib/libqgisgrass.so.1.1
2 changes: 2 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ CMAKE_OPTS = \
-D WITH_SPATIALITE=TRUE \
-D WITH_INTERNAL_SPATIALITE=TRUE

LDFLAGS += -Wl,--as-needed -Wl,--no-undefined

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
Expand Down
6 changes: 3 additions & 3 deletions i18n/qgis_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Storno</source>
<translation></translation>
<translation>Abbruch</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -5148,7 +5148,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/qgsattributeactiondialogbase.ui" line="66"/>
<location filename="../src/ui/qgsattributeactiondialogbase.ui" line="82"/>
<source>Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if preceeded by a backslash</source>
<source>Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash</source>
<translation>Geben Sie hier die Aktion ein. Dies kann jedes Programm, Skript oder Kommando sein, dass in Ihrem System verfügbar ist. Wenn die Aktion ausgeführt wird jeder durch % eingeleiteter Feldname durch den Feldwert ersetzt. Die besondere Zeichenfolge %% wird durch den Wert des gewählten Felds ersetzt. Mit Anführungszeichen können mehrere Wörter zu einem Argument der Aktion zusammengefaßt werden. Für mit Backslash (\) eingeleitete Anführungszeichen gilt dies nicht.</translation>
</message>
<message>
Expand Down Expand Up @@ -14255,7 +14255,7 @@ p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;This is the list of all layers available in the datasource of the active layer. You can select the layers to load. The layers will be loaded when you press &quot;OK&quot;.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;The layer name is format dependant. Consult the OGR documentation or the documentation of your data format to determine the nature of the included information.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;The layer name is format dependent. Consult the OGR documentation or the documentation of your data format to determine the nature of the included information.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Be advised: &lt;/span&gt;selecting an already opened layer will not generate an error message and the layer will end up loaded twice!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
Expand Down
Loading

0 comments on commit 5662cdb

Please sign in to comment.