[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#928163: unblock: mate-utils/1.20.2-3



Control: tags -1 - moreinfo

Hi Paul,

On  Di 30 Apr 2019 14:26:45 CEST, Paul Gevers wrote:

Control: tags -1 moreinfo

Hi Mike,

On Mon, 29 Apr 2019 21:00:57 +0000 Mike Gabriel
<mike.gabriel@das-netzwerkteam.de> wrote:
On  Mo 29 Apr 2019 21:28:54 CEST, Paul Gevers wrote:
> On Mon, 29 Apr 2019 08:35:24 +0200 Mike Gabriel
> <mike.gabriel@das-netzwerkteam.de> wrote:
>
> [...]
>
>> I am aware that mate-utils 1.20.2-2 never migrated to testing because of
>> this, so I ask for a specific exception here to unblock mate-utils. Thanks!
>
> In unblock bugs we request a debdiff against what is currently in
> buster, your debdiff is against the previous package in unstable. As you
> mentioned this includes a new upstream version, however at this stage of
> the freeze we hardly except new upstream versions. As I noted a big
> chuck of the delta is in translations, to make any change with this
> unblock please prepare a *reviewable* debdiff (using filterdiff and
> explaining which options you used) and explain the differences.
>
> I suggest you also already think about a targeted fix via
> testing-proposed-updates.
>
> Paul

I fully get the policy aspect of the above. A .debdiff against
mate-utils in testing is attached. It is massive, but its massiveness
is 99.9% l10n related. (The help pages of all the mate-utils apps have
been localized via Transifex).

In the release team we have tools to generate this diff as well, that is
how I noticed the huge amount of l10n. So it wasn't exactly the *full*
diff that I was asking, although I may have not been 100% clear. The
full diff is not review-able, so I will not unblock this as is. Please
filter the diff with filterdiff (please tell us which options you used)
to remove all the l10n stuff you deem irrelevant for this discussion.

Now I get what your want to have. An l10n filtered-out diff and an l10n+help-filtered-out diff are now attached. Cmdline options:

l10n-filtered.debdiff:
cat mate-utils_1.20.1-1_1.20.2-3.debdiff | filterdiff -x "*.po" -x "*.pot"

l10n+help-filtered.debdiff:
cat mate-utils_1.20.1-1_1.20.2-3.debdiff 2>/dev/null | filterdiff -x "*.po" -x "*.pot" -x "*/help/*" | grep -v "Binary files"

Then, look at the remaining debdiff and explain in detail what the
remaining changes are, such that we can judge it. Remember, we get quite
a lot of unblock requests and we don't know you package. Please help us
judge it.

The part of the upstream release that changed is mainly documentation ( help pages for the application + their translations). The upstream maintainers found some German phrases in the English-original help pages which they switched back to English. Also artwork (screenshots in help pages) were updated.

What then remains, if help pages are ignored, too is this:

```
diff -Nru mate-utils-1.20.1/configure.ac mate-utils-1.20.2/configure.ac
--- mate-utils-1.20.1/configure.ac	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/configure.ac	2018-12-26 09:58:05.000000000 +0100
@@ -1,6 +1,6 @@
 m4_define([mate_utils_major], [1])
 m4_define([mate_utils_minor], [20])
-m4_define([mate_utils_micro], [1])
+m4_define([mate_utils_micro], [2])

m4_define([mate_utils_version], [mate_utils_major.mate_utils_minor.mate_utils_micro])

```

 -> release bump

```
diff -Nru mate-utils-1.20.1/debian/changelog mate-utils-1.20.2/debian/changelog
--- mate-utils-1.20.1/debian/changelog	2018-07-08 02:59:27.000000000 +0200
+++ mate-utils-1.20.2/debian/changelog	2019-04-27 22:06:22.000000000 +0200
@@ -1,3 +1,33 @@
+mate-utils (1.20.2-3) unstable; urgency=medium
+
+  * debian/patches:
+    + Add 1001_fix-gsearchtool-pt-help-translation.patch.
+      Fix FTBFS caused by itstool. (Closes: #920408, #922734).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sat, 27 Apr 2019 22:06:22 +0200
+
+mate-utils (1.20.2-2) unstable; urgency=medium
+
+  * debian/rules:
+    + Don't build parallely. It fails. See upstream bug
+      https://github.com/mate-desktop/mate-utils/issues/211.
+      (Closes: #919058).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 14 Jan 2019 10:55:46 +0100
+
+mate-utils (1.20.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    + Bump Standards-Version: to 4.3.0. No changes needed.
+    + White-space clean-up at EOF.
+  * debian/copyright:
+    + Update copyright attributions.
+  * debian/libmatedict6.symbols:
+    + Add Build-Depends-Package: meta data field.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Wed, 09 Jan 2019 13:26:23 +0100
+
 mate-utils (1.20.1-1) unstable; urgency=medium

   * New upstream release.
```

-> debian/changelog, not commenting.

```
diff -Nru mate-utils-1.20.1/debian/control mate-utils-1.20.2/debian/control
--- mate-utils-1.20.1/debian/control	2018-06-11 08:56:39.000000000 +0200
+++ mate-utils-1.20.2/debian/control	2019-01-09 15:37:50.000000000 +0100
@@ -24,7 +24,7 @@
                xsltproc,
                yelp-tools,
                zlib1g-dev,
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Homepage: http://www.mate-desktop.org/
 Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-utils
 Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-utils.git
@@ -91,4 +91,3 @@
  dictionary is included in the MATE utilities bundle.
  .
  This package provides the development files of the MATE dictionary library.
-

```

 -> no changes needed for Standards-Version: Bump...

```
diff -Nru mate-utils-1.20.1/debian/copyright mate-utils-1.20.2/debian/copyright
--- mate-utils-1.20.1/debian/copyright	2018-07-08 02:59:27.000000000 +0200
+++ mate-utils-1.20.2/debian/copyright	2019-01-09 14:48:32.000000000 +0100
@@ -464,8 +464,12 @@
        README
        THANKS
        configure.ac
-       makepot
        autogen.sh
+       makepot
+       mate-dictionary.pot
+       mate-disk-usage-analyzer.pot
+       mate-search-tool.pot
+       mate-system-log.pot
 Copyright: *No copyright*
 License: GPL-2+ or LGPL-2.1+
 Comment:
```

-> updated copyright attributions

```
diff -Nru mate-utils-1.20.1/debian/libmatedict6.symbols mate-utils-1.20.2/debian/libmatedict6.symbols --- mate-utils-1.20.1/debian/libmatedict6.symbols 2014-12-11 07:07:23.000000000 +0100 +++ mate-utils-1.20.2/debian/libmatedict6.symbols 2019-01-09 15:38:37.000000000 +0100
@@ -1,4 +1,5 @@
 libmatedict.so.6 libmatedict6 #MINVER#
+* Build-Depends-Package: libmatedict-dev
  DBType@Base 1.8.0
  StratType@Base 1.8.0
  _gdict_database_new@Base 1.8.0
```

 -> introduce new Build-Depends-Package: field.

```
diff -Nru mate-utils-1.20.1/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch mate-utils-1.20.2/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch --- mate-utils-1.20.1/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch 1970-01-01 01:00:00.000000000 +0100 +++ mate-utils-1.20.2/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch 2019-04-25 13:40:46.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/gsearchtool/help/pt/pt.po
++++ b/gsearchtool/help/pt/pt.po
+@@ -201,6 +201,7 @@
+
+ #. (itstool) path: authorgroup/author
+ #: C/index.docbook:73
++#, fuzzy
+ msgid ""
+ "<firstname>Dennis</firstname> <surname>Cranston</surname> <affiliation> "
+ "<orgname>Search for Files Maintainer</orgname> <_:address-1/> </affiliation>" diff -Nru mate-utils-1.20.1/debian/patches/series mate-utils-1.20.2/debian/patches/series --- mate-utils-1.20.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ mate-utils-1.20.2/debian/patches/series 2019-04-25 13:36:17.000000000 +0200
@@ -0,0 +1 @@
+1001_fix-gsearchtool-pt-help-translation.patch
```

 -> the FTBFS patch for pt.po

```
diff -Nru mate-utils-1.20.1/debian/rules mate-utils-1.20.2/debian/rules
--- mate-utils-1.20.1/debian/rules	2018-02-14 16:07:59.000000000 +0100
+++ mate-utils-1.20.2/debian/rules	2019-01-14 10:52:56.000000000 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f

-DHFLAGS=--parallel
+DHFLAGS=--no-parallel

 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
```

-> first attempt to work around the itstool FTBFS issue, will be reverted with the next upload

```
diff -Nru mate-utils-1.20.1/Makefile.am mate-utils-1.20.2/Makefile.am
--- mate-utils-1.20.1/Makefile.am	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/Makefile.am	2018-12-26 09:58:05.000000000 +0100
@@ -24,7 +24,9 @@
 DISTCLEANFILES =                \
 	gtk-doc.make

-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-gtk-doc \
+	CFLAGS='-Wno-deprecated-declarations'

 # Build ChangeLog from GIT  history
 ChangeLog:
```

-> upstream change (only change on the code/build-tools): no deprecated APIs allowed anymore

```
diff -Nru mate-utils-1.20.1/makepot mate-utils-1.20.2/makepot
--- mate-utils-1.20.1/makepot	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/makepot	2018-12-26 09:58:05.000000000 +0100
@@ -1,5 +1,22 @@
 #! /bin/sh

 PACKAGE=mate-utils;
+DISK=mate-disk-usage-analyzer;
+SEARCH=mate-search-tool;
+LOG=mate-system-log;
+DICT=mate-dictionary;

+# main translations
 make -C po $PACKAGE.pot && mv po/$PACKAGE.pot .
+
+# mate-disk-usage-analyzer
+make -C baobab/help $DISK.pot && mv baobab/help/$DISK.pot .
+
+# mate-search-tool
+make -C gsearchtool/help $SEARCH.pot && mv gsearchtool/help/$SEARCH.pot .
+
+# mate-system-log
+make -C logview/help $LOG.pot && mv logview/help/$LOG.pot .
+
+# mate-dictionary
+make -C $DICT/help $DICT.pot && mv $DICT/help/$DICT.pot .
```

 -> upstream script for .pot file creation, newly translated help pages added

```
diff -Nru mate-utils-1.20.1/NEWS mate-utils-1.20.2/NEWS
--- mate-utils-1.20.1/NEWS	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/NEWS	2018-12-26 09:58:05.000000000 +0100
@@ -1,3 +1,17 @@
+### mate-utils 1.20.2
+
+  * Translations update
+  * disable deprecation warnings for distcheck
+  * Use make functions for HELP_LINGUAS
+  * Replace -Dokumentationsprojekt with Documentation Project
+  * Fix spelling and grammar mistakes
+  * Update Catalan sceenshots of mate-dictionary
+  * Add Catalan screenshots
+  * add mate-dictionary help to transifex
+  * add mate-system-log help to transifex
+  * add mate-search-tool help to transifex
+  * add mate-disk-usage-analyzer to transifex
+
 ### mate-utils 1.20.1

   * Translations update
```

  -> upstream ChangeLog

```
diff -Nru mate-utils-1.20.1/.tx/config mate-utils-1.20.2/.tx/config
--- mate-utils-1.20.1/.tx/config	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/.tx/config	2018-12-26 09:58:05.000000000 +0100
@@ -3,7 +3,35 @@

 [MATE.1-20--mate-utils]
 file_filter = po/<lang>.po
-source_file = po/mate-utils.pot
+source_file = mate-utils.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-disk-usage-analyzer-user-guide]
+file_filter = baobab/help/<lang>/<lang>.po
+source_file = mate-disk-usage-analyzer.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-search-tool-user-guide]
+file_filter = gsearchtool/help/<lang>/<lang>.po
+source_file = mate-search-tool.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-system-log-user-guide]
+file_filter = logview/help/<lang>/<lang>.po
+source_file = mate-system-log.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-dictionary-user-guide]
+file_filter = mate-dictionary/help/<lang>/<lang>.po
+source_file = mate-dictionary.pot
 source_lang = en
 type = PO
 minimum_perc = 2
```

  -> Transifex configuration

Please consider, that the MATE upstream people did a 1.20.x point
release series for many MATE components, mate-utils amongst it. Only
problem was the FTBFS in pt.po of gsearchtool. (I apologize for my
slowness in finding the FTBFS fix!!!).

So, all MATE components in buster are from the last upstream point
release, it would be good to have mate-utils 1.20.2-3 in buster, too,
so all MATE components align well and in harmony as intended by
upstream.

What will break if we don't align the packages? I guess nothing,
otherwise you should probably fix the relations between the packages to
include the proper versions.

I guess, nothing will break. The upstream release is mainly a localization release for the documentation shipped with the various applications bundled in mate-utils. It would be more a matter of coherence with other MATE components (which had these l10n releases, too, shortly before the freeze).

Mike


--

DAS-NETZWERKTEAM
c\o Technik- und Ökologiezentrum Eckernförde
Mike Gabriel, Marienthaler str. 17, 24340 Eckernförde
mobile: +49 (1520) 1976 148
landline: +49 (4354) 8390 139

GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22  0782 9AF4 6B30 2577 1B31
mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de

diff -Nru mate-utils-1.20.1/baobab/help/C/index.docbook mate-utils-1.20.2/baobab/help/C/index.docbook
--- mate-utils-1.20.1/baobab/help/C/index.docbook	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/baobab/help/C/index.docbook	2018-12-26 09:58:05.000000000 +0100
@@ -29,7 +29,7 @@
 
     <copyright lang="en"> 
       <year>2015</year> 
-      <holder>MATE-Dokumentationsprojekt</holder> 
+      <holder>MATE Documentation Project</holder>
     </copyright>
     <copyright> 
       <year>2006</year> 
@@ -44,10 +44,10 @@
 
    -->
     <publisher> 
-      <publishername>MATE-Dokumentationsprojekt</publishername> 
+      <publishername>MATE Documentation Project</publishername>
     </publisher> 
     <publisher> 
-      <publishername>GNOME-Dokumentationsprojekt</publishername> 
+      <publishername>GNOME Documentation Project</publishername>
     </publisher> 
 
    &legal;
@@ -128,7 +128,7 @@
   </articleinfo> 
 
   <indexterm> 
-    <primary>Disk Usage Analyser</primary> 
+    <primary>Disk Usage Analyzer</primary>
   </indexterm> 
 
 <!-- ============= Document Body ============================= -->
@@ -138,7 +138,7 @@
     <title>Introduction</title> 
 
       <para><application>&app;</application> is a graphical, menu-driven
-      application to analyse disk usage in any Mate environment. <application>&app;</application> can easily scan 
+      application to analyze disk usage in any Mate environment. <application>&app;</application> can easily scan
        either the whole filesystem tree, or a specific user-requested directory 
        branch (local or remote). </para>
        <para>It also auto-detects in real-time any changes 
@@ -438,8 +438,8 @@
       folder with no further subfolders is selected to be the root of 
       the partial tree, only the inner circle will be drawn. When the 
       mouse pointer hovers one of the folders in the graphic, it will be
-      highlighted and a tooltip will appears with information about its 
-      name and size. If there are any subfolders, small grey tooltips 
+      highlighted and a tooltip will appear with information about its
+      name and size. If there are any subfolders, small gray tooltips
       will appear, indicating their names. It's possible that not all of
       the subfolders' names are displayed, to avoid overlappings.</para>
 
@@ -452,10 +452,10 @@
       setting the root of the graphic to that folder. If you press the 
       middle button (no matter the place as long as you click inside the 
       <guilabel>ringschart</guilabel> frame) you'll get the opposite 
-      behaviour, going back one step in the hierarchy.</para>
+      behavior, going back one step in the hierarchy.</para>
 
     <para>The percentage of its parent's radius that is used by a given
-      folder is directly proportional to the relation between it's own
+      folder is directly proportional to the relation between its own
       size and its parent's. It's easy to understand that the size of 
       a folder is equal or smaller than its parent's. Although only 
       directories are shown in this graphical representation, files are 
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/baobab/help/ca/figures/baobab_fullscan.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/baobab/help/ca/figures/baobab_fullscan.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/baobab/help/ca/figures/baobab_prefs.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/baobab/help/ca/figures/baobab_prefs.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/baobab/help/ca/figures/baobab_remote.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/baobab/help/ca/figures/baobab_remote.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/baobab/help/ca/figures/baobab_ringschart1.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/baobab/help/ca/figures/baobab_ringschart1.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/baobab/help/ca/figures/baobab_ringschart2.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/baobab/help/ca/figures/baobab_ringschart2.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/baobab/help/ca/figures/baobab_treemaps.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/baobab/help/ca/figures/baobab_treemaps.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/baobab/help/ca/figures/baobab_window.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/baobab/help/ca/figures/baobab_window.png differ
diff -Nru mate-utils-1.20.1/baobab/help/Makefile.am mate-utils-1.20.2/baobab/help/Makefile.am
--- mate-utils-1.20.1/baobab/help/Makefile.am	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/baobab/help/Makefile.am	2018-12-26 09:58:05.000000000 +0100
@@ -3,8 +3,6 @@
 HELP_ID = mate-disk-usage-analyzer
 HELP_FILES = index.docbook legal.xml
 
-HELP_LINGUAS = ca cs da de el en_GB es eu fi fr it oc pl ru sv uk zh_CN zh_HK zh_TW
-
 HELP_MEDIA =                       \
 	figures/baobab_fullscan.png    \
 	figures/baobab_prefs.png       \
@@ -13,3 +11,9 @@
 	figures/baobab_ringschart2.png \
 	figures/baobab_treemaps.png    \
 	figures/baobab_window.png
+
+# Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
+IGNORE_HELP_LINGUAS =
+HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
+	$(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
+	$(subst /,,$(dir $(wildcard */*.po))) )
diff -Nru mate-utils-1.20.1/configure.ac mate-utils-1.20.2/configure.ac
--- mate-utils-1.20.1/configure.ac	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/configure.ac	2018-12-26 09:58:05.000000000 +0100
@@ -1,6 +1,6 @@
 m4_define([mate_utils_major], [1])
 m4_define([mate_utils_minor], [20])
-m4_define([mate_utils_micro], [1])
+m4_define([mate_utils_micro], [2])
 
 m4_define([mate_utils_version], [mate_utils_major.mate_utils_minor.mate_utils_micro])
 
diff -Nru mate-utils-1.20.1/debian/changelog mate-utils-1.20.2/debian/changelog
--- mate-utils-1.20.1/debian/changelog	2018-07-08 02:59:27.000000000 +0200
+++ mate-utils-1.20.2/debian/changelog	2019-04-27 22:06:22.000000000 +0200
@@ -1,3 +1,33 @@
+mate-utils (1.20.2-3) unstable; urgency=medium
+
+  * debian/patches:
+    + Add 1001_fix-gsearchtool-pt-help-translation.patch.
+      Fix FTBFS caused by itstool. (Closes: #920408, #922734).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sat, 27 Apr 2019 22:06:22 +0200
+
+mate-utils (1.20.2-2) unstable; urgency=medium
+
+  * debian/rules:
+    + Don't build parallely. It fails. See upstream bug
+      https://github.com/mate-desktop/mate-utils/issues/211.
+      (Closes: #919058).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 14 Jan 2019 10:55:46 +0100
+
+mate-utils (1.20.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    + Bump Standards-Version: to 4.3.0. No changes needed.
+    + White-space clean-up at EOF.
+  * debian/copyright:
+    + Update copyright attributions.
+  * debian/libmatedict6.symbols:
+    + Add Build-Depends-Package: meta data field.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Wed, 09 Jan 2019 13:26:23 +0100
+
 mate-utils (1.20.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru mate-utils-1.20.1/debian/control mate-utils-1.20.2/debian/control
--- mate-utils-1.20.1/debian/control	2018-06-11 08:56:39.000000000 +0200
+++ mate-utils-1.20.2/debian/control	2019-01-09 15:37:50.000000000 +0100
@@ -24,7 +24,7 @@
                xsltproc,
                yelp-tools,
                zlib1g-dev,
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Homepage: http://www.mate-desktop.org/
 Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-utils
 Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-utils.git
@@ -91,4 +91,3 @@
  dictionary is included in the MATE utilities bundle.
  .
  This package provides the development files of the MATE dictionary library.
-
diff -Nru mate-utils-1.20.1/debian/copyright mate-utils-1.20.2/debian/copyright
--- mate-utils-1.20.1/debian/copyright	2018-07-08 02:59:27.000000000 +0200
+++ mate-utils-1.20.2/debian/copyright	2019-01-09 14:48:32.000000000 +0100
@@ -464,8 +464,12 @@
        README
        THANKS
        configure.ac
-       makepot
        autogen.sh
+       makepot
+       mate-dictionary.pot
+       mate-disk-usage-analyzer.pot
+       mate-search-tool.pot
+       mate-system-log.pot
 Copyright: *No copyright*
 License: GPL-2+ or LGPL-2.1+
 Comment:
diff -Nru mate-utils-1.20.1/debian/libmatedict6.symbols mate-utils-1.20.2/debian/libmatedict6.symbols
--- mate-utils-1.20.1/debian/libmatedict6.symbols	2014-12-11 07:07:23.000000000 +0100
+++ mate-utils-1.20.2/debian/libmatedict6.symbols	2019-01-09 15:38:37.000000000 +0100
@@ -1,4 +1,5 @@
 libmatedict.so.6 libmatedict6 #MINVER#
+* Build-Depends-Package: libmatedict-dev
  DBType@Base 1.8.0
  StratType@Base 1.8.0
  _gdict_database_new@Base 1.8.0
diff -Nru mate-utils-1.20.1/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch mate-utils-1.20.2/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch
--- mate-utils-1.20.1/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.20.2/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch	2019-04-25 13:40:46.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/gsearchtool/help/pt/pt.po
++++ b/gsearchtool/help/pt/pt.po
+@@ -201,6 +201,7 @@
+ 
+ #. (itstool) path: authorgroup/author
+ #: C/index.docbook:73
++#, fuzzy
+ msgid ""
+ "<firstname>Dennis</firstname> <surname>Cranston</surname> <affiliation> "
+ "<orgname>Search for Files Maintainer</orgname> <_:address-1/> </affiliation>"
diff -Nru mate-utils-1.20.1/debian/patches/series mate-utils-1.20.2/debian/patches/series
--- mate-utils-1.20.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.20.2/debian/patches/series	2019-04-25 13:36:17.000000000 +0200
@@ -0,0 +1 @@
+1001_fix-gsearchtool-pt-help-translation.patch
diff -Nru mate-utils-1.20.1/debian/rules mate-utils-1.20.2/debian/rules
--- mate-utils-1.20.1/debian/rules	2018-02-14 16:07:59.000000000 +0100
+++ mate-utils-1.20.2/debian/rules	2019-01-14 10:52:56.000000000 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DHFLAGS=--parallel
+DHFLAGS=--no-parallel
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
diff -Nru mate-utils-1.20.1/gsearchtool/help/C/index.docbook mate-utils-1.20.2/gsearchtool/help/C/index.docbook
--- mate-utils-1.20.1/gsearchtool/help/C/index.docbook	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/gsearchtool/help/C/index.docbook	2018-12-26 09:58:05.000000000 +0100
@@ -30,7 +30,7 @@
 
     <copyright lang="en"> 
       <year>2015</year> 
-      <holder>MATE-Dokumentationsprojekt</holder> 
+      <holder>MATE Documentation Project</holder>
     </copyright>
     <copyright> 
       <year>2005</year> 
@@ -55,10 +55,10 @@
 
    -->
     <publisher> 
-      <publishername>MATE-Dokumentationsprojekt</publishername> 
+      <publishername>MATE Documentation Project</publishername>
     </publisher> 
     <publisher> 
-      <publishername> GNOME Documentation Project </publishername> 
+      <publishername>GNOME Documentation Project</publishername>
     </publisher> 
 
    &legal;
@@ -429,7 +429,7 @@
 				  <entry> 
 					 <para>Name does not contain</para></entry> 
 				  <entry> 
-					 <para>Search for filenames that do not contain the string that you enter. Enter a full filename or a partial filename with wildcards in the field provided. Use * to indicate a sequence of characters. Use ? to indicate a single character. The search is case sensitive.</para></entry>  
+					 <para>Search for filenames that do not contain the string that you enter. Enter a full filename or a partial filename with wildcards in the field provided. Use * to indicate a sequence of characters. Use ? to indicate a single character. The search is case-sensitive.</para></entry>
 				</row> 
 				<row valign="top"> 
 				  <entry> 
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/gsearchtool/help/ca/figures/mate-search-tool_window.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/gsearchtool/help/ca/figures/mate-search-tool_window.png differ
diff -Nru mate-utils-1.20.1/gsearchtool/help/Makefile.am mate-utils-1.20.2/gsearchtool/help/Makefile.am
--- mate-utils-1.20.1/gsearchtool/help/Makefile.am	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/gsearchtool/help/Makefile.am	2018-12-26 09:58:05.000000000 +0100
@@ -3,6 +3,10 @@
 HELP_ID = mate-search-tool
 HELP_FILES = index.docbook legal.xml
 
-HELP_LINGUAS = ca cs de el en_GB es eu fi fr it ko oc ru sv uk zh_CN
-
 HELP_MEDIA = figures/mate-search-tool_window.png
+
+# Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
+IGNORE_HELP_LINGUAS = ca@valencia
+HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
+	$(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
+	$(subst /,,$(dir $(wildcard */*.po))) )
diff -Nru mate-utils-1.20.1/logview/help/C/index.docbook mate-utils-1.20.2/logview/help/C/index.docbook
--- mate-utils-1.20.1/logview/help/C/index.docbook	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/logview/help/C/index.docbook	2018-12-26 09:58:05.000000000 +0100
@@ -29,7 +29,7 @@
 
     <copyright lang="en"> 
       <year>2015</year> 
-      <holder>MATE-Dokumentationsprojekt</holder> 
+      <holder>MATE Documentation Project</holder>
     </copyright>
     <copyright> 
       <year>2003</year> 
@@ -48,10 +48,10 @@
 
    -->
     <publisher> 
-      <publishername>MATE-Dokumentationsprojekt</publishername> 
+      <publishername>MATE Documentation Project</publishername>
     </publisher> 
     <publisher> 
-      <publishername>GNOME-Dokumentationsprojekt</publishername> 
+      <publishername>GNOME Documentation Project</publishername>
     </publisher> 
 
    &legal;
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/logview/help/ca/figures/syslog_window.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/logview/help/ca/figures/syslog_window.png differ
diff -Nru mate-utils-1.20.1/logview/help/Makefile.am mate-utils-1.20.2/logview/help/Makefile.am
--- mate-utils-1.20.1/logview/help/Makefile.am	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/logview/help/Makefile.am	2018-12-26 09:58:05.000000000 +0100
@@ -5,4 +5,8 @@
 HELP_MEDIA = \
 	figures/syslog_window.png
 
-HELP_LINGUAS = ca cs de el en_GB es eu fi fr it ko oc ru sv uk zh_CN
+# Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
+IGNORE_HELP_LINGUAS =
+HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
+	$(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
+	$(subst /,,$(dir $(wildcard */*.po))) )
diff -Nru mate-utils-1.20.1/Makefile.am mate-utils-1.20.2/Makefile.am
--- mate-utils-1.20.1/Makefile.am	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/Makefile.am	2018-12-26 09:58:05.000000000 +0100
@@ -24,7 +24,9 @@
 DISTCLEANFILES =                \
 	gtk-doc.make
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-gtk-doc \
+	CFLAGS='-Wno-deprecated-declarations'
 
 # Build ChangeLog from GIT  history
 ChangeLog:
diff -Nru mate-utils-1.20.1/makepot mate-utils-1.20.2/makepot
--- mate-utils-1.20.1/makepot	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/makepot	2018-12-26 09:58:05.000000000 +0100
@@ -1,5 +1,22 @@
 #! /bin/sh
 
 PACKAGE=mate-utils;
+DISK=mate-disk-usage-analyzer;
+SEARCH=mate-search-tool;
+LOG=mate-system-log;
+DICT=mate-dictionary;
 
+# main translations
 make -C po $PACKAGE.pot && mv po/$PACKAGE.pot .
+
+# mate-disk-usage-analyzer
+make -C baobab/help $DISK.pot && mv baobab/help/$DISK.pot .
+
+# mate-search-tool
+make -C gsearchtool/help $SEARCH.pot && mv gsearchtool/help/$SEARCH.pot .
+
+# mate-system-log
+make -C logview/help $LOG.pot && mv logview/help/$LOG.pot .
+
+# mate-dictionary
+make -C $DICT/help $DICT.pot && mv $DICT/help/$DICT.pot .
diff -Nru mate-utils-1.20.1/mate-dictionary/help/C/index.docbook mate-utils-1.20.2/mate-dictionary/help/C/index.docbook
--- mate-utils-1.20.1/mate-dictionary/help/C/index.docbook	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/mate-dictionary/help/C/index.docbook	2018-12-26 09:58:05.000000000 +0100
@@ -32,7 +32,7 @@
 
     <copyright lang="en">
       <year>2015</year> 
-      <holder>MATE-Dokumentationsprojekt</holder> 
+      <holder>MATE Documentation Project</holder>
     </copyright>   
     <copyright>
       <year>2005</year>
@@ -49,10 +49,10 @@
    -->
    
     <publisher>
-      <publishername>MATE-Dokumentationsprojekt</publishername> 
+      <publishername>MATE Documentation Project</publishername>
     </publisher> 
     <publisher> 
-      <publishername>GNOME-Dokumentationsprojekt</publishername> 
+      <publishername>GNOME Documentation Project</publishername>
     </publisher>
    &legal;
 
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/mate-dictionary/help/ca/figures/mate-dictionary-add-source.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/mate-dictionary/help/ca/figures/mate-dictionary-add-source.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/mate-dictionary/help/ca/figures/mate-dictionary-applet.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/mate-dictionary/help/ca/figures/mate-dictionary-applet.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/mate-dictionary/help/ca/figures/mate-dictionary-applet-window.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/mate-dictionary/help/ca/figures/mate-dictionary-applet-window.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/mate-dictionary/help/ca/figures/mate-dictionary-application.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/mate-dictionary/help/ca/figures/mate-dictionary-application.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/mate-dictionary/help/ca/figures/mate-dictionary-find.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/mate-dictionary/help/ca/figures/mate-dictionary-find.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/mate-dictionary/help/ca/figures/mate-dictionary-lookup.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/mate-dictionary/help/ca/figures/mate-dictionary-lookup.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/mate-dictionary/help/ca/figures/mate-dictionary-preferences-print.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/mate-dictionary/help/ca/figures/mate-dictionary-preferences-print.png differ
Binary files /tmp/QAqzoj0hOu/mate-utils-1.20.1/mate-dictionary/help/ca/figures/mate-dictionary-preferences-source.png and /tmp/UMRrKdkNpZ/mate-utils-1.20.2/mate-dictionary/help/ca/figures/mate-dictionary-preferences-source.png differ
diff -Nru mate-utils-1.20.1/mate-dictionary/help/Makefile.am mate-utils-1.20.2/mate-dictionary/help/Makefile.am
--- mate-utils-1.20.1/mate-dictionary/help/Makefile.am	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/mate-dictionary/help/Makefile.am	2018-12-26 09:58:05.000000000 +0100
@@ -3,8 +3,6 @@
 HELP_ID = mate-dictionary
 HELP_FILES = index.docbook legal.xml
 
-HELP_LINGUAS = ca cs da de el en_GB es eu fi fr it oc ru sv uk zh_CN
-
 HELP_MEDIA =                                      \
 	figures/mate-dictionary-add-source.png        \
 	figures/mate-dictionary-applet.png            \
@@ -14,3 +12,9 @@
 	figures/mate-dictionary-lookup.png            \
 	figures/mate-dictionary-preferences-print.png \
 	figures/mate-dictionary-preferences-source.png
+
+# Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
+IGNORE_HELP_LINGUAS =
+HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
+	$(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
+	$(subst /,,$(dir $(wildcard */*.po))) )
diff -Nru mate-utils-1.20.1/NEWS mate-utils-1.20.2/NEWS
--- mate-utils-1.20.1/NEWS	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/NEWS	2018-12-26 09:58:05.000000000 +0100
@@ -1,3 +1,17 @@
+### mate-utils 1.20.2
+
+  * Translations update
+  * disable deprecation warnings for distcheck
+  * Use make functions for HELP_LINGUAS
+  * Replace -Dokumentationsprojekt with Documentation Project
+  * Fix spelling and grammar mistakes
+  * Update Catalan sceenshots of mate-dictionary
+  * Add Catalan screenshots
+  * add mate-dictionary help to transifex
+  * add mate-system-log help to transifex
+  * add mate-search-tool help to transifex
+  * add mate-disk-usage-analyzer to transifex
+
 ### mate-utils 1.20.1
 
   * Translations update
diff -Nru mate-utils-1.20.1/.tx/config mate-utils-1.20.2/.tx/config
--- mate-utils-1.20.1/.tx/config	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/.tx/config	2018-12-26 09:58:05.000000000 +0100
@@ -3,7 +3,35 @@
  
 [MATE.1-20--mate-utils]
 file_filter = po/<lang>.po
-source_file = po/mate-utils.pot
+source_file = mate-utils.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-disk-usage-analyzer-user-guide]
+file_filter = baobab/help/<lang>/<lang>.po
+source_file = mate-disk-usage-analyzer.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-search-tool-user-guide]
+file_filter = gsearchtool/help/<lang>/<lang>.po
+source_file = mate-search-tool.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-system-log-user-guide]
+file_filter = logview/help/<lang>/<lang>.po
+source_file = mate-system-log.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-dictionary-user-guide]
+file_filter = mate-dictionary/help/<lang>/<lang>.po
+source_file = mate-dictionary.pot
 source_lang = en
 type = PO
 minimum_perc = 2
