Skip to content

Commit

Permalink
merge debian downstream patches
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jan 23, 2016
1 parent 1f77694 commit d872f06
Show file tree
Hide file tree
Showing 91 changed files with 1,070 additions and 1,055 deletions.
5 changes: 4 additions & 1 deletion debian/control.in
Expand Up @@ -89,7 +89,10 @@ Description: Geographic Information System (GIS)

Package: qgis-common
Architecture: all
Depends: ${misc:Depends}
Depends:
libjs-jquery,
libjs-leaflet,
${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
Expand Down
2 changes: 2 additions & 0 deletions debian/qgis-common.links
@@ -1 +1,3 @@
usr/share/common-licenses/GPL-2 usr/share/qgis/doc/LICENSE
usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/jquery-min.js
usr/share/javascript/leaflet usr/share/qgis/doc/leaflet
2 changes: 2 additions & 0 deletions debian/qgis-common.lintian-overrides
@@ -0,0 +1,2 @@
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet
6 changes: 6 additions & 0 deletions debian/rules
Expand Up @@ -261,6 +261,12 @@ override_dh_install:
# remove unwanted files
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js

# replace leaflet and jquery urls
perl -i -p \
-e 's#http://.*/leaflet.css#leaflet/leaflet.css#;s#http://.*/leaflet.js#leaflet/leaflet.js#;s#http://.*/jquery-.*.min.js#jquery-min.js#' \
$(CURDIR)/debian/tmp/usr/share/qgis/doc/developersmap.html

# Don't include a copy of the world.tif also included in osgearth-data
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
Expand Down
42 changes: 21 additions & 21 deletions i18n/qgis_ar.ts
Expand Up @@ -1665,11 +1665,11 @@ Query:
<translation>خطأ فى قواعد البيانات</translation>
</message>
<message>
<source>An error occured:</source>
<source>An error occurred:</source>
<translation>حدث خطأ</translation>
</message>
<message>
<source>An error occured when executing a query:</source>
<source>An error occurred when executing a query:</source>
<translation>حدث خطأ أتناء تنفيذ التساؤل</translation>
</message>
<message>
Expand Down Expand Up @@ -4271,7 +4271,7 @@ geometry column - column with unique integer values</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>An error occured while evaluating the calculation string:
<source>An error occurred while evaluating the calculation string:
%s</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -11036,7 +11036,7 @@ Please check the configuration in the Processing settings dialog.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>An error has occured while executing Python code:</source>
<source>An error has occurred while executing Python code:</source>
<translation>حدث خطأ أثناء تنفيذ كود بايثون:</translation>
</message>
<message>
Expand Down Expand Up @@ -13791,7 +13791,7 @@ SQL: %1</source>
<translation>لم يمكن تحميل إستعمالات QGIS.</translation>
</message>
<message>
<source>An error occured during execution of following code:</source>
<source>An error occurred during execution of following code:</source>
<translation>حدث خطأ أثناء تنفيذ التعليمات البرمجية التالية:</translation>
</message>
<message>
Expand Down Expand Up @@ -14995,7 +14995,7 @@ Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>An error occured during the merge operation</source>
<source>An error occurred during the merge operation</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -15373,7 +15373,7 @@ Errors: %3
<translation type="unfinished"></translation>
</message>
<message>
<source>SSL errors occured accessing URL %1:</source>
<source>SSL errors occurred accessing URL %1:</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand All @@ -15383,7 +15383,7 @@ Always ignore these errors?</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>%n SSL errors occured</source>
<source>%n SSL errors occurred</source>
<comment>number of errors</comment>
<translation type="unfinished">
<numerusform></numerusform>
Expand Down Expand Up @@ -15431,7 +15431,7 @@ Always ignore these errors?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A problem occured during deletion of %1 feature(s)</source>
<source>A problem occurred during deletion of %1 feature(s)</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down Expand Up @@ -16569,7 +16569,7 @@ Parser error:
<translation>خطأ</translation>
</message>
<message>
<source>An error occured while evaluating the calculation string:
<source>An error occurred while evaluating the calculation string:
%1</source>
<translation>حدث خطأ أثناء تقييم السلسلة الحسابية:
1%</translation>
Expand Down Expand Up @@ -25533,7 +25533,7 @@ Existing files are listed here and loaded when selected.</source>
<translation>خطأ</translation>
</message>
<message>
<source>An error occured while evaluating the calculation string:
<source>An error occurred while evaluating the calculation string:
%1</source>
<translation>حدث خطأ أثناء تقييم السلسلة الحسابية:
1%</translation>
Expand Down Expand Up @@ -32391,7 +32391,7 @@ This may be a problem in your network connection or at the WMS server.</source>
<translation>إضافة حلقة</translation>
</message>
<message>
<source>a problem with geometry type occured</source>
<source>a problem with geometry type occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand All @@ -32411,7 +32411,7 @@ This may be a problem in your network connection or at the WMS server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>an unknown error occured</source>
<source>an unknown error occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -32504,7 +32504,7 @@ This may be a problem in your network connection or at the WMS server.</source>
<translation>أضيفت الحلقة و عبئت</translation>
</message>
<message>
<source>a problem with geometry type occured</source>
<source>a problem with geometry type occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand All @@ -32524,7 +32524,7 @@ This may be a problem in your network connection or at the WMS server.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>an unknown error occured</source>
<source>an unknown error occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -32819,7 +32819,7 @@ This may be a problem in your network connection or at the WMS server.</source>
<translation>لم يتم تقسيم الميزة</translation>
</message>
<message>
<source>An error occured during splitting.</source>
<source>An error occurred during splitting.</source>
<translation>حدث خطأ أثناء تنفيذ التقسيم.</translation>
</message>
<message>
Expand Down Expand Up @@ -32862,7 +32862,7 @@ This may be a problem in your network connection or at the WMS server.</source>
<translation>لم يتم تقسيم الأجزاء</translation>
</message>
<message>
<source>An error occured during splitting.</source>
<source>An error occurred during splitting.</source>
<translation>حدث خطأ أثناء تنفيذ التقسيم.</translation>
</message>
<message>
Expand Down Expand Up @@ -44747,7 +44747,7 @@ p, li { white-space: pre-wrap; }
<translation>استيراد الخطأ</translation>
</message>
<message>
<source>An error occured during import:
<source>An error occurred during import:
%1</source>
<translation>حدث خطأ أثناء الاستيراد:
%1</translation>
Expand Down Expand Up @@ -46621,7 +46621,7 @@ Error was:%2</source>
<translation>النمط المحفوظ</translation>
</message>
<message>
<source>Error occured retrieving styles from database</source>
<source>Error occurred retrieving styles from database</source>
<translation>حدث خطأ أثناء استرجاع الأنماط من قاعدة بيانات</translation>
</message>
<message>
Expand Down Expand Up @@ -53560,7 +53560,7 @@ For support send a mail to scala@itc.cnr.it
<translation>إنشاء طبقة من استعلام قاعدة بيانات</translation>
</message>
<message>
<source>Open an Event Browers and display the selected feature</source>
<source>Open an Event Browser and display the selected feature</source>
<translation>فتح مستعرضات الحدث وعرض الميزة المحددة</translation>
</message>
<message>
Expand Down Expand Up @@ -56538,7 +56538,7 @@ Returns a string with the supplied regular expression replaced.
&lt;!-- List args for functions here--&gt;
&lt;i&gt; string&lt;/i&gt; &amp;rarr; is string. The start string.&lt;br&gt;
&lt;i&gt; regex&lt;/i&gt; &amp;rarr; is string. The regular expression to replace. Backslash characters must be double escaped (eg &quot;&amp;#92;&amp;#92;s&quot; to match a white space character). Non-greedy regular expressions are not supported.&lt;br&gt;
&lt;i&gt; after&lt;/i&gt; &amp;rarr; is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using &amp;#92;&amp;#92;1, &amp;#92;&amp;#92;2, etc. &lt;br&gt;&lt;/p&gt;
&lt;i&gt; after&lt;/i&gt; &amp;rarr; is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using &amp;#92;&amp;#92;1, &amp;#92;&amp;#92;2, etc. &lt;br&gt;&lt;/p&gt;

&lt;p&gt;&lt;h4&gt;Example&lt;/h4&gt;
&lt;!-- Show example of function.--&gt;
Expand Down

0 comments on commit d872f06

Please sign in to comment.