[Git][debian-gis-team/qgis][ubuntu/noble] commit the unpatched files

Martin Landa (@martinl-guest) gitlab at salsa.debian.org
Thu Apr 9 09:35:42 BST 2026 


Martin Landa pushed to branch ubuntu/noble at Debian GIS Project / qgis


Commits:
f9abe8ab by Martin Landa at 2026-04-09T10:35:28+02:00
commit the unpatched files

- - - - -


19 changed files:

- ChangeLog
- debian/changelog
- debian/control
- debian/gbp.conf
- doc/developersmap.html
- external/nlohmann/json.hpp
- linux/org.qgis.qgis.appdata.xml.in
- python/core/auto_generated/auth/qgsauthmanager.sip.in
- python/core/auto_generated/symbology/qgsrenderer.sip.in
- resources/cpt-city-qgis-min/selections/blues.xml
- resources/cpt-city-qgis-min/selections/div.xml
- resources/cpt-city-qgis-min/selections/greens.xml
- resources/cpt-city-qgis-min/selections/greys.xml
- resources/cpt-city-qgis-min/selections/reds.xml
- resources/cpt-city-qgis-min/selections/transparency.xml
- scripts/ts2appinfo.py
- src/core/auth/qgsauthmanager.h
- src/core/symbology/qgsrenderer.h
- tests/testdata/plugindependencies_data.json


Changes:

=====================================
ChangeLog
=====================================
@@ -129447,7 +129447,7 @@ Nyall Dawson <nyall.dawson at gmail.com>	2020-01-15
     relies on a constant, fixed table structure, and can't adapt to
     input tables with different field structures.
 
-    In contrast, this simple Rename Field algorithm adapts nicely for
+    In constrast, this simple Rename Field algorithm adapts nicely for
     model use, because it operates on a single field only and leaves
     all the other fields untouched.
 
@@ -206601,7 +206601,7 @@ Nyall Dawson <nyall.dawson at gmail.com>	2018-02-01
 
     Default to a dark gray instead of black for symbol outlines
 
-    Avoiding the very high contrast pure black results in cartographically
+    Avoiding the very high constrast pure black results in cartographically
     more pleasing styles, so it's nice to do this by default.
 
     This should result in nicer looking maps being created in QGIS
@@ -414254,7 +414254,7 @@ ersts <ersts at c8812cc2-4d05-0410-92ff-de0c093fc19c>	2008-05-06
     -Closes ticket #945
     -Added ability choose in the GUI to load estimated or actual min max values from the band
     -Cleaned and reorganized raster properties gui a little
-    -Added a set default contrast enhancement option in gui that is persistent between sessions
+    -Added a set default constrast enhancement option in gui that is persistent between sessions
     -Closes ticket #1055 and #778
 
     git-svn-id: http://svn.osgeo.org/qgis/trunk@8398 c8812cc2-4d05-0410-92ff-de0c093fc19c
@@ -416521,7 +416521,7 @@ Tim Sutton <tim at linfiniti.com>	2008-01-16
 
 Tim Sutton <tim at linfiniti.com>	2008-01-16
 
-    Updates to raster tests - added image writing capability. At the moment it will write to /tmp/raster_test.png. Later I will write different files out after performing various colour and transparency operations on the test dataset.
+    Updates to raster tests - added image writing capability. At teh moment it will write to /tmp/raster_test.png. Later I will write different files out after performing various colour and transparency operations on the test dataset.
 
 
     git-svn-id: http://svn.osgeo.org/qgis/trunk@7979 c8812cc2-4d05-0410-92ff-de0c093fc19c
@@ -418163,7 +418163,7 @@ Martin Dobias <wonder.sk at gmail.com>	2007-11-20
 
 Tim Sutton <tim at linfiniti.com>	2007-11-20
 
-    Initial commit of coding manual for QGIS (aggregates various pages from the wiki)
+    Initial commit of coding manual for QGIS (aggregates various pages from teh wiki)
 
 
     git-svn-id: http://svn.osgeo.org/qgis/trunk@7620 c8812cc2-4d05-0410-92ff-de0c093fc19c