diff -Nru mate-utils-1.20.1/configure.ac mate-utils-1.20.2/configure.ac
--- mate-utils-1.20.1/configure.ac	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/configure.ac	2018-12-26 09:58:05.000000000 +0100
@@ -1,6 +1,6 @@
 m4_define([mate_utils_major], [1])
 m4_define([mate_utils_minor], [20])
-m4_define([mate_utils_micro], [1])
+m4_define([mate_utils_micro], [2])
 
 m4_define([mate_utils_version], [mate_utils_major.mate_utils_minor.mate_utils_micro])
 
diff -Nru mate-utils-1.20.1/debian/changelog mate-utils-1.20.2/debian/changelog
--- mate-utils-1.20.1/debian/changelog	2018-07-08 02:59:27.000000000 +0200
+++ mate-utils-1.20.2/debian/changelog	2019-04-27 22:06:22.000000000 +0200
@@ -1,3 +1,33 @@
+mate-utils (1.20.2-3) unstable; urgency=medium
+
+  * debian/patches:
+    + Add 1001_fix-gsearchtool-pt-help-translation.patch.
+      Fix FTBFS caused by itstool. (Closes: #920408, #922734).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sat, 27 Apr 2019 22:06:22 +0200
+
+mate-utils (1.20.2-2) unstable; urgency=medium
+
+  * debian/rules:
+    + Don't build parallely. It fails. See upstream bug
+      https://github.com/mate-desktop/mate-utils/issues/211.
+      (Closes: #919058).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 14 Jan 2019 10:55:46 +0100
+
+mate-utils (1.20.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    + Bump Standards-Version: to 4.3.0. No changes needed.
+    + White-space clean-up at EOF.
+  * debian/copyright:
+    + Update copyright attributions.
+  * debian/libmatedict6.symbols:
+    + Add Build-Depends-Package: meta data field.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Wed, 09 Jan 2019 13:26:23 +0100
+
 mate-utils (1.20.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru mate-utils-1.20.1/debian/control mate-utils-1.20.2/debian/control
--- mate-utils-1.20.1/debian/control	2018-06-11 08:56:39.000000000 +0200
+++ mate-utils-1.20.2/debian/control	2019-01-09 15:37:50.000000000 +0100
@@ -24,7 +24,7 @@
                xsltproc,
                yelp-tools,
                zlib1g-dev,
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Homepage: http://www.mate-desktop.org/
 Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-utils
 Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-utils.git
@@ -91,4 +91,3 @@
  dictionary is included in the MATE utilities bundle.
  .
  This package provides the development files of the MATE dictionary library.
-
diff -Nru mate-utils-1.20.1/debian/copyright mate-utils-1.20.2/debian/copyright
--- mate-utils-1.20.1/debian/copyright	2018-07-08 02:59:27.000000000 +0200
+++ mate-utils-1.20.2/debian/copyright	2019-01-09 14:48:32.000000000 +0100
@@ -464,8 +464,12 @@
        README
        THANKS
        configure.ac
-       makepot
        autogen.sh
+       makepot
+       mate-dictionary.pot
+       mate-disk-usage-analyzer.pot
+       mate-search-tool.pot
+       mate-system-log.pot
 Copyright: *No copyright*
 License: GPL-2+ or LGPL-2.1+
 Comment:
diff -Nru mate-utils-1.20.1/debian/libmatedict6.symbols mate-utils-1.20.2/debian/libmatedict6.symbols
--- mate-utils-1.20.1/debian/libmatedict6.symbols	2014-12-11 07:07:23.000000000 +0100
+++ mate-utils-1.20.2/debian/libmatedict6.symbols	2019-01-09 15:38:37.000000000 +0100
@@ -1,4 +1,5 @@
 libmatedict.so.6 libmatedict6 #MINVER#
+* Build-Depends-Package: libmatedict-dev
  DBType@Base 1.8.0
  StratType@Base 1.8.0
  _gdict_database_new@Base 1.8.0
diff -Nru mate-utils-1.20.1/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch mate-utils-1.20.2/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch
--- mate-utils-1.20.1/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.20.2/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch	2019-04-25 13:40:46.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/gsearchtool/help/pt/pt.po
++++ b/gsearchtool/help/pt/pt.po
+@@ -201,6 +201,7 @@
+ 
+ #. (itstool) path: authorgroup/author
+ #: C/index.docbook:73
++#, fuzzy
+ msgid ""
+ "<firstname>Dennis</firstname> <surname>Cranston</surname> <affiliation> "
+ "<orgname>Search for Files Maintainer</orgname> <_:address-1/> </affiliation>"
diff -Nru mate-utils-1.20.1/debian/patches/series mate-utils-1.20.2/debian/patches/series
--- mate-utils-1.20.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.20.2/debian/patches/series	2019-04-25 13:36:17.000000000 +0200
@@ -0,0 +1 @@
+1001_fix-gsearchtool-pt-help-translation.patch
diff -Nru mate-utils-1.20.1/debian/rules mate-utils-1.20.2/debian/rules
--- mate-utils-1.20.1/debian/rules	2018-02-14 16:07:59.000000000 +0100
+++ mate-utils-1.20.2/debian/rules	2019-01-14 10:52:56.000000000 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DHFLAGS=--parallel
+DHFLAGS=--no-parallel
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
diff -Nru mate-utils-1.20.1/Makefile.am mate-utils-1.20.2/Makefile.am
--- mate-utils-1.20.1/Makefile.am	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/Makefile.am	2018-12-26 09:58:05.000000000 +0100
@@ -24,7 +24,9 @@
 DISTCLEANFILES =                \
 	gtk-doc.make
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-gtk-doc \
+	CFLAGS='-Wno-deprecated-declarations'
 
 # Build ChangeLog from GIT  history
 ChangeLog:
diff -Nru mate-utils-1.20.1/makepot mate-utils-1.20.2/makepot
--- mate-utils-1.20.1/makepot	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/makepot	2018-12-26 09:58:05.000000000 +0100
@@ -1,5 +1,22 @@
 #! /bin/sh
 
 PACKAGE=mate-utils;
+DISK=mate-disk-usage-analyzer;
+SEARCH=mate-search-tool;
+LOG=mate-system-log;
+DICT=mate-dictionary;
 
+# main translations
 make -C po $PACKAGE.pot && mv po/$PACKAGE.pot .
+
+# mate-disk-usage-analyzer
+make -C baobab/help $DISK.pot && mv baobab/help/$DISK.pot .
+
+# mate-search-tool
+make -C gsearchtool/help $SEARCH.pot && mv gsearchtool/help/$SEARCH.pot .
+
+# mate-system-log
+make -C logview/help $LOG.pot && mv logview/help/$LOG.pot .
+
+# mate-dictionary
+make -C $DICT/help $DICT.pot && mv $DICT/help/$DICT.pot .
diff -Nru mate-utils-1.20.1/NEWS mate-utils-1.20.2/NEWS
--- mate-utils-1.20.1/NEWS	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/NEWS	2018-12-26 09:58:05.000000000 +0100
@@ -1,3 +1,17 @@
+### mate-utils 1.20.2
+
+  * Translations update
+  * disable deprecation warnings for distcheck
+  * Use make functions for HELP_LINGUAS
+  * Replace -Dokumentationsprojekt with Documentation Project
+  * Fix spelling and grammar mistakes
+  * Update Catalan sceenshots of mate-dictionary
+  * Add Catalan screenshots
+  * add mate-dictionary help to transifex
+  * add mate-system-log help to transifex
+  * add mate-search-tool help to transifex
+  * add mate-disk-usage-analyzer to transifex
+
 ### mate-utils 1.20.1
 
   * Translations update
diff -Nru mate-utils-1.20.1/.tx/config mate-utils-1.20.2/.tx/config
--- mate-utils-1.20.1/.tx/config	2018-06-19 13:26:34.000000000 +0200
+++ mate-utils-1.20.2/.tx/config	2018-12-26 09:58:05.000000000 +0100
@@ -3,7 +3,35 @@
  
 [MATE.1-20--mate-utils]
 file_filter = po/<lang>.po
-source_file = po/mate-utils.pot
+source_file = mate-utils.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-disk-usage-analyzer-user-guide]
+file_filter = baobab/help/<lang>/<lang>.po
+source_file = mate-disk-usage-analyzer.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-search-tool-user-guide]
+file_filter = gsearchtool/help/<lang>/<lang>.po
+source_file = mate-search-tool.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-system-log-user-guide]
+file_filter = logview/help/<lang>/<lang>.po
+source_file = mate-system-log.pot
+source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--mate-dictionary-user-guide]
+file_filter = mate-dictionary/help/<lang>/<lang>.po
+source_file = mate-dictionary.pot
 source_lang = en
 type = PO
 minimum_perc = 2

Attachment: pgpq6VnKGsJMp.pgp
Description: Digitale PGP-Signatur


Reply to: