[Git][debian-gis-team/grass][master] 5 commits: New upstream version 7.8.7

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Wed Feb 23 18:32:40 GMT 2022 


Bas Couwenberg pushed to branch master at Debian GIS Project / grass


Commits:
4264ccc6 by Bas Couwenberg at 2022-02-23T18:44:01+01:00
New upstream version 7.8.7
- - - - -
bdee0480 by Bas Couwenberg at 2022-02-23T18:47:45+01:00
Update upstream source from tag 'upstream/7.8.7'

Update to upstream version '7.8.7'
with Debian dir f0e630045254ac7d32d1c039f133c1baf0f046a7
- - - - -
4e446e94 by Bas Couwenberg at 2022-02-23T18:49:55+01:00
New upstream release.

- - - - -
cb5440cd by Bas Couwenberg at 2022-02-23T19:03:12+01:00
Drop pdal support.

- - - - -
46237fca by Bas Couwenberg at 2022-02-23T19:03:24+01:00
Set distribution to unstable.

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/rules
- doc/howto_release.md
- gui/wxpython/gui_core/query.py
- include/VERSION
- tools/mkhtml.py


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+grass (7.8.7-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop pdal support.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 23 Feb 2022 18:50:44 +0100
+
 grass (7.8.7~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


=====================================
debian/control
=====================================
@@ -25,7 +25,6 @@ Build-Depends: bison,
        default-libmysqlclient-dev,
                libncurses5-dev,
                libnetcdf-dev,
-               libpdal-dev,
                libpng-dev,
                libpq-dev,
                libproj-dev,


=====================================
debian/rules
=====================================
@@ -106,7 +106,6 @@ override_dh_auto_configure: templates
                     --with-nls \
                     --with-odbc \
                     --with-openmp \
-                    --with-pdal \
                     --with-postgres \
                     --with-postgres-includes=$(shell pg_config --includedir) \
                     --with-proj-share=/usr/share/proj \


=====================================
doc/howto_release.md
=====================================
@@ -111,17 +111,19 @@ Example:
 ```bash
 7
 8
-1RC1
-2019
+7RC1
+2022
 ```
 
+Commit with version message, e.g. "GRASS GIS 7.8.7RC1".
+
 ### Create release tag
 
-(see <https://help.github.com/en/articles/creating-releases>)
+(For background, see <https://help.github.com/en/articles/creating-releases>)
 
 Preparation:
 
-### Changelog and tagging etc
+#### Changelog and tagging etc preparations
 
 ```bash
 # update from GH
@@ -144,7 +146,7 @@ RELEASETAG=release_${TODAY}_grass_${MAJOR}_${MINOR}_${RELEASE}
 echo $RELEASETAG
 ```
 
-### Tag release (on GitHub)
+#### Tag release (on GitHub)
 
 ```bash
 echo "$VERSION"
@@ -155,25 +157,20 @@ To be done in GH interface:
 <https://github.com/OSGeo/grass/releases/new>
 
 - select release_branch first, then
-- write into "Create tag" field:
+- fill in "Release Title" (e.g., GRASS GIS 7.8.7RC1)
+- fill in "Create tag" field: 7.8.7RC1
 
 Tag version | target (examples):
   7.8.7RC1  | releasebranch_7_8
 
+- click on "Create new tag: ... on publish"
+
 Add release desciption (re-use existing texts as possible, from
 <https://github.com/OSGeo/grass/releases>)
 
 If RC, then check
 [x] This is a pre-release
 
-### Packaging of source code tarball
-
-```bash
-# fetch tarball from GitHub
-wget https://github.com/OSGeo/grass/archive/${VERSION}.tar.gz -O grass-${VERSION}.tar.gz
-md5sum grass-${VERSION}.tar.gz > grass-${VERSION}.md5sum
-```
-
 ### Changelog from GitHub for GH release notes
 
 Using GH API here, see also
@@ -184,12 +181,22 @@ Using GH API here, see also
 gh api repos/OSGeo/grass/releases/generate-notes -f tag_name="7.8.7" -f previous_tag_name=7.8.6 -f target_commitish=releasebranch_7_8 -q .body
 ```
 
-Importantly, these notes need to be manually sorted into the various categories.
+If this fails, also a date may be used (that of the last release):
+
+```bash
+# GitHub style
+git log --pretty=format:"* %s by %an" --after="2022-01-28" | sort
+
+# trac style
+git log --oneline --after="2022-01-28" | cut -d' ' -f2- | sed 's+^+* +g' | sed 's+(#+https://github.com/OSGeo/grass/pull/+g' | sed 's+)$++g' | sort -u
+```
+
+Importantly, these notes need to be manually sorted into the various categories (modules, wxGUI, library, docker, ...).
 
 ### Changelog file for upload
 
 ```bash
-python3 utils/gitlog2changelog.py
+python3 tools/gitlog2changelog.py
 mv ChangeLog ChangeLog_$VERSION
 head ChangeLog_$VERSION
 gzip ChangeLog_$VERSION
@@ -221,6 +228,13 @@ Reset local copy to GH:
 #  - remote repo as "upstream"
 git fetch --all --prune && git checkout releasebranch_7_8 && \
  git merge upstream/releasebranch_7_8 && git push origin releasebranch_7_8
+
+### Getting the source code tarball for upload on OSGeo server
+
+```bash
+# fetch tarball from GitHub
+wget https://github.com/OSGeo/grass/archive/${VERSION}.tar.gz -O grass-${VERSION}.tar.gz
+md5sum grass-${VERSION}.tar.gz > grass-${VERSION}.md5sum
 ```
 
 ### Upload source code tarball to OSGeo servers
@@ -261,7 +275,7 @@ vim wingrass-maintenance-scripts/grass_addons.sh
 vim wingrass-maintenance-scripts/grass_copy_wwwroot.sh
 vim wingrass-maintenance-scripts/cronjob.sh       # major/minor release only
 
-# update addons - major/minor release only
+# update addons - major/minor release only <<-- outdated?!
 vim grass-addons/tools/addons/grass-addons-publish.sh
 vim grass-addons/tools/addons/grass-addons-build.sh
 vim grass-addons/tools/addons/grass-addons.sh
@@ -279,7 +293,7 @@ Release is done.
 
 ### Advertise the new release
 
-#### Write trac Wiki release page
+#### Write trac Wiki release page (probably to be dropped)
 
 To easily generate the entries for the trac Wiki release page, use the `git log` approach:
 - extract entries from oneline git log and prepare for trac Wiki copy-paste:
@@ -287,10 +301,10 @@ To easily generate the entries for the trac Wiki release page, use the `git log`
 ```
 # get date of previous release from https://github.com/OSGeo/grass/releases
 # verify
-git log --oneline --after="2021-10-10" | tac
+git log --oneline --after="2022-01-28" | tac
 
 # prepare for trac Wiki release page (incl. PR trac macro)
-git log --oneline --after="2021-10-10" | cut -d' ' -f2- | sed 's+^+ * G78:+g' | sed 's+(#+(PR:+g' | sort -u
+git log --oneline --after="2022-01-28" | cut -d' ' -f2- | sed 's+^+ * G78:+g' | sed 's+(#+(PR:+g' | sort -u
 ```
 
 - store changelog entries in trac, by section:
@@ -382,22 +396,8 @@ Software pages:
     - <https://lists.osgeo.org/mailman/listinfo/grass-dev> | <grass-dev at lists.osgeo.org>
     - <https://lists.osgeo.org/mailman/listinfo/grass-user> | <grass-user at lists.osgeo.org>
 - FreeGIS: <freegis-list at intevation.de>
-- Geowanking: <geowanking at geowanking.org>
 - OSGeo.org: <news_item at osgeo.org>, <info at osgeo.org>
-- Geo Connexion: <editor-geo at geoconnexion.com>
-
-Via Web:
-
-- <http://linuxtoday.com/contribute.php3>
-- <https://joinup.ec.europa.eu/software/grassgis/home> (submit news, MN)
-- <http://www.macnn.com/contact/newstips/1>
-- <http://www10.giscafe.com/submit_material/submit_options.php#Press> (MN) -->
-  Press releases
-- <http://www.directionsmag.com/pressreleases/> (News -> Submit Press Release)
-- <http://directory.fsf.org/wiki/GRASS_%28Geographic_Resources_Analysis_Support_System%29>
-- <https://www.linux-apps.com/p/1128004/edit/> (MN)
-- <https://news.eoportal.org/web/eoportal/share-your-news> (MN) -> Share your
-  news with the EO community
-- <https://www.heise.de/download/product/grass-gis-7105> (update, MN)
-- See also: <https://grass.osgeo.org/wiki/Contact_Databases>
-- ... anywhere else? Please add here.
+
+Via Web / Social media:
+
+- See: <https://grass.osgeo.org/wiki/Contact_Databases>


=====================================
gui/wxpython/gui_core/query.py
=====================================
@@ -144,13 +144,11 @@ class QueryDialog(wx.Dialog):
         else:
             label1 = nodes[0].label
             texts.append((_("Copy '%s'" % self._cutLabel(label1)), label1))
-            if nodes[0].data and nodes[0].data[self._colNames[1]]:
-                label2 = nodes[0].data[self._colNames[1]]
-                texts.insert(
-                    0, (_(
-                        "Copy '%s'" %
-                        self._cutLabel(label2)), label2))
-                texts.append((_("Copy line"), label1 + ': ' + label2))
+            col1 = self._colNames[1]
+            if nodes[0].data and col1 in nodes[0].data and nodes[0].data[col1]:
+                label2 = nodes[0].data[col1]
+                texts.insert(0, (_("Copy '%s'" % self._cutLabel(label2)), label2))
+                texts.append((_("Copy line"), label1 + ": " + label2))
 
         ids = []
         for text in texts:


=====================================
include/VERSION
=====================================
@@ -1,4 +1,4 @@
 7
 8
-7RC1
+7
 2022


=====================================
tools/mkhtml.py
=====================================
@@ -48,7 +48,15 @@ try:
     import grass.script as gs
 except ImportError:
     # During compilation GRASS GIS
-    gs = None
+    _ = str
+
+    class gs:
+        def warning(message):
+            pass
+
+        def fatal(message):
+            pass
+
 
 HEADERS = {
     "User-Agent": "Mozilla/5.0",



View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/compare/f4268c8cd1d51d4aca5e396b51b442b677594ee2...46237fcafcd9b42967c40b4dc4146a7854d4bab0

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/compare/f4268c8cd1d51d4aca5e396b51b442b677594ee2...46237fcafcd9b42967c40b4dc4146a7854d4bab0
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/20220223/e1d95d23/attachment-0001.htm>

More information about the Pkg-grass-devel mailing list