@@ -421606,7 +421606,7 @@ Tim Sutton <tim at linfiniti.com>	2007-06-09
 
 Tim Sutton <tim at linfiniti.com>	2007-06-09
 
-    Moved to using text2tags for managing install etc docs. Please edit the install docs here (not on the wiki!) and then use txt2tags to generate moinmoin output and paste into the wiki. Also do not directly edit INSTALL but rather edit INSTALL.t2t and regenerate the INSTALL file using t2t plain text generator.
+    Moved to using text2tags for managing install etc docs. Please edit the install docs here (not on the wiki!) and then use txt2tags to generate moinmoin output and paste into the wiki. Also do not directly edit INSTALL but rather edit INSTALL.t2t and regenerate teh INSTALL file using t2t plain text generator.
 
     git-svn-id: http://svn.osgeo.org/qgis/trunk@6995 c8812cc2-4d05-0410-92ff-de0c093fc19c
 
@@ -424046,7 +424046,7 @@ Gary Sherman <gsherman at geoapt.com>	2006-12-29
 
 Tim Sutton <tim at linfiniti.com>	2006-12-29
 
-    Updates to installer to facililate downloading sample data. Gave the install tasks better names and descriptions. Note unzipping the downloaded sample data is not working yet due to problems I am having with the zipdll nsis plugin.
+    Updates to installer to facililate downloading sample data. Gave teh install tasks better names and descriptions. Note unzipping the downloaded sample data is not working yet due to problems I am having with the zipdll nsis plugin.
 
     git-svn-id: http://svn.osgeo.org/qgis/trunk@6335 c8812cc2-4d05-0410-92ff-de0c093fc19c
 
@@ -425279,7 +425279,7 @@ Gary Sherman <gsherman at geoapt.com>	2006-11-27
 
 Tim Sutton <tim at linfiniti.com>	2006-11-27
 
-    Force tab bar scrolling on mac. For me it doesnt make the scroll icons appear but at least the tabbar doesnt autoexpand any more
+    Force tab bar scrolling on mac. For me it doesnt make the scroll icons appear but at least teh tabbar doesnt autoexpand any more
 
 
 
@@ -430723,7 +430723,7 @@ Tim Sutton <tim at linfiniti.com>	2006-04-08
 
 Tim Sutton <tim at linfiniti.com>	2006-04-08
 
-    More clean ups to test builder - warnning it will damge the local makefile if used at the moment.
+    More clean ups to test builder - warnning it will damge the local makefile if used at teh moment.
     Added a test class for qgssymbol - which fails when run
     Add rules to makefile to build symbol test
 
@@ -433944,7 +433944,7 @@ Tim Sutton <tim at linfiniti.com>	2006-01-23
 Tim Sutton <tim at linfiniti.com>	2006-01-23
 
     Get rid of artifacts behind hard markers drawn using qpicture
-    Note there is still some scaling issue with these that I am looking into
+    Note tehre is still some scaling issue with these that I am looking into
 
 
     git-svn-id: http://svn.osgeo.org/qgis/trunk@4724 c8812cc2-4d05-0410-92ff-de0c093fc19c


=====================================
debian/changelog
=====================================
@@ -1,16 +1,3 @@
-qgis (3.34.15+dfsg-1~noble2) noble; urgency=medium
-
-  * Rebuild for noble.
-  * Update GRASS dependency to 8.4.1
-
- -- Martin Landa <landa.martin at gmail.com>  Tue, 04 Mar 2025 16:57:14 +0100
-
-qgis (3.34.15+dfsg-1~noble1) noble; urgency=medium
-
-  * Rebuild for noble.
-
- -- Martin Landa <landa.martin at gmail.com>  Tue, 04 Mar 2025 13:49:46 +0100
-
 qgis (3.34.15+dfsg-1) unstable; urgency=medium
 
   * Move from experimental to unstable.
