INSTALL

@@ -314,6 +314,6 @@ https://trac.osgeo.org/grass/wiki/Submitting
 https://grass.osgeo.org/documentation/first-time-users/
 
 ------------------
-(C) 1999-2018 by The GRASS Development Team
+(C) 1999-2019 by The GRASS Development Team
 
-Last changed: $Date: 2018-01-01 23:36:04 +0100 (Mon, 01 Jan 2018) $
+Last changed: $Date: 2019-01-01 19:24:49 +0100 (Tue, 01 Jan 2019) $

REQUIREMENTS.html

@@ -212,11 +212,11 @@ MacOSX users may go here to download precompiled libraries etc.:
 <p>
 
 <hr width="100%">
-<i>&copy; GRASS Development Team 1997-2018</i>
+<i>&copy; GRASS Development Team 1997-2019</i>
 <p>Please report bugs here:
 <br><a href="https://grass.osgeo.org/development/bug-tracking/">https://grass.osgeo.org/development/bug-tracking/</a>
 
 <p>
-<i>Last changed: $Date: 2018-03-25 16:51:11 +0200 (Sun, 25 Mar 2018) $</i>
+<i>Last changed: $Date: 2019-01-01 19:24:49 +0100 (Tue, 01 Jan 2019) $</i>
 </body>
 </html>

debian/changelog