@@ -102,19 +89,6 @@ qgis (3.34.9+dfsg-2) unstable; urgency=medium
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Aug 2024 11:01:35 +0200
 
-qgis (3.34.9+dfsg-1~noble2) noble; urgency=medium
-
-  * Rebuild for noble.
-  * Update debian/qgis.sh
-
- -- Martin Landa <landa.martin at gmail.com>  Tue, 30 Jul 2024 14:56:38 +0200
-
-qgis (3.34.9+dfsg-1~noble1) noble; urgency=medium
-
-  * Rebuild for noble.
-
- -- Martin Landa <landa.martin at gmail.com>  Tue, 30 Jul 2024 10:03:40 +0200
-
 qgis (3.34.9+dfsg-1) unstable; urgency=medium
 
   * Update symbols for other architectures.


=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends: bison,
                dh-sequence-python3,
                flex,
                gdal-bin,
-               grass-dev (>= 8.4.1),
+               grass-dev (>= 8.4.0),
                libexiv2-dev,
                libexpat1-dev,
                libfcgi-dev,
@@ -89,7 +89,7 @@ Build-Conflicts: libqgis-dev,
                  qgis-dev
 Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/qgis
-Vcs-Git: https://salsa.debian.org/debian-gis-team/qgis.git -b ubuntu/noble
+Vcs-Git: https://salsa.debian.org/debian-gis-team/qgis.git
 Homepage: https://qgis.org/
 Rules-Requires-Root: no
 
@@ -248,7 +248,7 @@ Description: QGIS custom widgets for Qt Designer
 Package: libqgis-dev
 Architecture: any
 Section: libdevel
-Depends: grass-dev (>= 8.4.1),
+Depends: grass-dev (>= 8.4.0),
          libexiv2-dev,
          libexpat1-dev,
          libgdal-dev (>= 1.11),
@@ -320,7 +320,7 @@ Architecture: any
 Depends: qgis (= ${binary:Version}),
          qgis-plugin-grass-common (= ${source:Version}),
          qgis-provider-grass (= ${binary:Version}),
-         grass-core (>= 8.4.1),
+         grass-core (>= 8.4.0),
          ${grass:Depends},
          ${shlibs:Depends},
          ${misc:Depends}


=====================================
debian/gbp.conf
=====================================
@@ -6,7 +6,7 @@ upstream-branch = upstream-ltr
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = ubuntu/noble
+debian-branch = master
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig


=====================================
doc/developersmap.html
=====================================
@@ -3,13 +3,18 @@
 <head>
   <title>Developers Map</title>
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="leaflet/leaflet.css"/>
+  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css"
+  integrity="sha384-o/2yZuJZWGJ4s/adjxVW71R+EO/LyCwdQfP5UWSgX/w87iiTXuvDZaejd3TsN7mf"
+  crossorigin="" />
   <style type="text/css">
   body {  padding: 0; margin: 0;  }
   html, body, #developers-map {  height: 100%;  }
   </style>
-  <script src="leaflet/leaflet.js"></script>
-  <script src="jquery.js"></script>
+  <script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"
+  integrity="sha384-okbbMvvx/qfQkmiQKfd5VifbKZ/W8p1qIsWvE1ROPUfHWsDcC8/BnHohF7vPg2T6"
+  crossorigin="">
+  </script>
+  <script src="http://code.jquery.com/jquery-2.1.0.min.js"></script>
   <link rel="points" type="application/json" href="../resources/data/contributors.json">
 </head>
 <body>


=====================================
external/nlohmann/json.hpp
=====================================
@@ -4728,7 +4728,7 @@ class basic_json
     /*!
     @brief wrapper to access iterator member functions in range-based for
 
-    This function allows accessing @ref iterator::key() and @ref
+    This function allows to access @ref iterator::key() and @ref
     iterator::value() during range-based for loops. In these loops, a
     reference to the JSON values is returned, so there is no access to the
     underlying iterator.
@@ -4800,7 +4800,7 @@ class basic_json
     /*!
     @brief helper to access iterator member functions in range-based for
 
-    This function allows accessing @ref iterator::key() and @ref
+    This function allows to access @ref iterator::key() and @ref
     iterator::value() during range-based for loops. In these loops, a
     reference to the JSON values is returned, so there is no access to the
     underlying iterator.
@@ -4833,7 +4833,7 @@ class basic_json
     }
     @endcode
 
-    The `items()` function also allows using
+    The `items()` function also allows to use
     [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
     (C++17):
 
@@ -5340,7 +5340,7 @@ class basic_json
     /*!
     @brief add an object to an object
 
-    This function allows using `push_back` with an initializer list. In case
+    This function allows to use `push_back` with an initializer list. In case
 
     1. the current value is an object,
     2. the initializer list @a init contains only two elements, and


=====================================
linux/org.qgis.qgis.appdata.xml.in
=====================================
@@ -2,10 +2,11 @@
 <component type="desktop">
   <id>org.qgis.qgis.desktop</id>
   <name>QGIS Desktop</name>
-  <developer id="org.qgis">
-    <name>QGIS Development Team</name>
-  </developer>
+  <developer_name>QGIS Development Team</developer_name>
   <summary>A Free and Open Source Geographic Information System</summary>
+  <screenshots>
+    <screenshot><image type="source">https://qgis.org/en/_static/images/about-screenshot.png</image></screenshot>
+  </screenshots>
   <description><p>QGIS is a user friendly Open Source Geographic Information System (GIS) licensed under the GNU General Public License. QGIS is an official project of the Open Source Geospatial Foundation (OSGeo). It runs on Linux, Unix, Mac OSX, Windows and Android and supports numerous vector, raster, and database formats and functionalities.</p></description>
 
   <metadata_license>CC-BY-3.0</metadata_license>


=====================================
python/core/auto_generated/auth/qgsauthmanager.sip.in
=====================================
@@ -147,7 +147,7 @@ Check whether supplied password is the same as the one already set
     bool resetMasterPassword( const QString &newpass, const QString &oldpass, bool keepbackup, QString *backuppath /In,Out/ = 0 );
 %Docstring
 Reset the master password to a new one, then re-encrypt all previous
-configs in a new database file, optionally backup current database
+configs in a new database file, optionally backup curren database
 
 :param newpass: New master password to replace existing
 :param oldpass: Current master password to replace existing


=====================================
python/core/auto_generated/symbology/qgsrenderer.sip.in
=====================================
@@ -249,7 +249,7 @@ E.g. if you only want to deal with visible features:
      if not renderer.capabilities().testFlag(QgsFeatureRenderer.Filter) or renderer.willRenderFeature(feature, context):
          deal_with_my_feature()
      else:
-         skip_the_current_feature()
+         skip_the_curren_feature()
 %End
 
     virtual QgsSymbolList symbols( QgsRenderContext &context ) const;


=====================================
resources/cpt-city-qgis-min/selections/blues.xml
=====================================
@@ -5,12 +5,10 @@
   bathymetric maps</synopsis>
   <description>A selection of blues which may be useful for 
   bathymetric maps.</description>
-<!--
   <seealsocollects>
     <collect dir="es/skywalker">skywalker</collect>
     <collect dir="es/sea_dreams">sea dreams</collect>
   </seealsocollects>
--->
   <gradients>
     <gradient dir="cb/seq" file="Blues_09"/>
     <gradient dir="cb/seq" file="GnBu_09"/>


=====================================
resources/cpt-city-qgis-min/selections/div.xml
=====================================
@@ -17,10 +17,8 @@
     <gradient file="bhw2_39" dir="bhw/bhw2"/>
     <gradient file="BrBG_11" dir="cb/div"/>
     <gradient file="cw1-002" dir="cw/1"/>
-<!--
     <gradient file="es_landscape_90" dir="es/landscape"/>
     <gradient file="es_landscape_76" dir="es/landscape"/>
--->
     <gradient file="fire_active_2" dir="esri/events"/>
     <gradient file="seismic" dir="gery"/>
     <gradient file="French_flag_smooth" dir="ggr"/>
@@ -32,14 +30,12 @@
     <gradient file="cbcBrBG" dir="jjg/cbcont/div"/>
     <gradient file="cbacBrBG11" dir="jjg/cbac/div"/>
     <gradient file="BrBG" dir="jjg/polarity"/>
-<!--
     <gradient file="Andy_GIlmore_2" dir="jjg/ccolo/evad"/>
     <gradient file="Need_I_Say_More" dir="jjg/ccolo/sugar"/>
     <gradient file="Grand_Boucle" dir="jjg/ccolo/vredeling"/>
     <gradient file="Optimus_Prime" dir="jjg/ccolo/vredeling"/>
     <gradient file="British_Cheer" dir="jjg/ccolo/vredeling"/>
     <gradient file="Tubular_Bells" dir="jjg/ccolo/vredeling"/>
--->
     <gradient file="xmas_22" dir="ma/xmas"/>
     <gradient file="ha_14" dir="ma/postcard"/>
     <gradient file="departure" dir="mjf"/>


=====================================
resources/cpt-city-qgis-min/selections/greens.xml
=====================================
@@ -4,36 +4,28 @@
   <synopsis>Predominantly green gradients</synopsis>
   <description>As Kermit the frog says, it's not 
   easy being green.</description>
-<!--
   <seealsocollects>
     <collect dir="es/emerald_dragon">ElvenSword's 
     Emerald dragon series</collect>
   </seealsocollects>
--->
   <gradients>
     <gradient dir="occ/1" file="occ040"/>
     <gradient dir="rc" file="girlcat"/>
     <gradient dir="saga" file="saga-08"/>
-<!--
     <gradient dir="jjg/ccolo/evad" file="fava_bean"/>
     <gradient dir="jjg/ccolo/katiekat013" file="Lovely_Liz"/>
     <gradient dir="jjg/ccolo/laleh1979" file="contagious_delusion"/>
     <gradient dir="jjg/ccolo/phill" file="moldy_bread"/>
     <gradient dir="jjg/ccolo/smorin2002" file="All_kinds_of_green"/>
--->
     <gradient dir="h5" file="summer"/>
     <gradient dir="gps" file="GPS-Nature-Grass"/>
     <gradient dir="go2/webtwo" file="green-g1-2"/>
-<!--
     <gradient dir="es/emerald_dragon" file="es_emerald_dragon_12"/>
     <gradient dir="es/emerald_dragon" file="es_emerald_dragon_10"/>
--->
     <gradient dir="cw/2" file="cw2-033"/>
-<!--
     <gradient dir="colo/smorin2002" file="All_kinds_of_green"/>
     <gradient dir="colo/angelafaye" file="organic_vegetation"/>
     <gradient dir="colo/Skyblue2u" file="Adrift_in_Dreams"/>
--->
     <gradient dir="ds9" file="he"/>
     <gradient dir="cb/seq" file="YlGn_09"/>
     <gradient dir="cb/seq" file="Greens_09"/>


=====================================
resources/cpt-city-qgis-min/selections/greys.xml
=====================================
@@ -7,9 +7,7 @@
     <collect dir="tl">Thomas Lotze</collect>
     <collect dir="erj">Eric R. Jeschke</collect>
     <collect dir="ma/gray">Michele Albert</collect>
-<!--
     <collect dir="es/platinum">ElvenSword</collect>
--->
   </seealsocollects>
   <gradients>
     <gradient file="Greys_09" dir="cb/seq"/>
@@ -26,9 +24,7 @@
     <gradient file="stripes-six" dir="ocal"/>
     <gradient file="power-0.50" dir="tl"/>
     <gradient file="grey-g2-3" dir="go2/webtwo"/>
-<!--
     <gradient file="es_platinum_16" dir="es/platinum"/>
--->
     <gradient file="rock" dir="neota/env"/>
   </gradients>
 </selection>


=====================================
resources/cpt-city-qgis-min/selections/reds.xml
=====================================
@@ -5,14 +5,11 @@
   <description>A selection of red, pinks and oranges.</description>
   <seealsocollects>
     <collect dir="nd/red">Nevit Dilmen</collect>
-<!--
     <collect dir="es/rosa">ElvenSword</collect>
--->
   </seealsocollects>
   <gradients>
     <gradient file="Reds_09"  dir="cb/seq"/>
     <gradient file="YlOrRd_09" dir="cb/seq"/>
-<!--
     <gradient file="scent_of_spring" dir="colo/angelafaye"/>
     <gradient file="Colours_Are_Evil" dir="colo/sugar"/>
     <gradient file="October_Sky" dir="colo/sugar"/>
@@ -24,7 +21,6 @@
     <gradient file="Emo_Barbie_Playmate" dir="colo/rphnick"/>
     <gradient file="To_My_1st_100_Loves" dir="colo/rphnick"/>
     <gradient file="l_o_v_e" dir="colo/tvr"/>
--->
     <gradient file="cw1-003" dir="cw/1"/>
     <gradient file="cw5-068" dir="cw/5"/>
     <gradient file="red" dir="ds9"/>


=====================================
resources/cpt-city-qgis-min/selections/transparency.xml
=====================================
@@ -10,10 +10,8 @@
     <collect dir="ggr">GIMP</collect>
   </seealsocollects>
   <gradients>
-<!--
     <gradient file="es_platinum_01"  dir="es/platinum"/>
     <gradient file="es_seadreams_14" dir="es/sea_dreams"/>
--->
     <gradient file="Aneurism" dir="ggr"/>
     <gradient file="Flare_Glow_Radial_1" dir="ggr"/>
     <gradient file="Radial_Rainbow_Hoop" dir="ggr"/>


=====================================
scripts/ts2appinfo.py
=====================================
@@ -29,7 +29,7 @@ strings = {}
 d = et.parse('linux/org.qgis.qgis.appdata.xml.in')
 
 r = d.getroot()
-for elem in ['name', 'summary']:
+for elem in ['name', 'summary', 'description']:
     for c in r.iter(elem):
         if not c.attrib:
             l = list(c)
@@ -68,7 +68,7 @@ for qm in sorted(glob(sys.argv[1] + "/output/i18n/qgis_*.qm")):
             continue
         strings[s][lang] = translation
 
-for elem in ['name', 'summary']:
+for elem in ['name', 'summary', 'description']:
     for c in r.iter(elem):
         if c.attrib:
             continue


=====================================
src/core/auth/qgsauthmanager.h
=====================================
@@ -153,7 +153,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
 
     /**
      * Reset the master password to a new one, then re-encrypt all previous
-     * configs in a new database file, optionally backup current database
+     * configs in a new database file, optionally backup curren database
      * \param newpass New master password to replace existing
      * \param oldpass Current master password to replace existing
      * \param keepbackup Whether to keep the generated backup of current database


=====================================
src/core/symbology/qgsrenderer.h
=====================================
@@ -287,7 +287,7 @@ class CORE_EXPORT QgsFeatureRenderer
      * if not renderer.capabilities().testFlag(QgsFeatureRenderer.Filter) or renderer.willRenderFeature(feature, context):
      *     deal_with_my_feature()
      * else:
-     *     skip_the_current_feature()
+     *     skip_the_curren_feature()
      * \endcode
      */
     virtual QgsFeatureRenderer::Capabilities capabilities() { return QgsFeatureRenderer::Capabilities(); }


=====================================
tests/testdata/plugindependencies_data.json
=====================================
The diff for this file was not included because it is too large.


View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/f9abe8ab91291b8814faf9418aeec9352d7863e7

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/f9abe8ab91291b8814faf9418aeec9352d7863e7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20260409/1923f94a/attachment-0001.htm>

More information about the Pkg-grass-devel mailing list