+grass (7.4.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update copyright years for GRASS Development Team & Markus Neteler.
+  * Use grass-gui.maintscript for dpkg-maintscript-helper commands.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 15 Jan 2019 18:11:33 +0100
+
 grass (7.4.3-2) unstable; urgency=medium
 
   * Also strip .note section from binaries.

debian/copyright

@@ -4,8 +4,9 @@ Upstream-Contact: GRASS Development Team <grass-dev@lists.osgeo.org>
 Source: http://grass.osgeo.org/
 
 Files: *
-Copyright:   1989-2018, GRASS Development Team
+Copyright:   1989-2019, GRASS Development Team
              2014-2018, Tereza Fiedlerova
+             2003-2018, Markus Neteler
              1992-2017, Helena Mitasova
              2003-2017, Glynn Clements
              2011-2017, Markus Metz
@@ -13,7 +14,6 @@ Copyright:   1989-2018, GRASS Development Team
              2011-2017, Vaclav Petras
  2012, 2014-2015, 2017, Luca Delucchi
                   2017, Maris Nartiss
-             2003-2016, Markus Neteler
              2012-2016, Anna Petrasova
                   2016, Adam Laza
                   2016, Zofie Cimburova

debian/gbp.conf

@@ -2,7 +2,7 @@
 
 # The default name for the upstream branch is "upstream".
 # Change it if the name is different (for instance, "master").
-upstream-branch = upstream
+upstream-branch = upstream-7.4
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").

debian/grass-gui.lintian-overrides

@@ -4,3 +4,6 @@ grass-gui: dependency-on-python-version-marked-for-end-of-life (Depends: python)
 # Not a problem
 grass-gui: package-contains-documentation-outside-usr-share-doc usr/lib/grass*/gui/wxpython/README
 
+# grass-gui.maintscript is used as recommended
+grass-gui: maintainer-script-should-not-use-dpkg-maintscript-helper *
+

debian/grass-gui.maintscript

+# Switch directories to symlinks (#776349)
+dir_to_symlink /usr/lib/grass64/etc/gui/icons /usr/share/grass64/etc/gui/icons 7.0.0~rc1-1~exp1~
+dir_to_symlink /usr/lib/grass64/etc/gui/images /usr/share/grass64/etc/gui/images 7.0.0~rc1-1~exp1~
+dir_to_symlink /usr/lib/grass64/bwidget/images /usr/share/grass64/bwidget/images 7.0.0~rc1-1~exp1~

debian/grass-gui.postinst

-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-# Switch directories to symlinks (#776349)
-if dpkg-maintscript-helper supports dir_to_symlink 2>/dev/null; then
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/etc/gui/icons /usr/share/grass64/etc/gui/icons 7.0.0~rc1-1~exp1~ -- "$@"
-
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/etc/gui/images /usr/share/grass64/etc/gui/images 7.0.0~rc1-1~exp1~ -- "$@"
-
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/bwidget/images /usr/share/grass64/bwidget/images 7.0.0~rc1-1~exp1~ -- "$@"
-fi

debian/grass-gui.postrm

-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-# Switch directories to symlinks (#776349)
-if dpkg-maintscript-helper supports dir_to_symlink 2>/dev/null; then
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/etc/gui/icons /usr/share/grass64/etc/gui/icons 7.0.0~rc1-1~exp1~ -- "$@"
-
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/etc/gui/images /usr/share/grass64/etc/gui/images 7.0.0~rc1-1~exp1~ -- "$@"
-
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/bwidget/images /usr/share/grass64/bwidget/images 7.0.0~rc1-1~exp1~ -- "$@"
-fi

debian/grass-gui.preinst

-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-# Switch directories to symlinks (#776349)
-if dpkg-maintscript-helper supports dir_to_symlink 2>/dev/null; then
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/etc/gui/icons /usr/share/grass64/etc/gui/icons 7.0.0~rc1-1~exp1~ -- "$@"
-
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/etc/gui/images /usr/share/grass64/etc/gui/images 7.0.0~rc1-1~exp1~ -- "$@"
-
-  dpkg-maintscript-helper dir_to_symlink \
-    /usr/lib/grass64/bwidget/images /usr/share/grass64/bwidget/images 7.0.0~rc1-1~exp1~ -- "$@"
-fi

display/d.legend.vect/main.c

@@ -23,7 +23,7 @@
 int main(int argc, char **argv)
 {
     struct GModule *module;
-//    struct Option *opt_input, *opt_sep;
+/*    struct Option *opt_input, *opt_sep; */
     struct Option *opt_at, *opt_cols, *opt_font, *opt_fontsize,
             *opt_fontcolor, *opt_title, *opt_tit_font, *opt_tit_fontsize, *opt_sub_font,
             *opt_sub_fontsize, *opt_bcolor, *opt_bgcolor, *opt_symb_size,

display/d.legend/draw.c

 /* draw.c:
  *    Compute position of legend, title, labels and ticks
  *    Extracted from original d.legend/main.c for background purpose
- *    Moving to seperate file: Adam Laza, GSoC 2016
+ *    Moving to separate file: Adam Laza, GSoC 2016
  *
  *    Copyright (C) 2014 by Hamish Bowman, and the GRASS Development Team*
  *    This program is free software under the GPL (>=v2)
@@ -895,7 +895,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines,
 
         /* Display sidebar histogram, if requested.
            /  In case of horizontal legend, maximum of histogram - max_hist
-           will efect the title position */
+           will affect the title position */
         max_hist = 0;
         if (histo->answer) {
             render_range.min = (DCELL) (fp ? dmin : min_ind);

display/d.vect/shape.c

@@ -183,7 +183,7 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist, const
 	    z_style = NULL;
 	}
         else if (rgb_column) {
-            /* this should not happend, zcolor and rgb_columns are mutually exclusive */
+            /* this should not happen, zcolor and rgb_columns are mutually exclusive */
 	    z_style = NULL;
         }
 	else {

doc/howto_release.txt

 How to release GRASS GIS binaries and source code
 
-$Date: 2018-10-22 22:53:05 +0200 (Mon, 22 Oct 2018) $
+$Date: 2018-11-26 23:17:47 +0100 (Mon, 26 Nov 2018) $
 
 Note: This text contains *some* rules only applicable to the
       development coordinator (currently Markus Neteler, PSC Chair).
@@ -134,8 +134,6 @@ echo grass-${VERSION}
 
 mkdir grass-${VERSION}
 mv * grass-${VERSION}/
-# do not include the debian control files:
-mv grass-${VERSION}/debian .
 # create the package:
 tar cvfzh grass-${VERSION}.tar.gz --exclude=.svn grass-${VERSION}/*
 # restore src code location:

doc/vector/v.example/main.c

@@ -6,7 +6,7 @@
  * AUTHOR(S):  GRASS Development Team, Radim Blazek, Maris Nartiss
  *
  * PURPOSE:    copies vector data from source map to destination map
- *             prints out all point coordinates and atributes
+ *             prints out all point coordinates and attributes
  *
  * COPYRIGHT:  (C) 2002-2009 by the GRASS Development Team
  *
@@ -226,6 +226,6 @@ int main(int argc, char *argv[])
     Vect_close(&Out);
     db_close_database_shutdown_driver(driver);
 
-    /* Don't forget to report to caller sucessfull end of data processing :) */
+    /* Don't forget to report to caller successful end of data processing :) */
     exit(EXIT_SUCCESS);
 }

general/g.region/printwindow.c

@@ -519,7 +519,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag)
     }
 
     /* flag.bbox
-       Calculate the largest bouding box in lat-lon coordinates 
+       Calculate the largest bounding box in lat-lon coordinates 
        and print it to stdout
      */
     if (print_flag & PRINT_MBBOX) {

general/g.rename/testsuite/test_overwrite.py

@@ -76,7 +76,7 @@ class RasterRenameTestCase(TestCase):
                 self.fail(msg)
 
     def test_overwrite_existing_raster(self):
-        """Test that existing raster is overriden if desired"""
+        """Test that existing raster is overridden if desired"""
         runivar_source = SimpleModule('r.univar', flags='g', map='rename_3')
         self.runModule(runivar_source, expecting_stdout=True)
         original_runivar_source = text_to_keyvalue(runivar_source.outputs.stdout,