Mike Gabriel · Mike Gabriel · Mike Gabriel · Mike Gabriel · Mike Gabriel · Mike Gabriel
--- a/debian/changelog
+++ b/debian/changelog
+mate-themes (3.22.20-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/{compat,control}:
+    + Use debhelper-compat notation. Bump to DH compat level version 12.
+  * debian/control:
+    + Bump Standards-Version: to 4.4.0. No changes needed.
+  * debian/copyright:
+    + Update copyright attributions.
+  * debian/rules:
+    + Manually remove /usr/share/locale/, as all subdirs are empty.
+      Translations go into the index.theme files.
+  * debian/mate-themes.lintian-overrides:
+    + Explain why mate-themes ships empty dir /usr/share/icons/default/.
+  * debian/rules:
+    + Remove various README files from the theme directories in bin:pkg
+      mate-themes.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sun, 21 Jul 2019 18:37:48 +0200
+
 mate-themes (3.22.18-1) unstable; urgency=medium

  * New upstream release.

--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,7 @@ Upstream-Name: MATE Themes
 Upstream-Contact: Martin Wimpress <martin@mate-desktop.org>
 Source: https://git.mate-desktop.org/mate-themes/

-Files: common/Makefile.am
-       common/mkiconlinks.sh
-       common/*.data
-       common/*.rc
-       cursor-themes/Makefile.am
+Files: cursor-themes/Makefile.am
       desktop-themes/Blue-Submarine/Makefile.am
       desktop-themes/Blue-Submarine/cinnamon/Makefile.am
       desktop-themes/Blue-Submarine/gtk-2.0/Makefile.am
@@ -18,6 +14,8 @@ Files: common/Makefile.am
       desktop-themes/Blue-Submarine/gtk-3.0/Makefile.am
       desktop-themes/Blue-Submarine/gtk-3.0/assets/Makefile.am
       desktop-themes/Blue-Submarine/metacity-1/Makefile.am
+       desktop-themes/Blue-Submarine-border/Makefile.am
+       desktop-themes/Blue-Submarine-border/metacity-1/Makefile.am
       desktop-themes/Green-Submarine/Makefile.am
       desktop-themes/Green-Submarine/cinnamon/Makefile.am
       desktop-themes/Green-Submarine/gtk-2.0/Makefile.am
@@ -28,6 +26,8 @@ Files: common/Makefile.am
       desktop-themes/Green-Submarine/gtk-3.0/Makefile.am
       desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am
       desktop-themes/Green-Submarine/metacity-1/Makefile.am
+       desktop-themes/Green-Submarine-border/Makefile.am
+       desktop-themes/Green-Submarine-border/metacity-1/Makefile.am
       desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am
       desktop-themes/TraditionalGreen/gtk-3.0/Makefile.am
       desktop-themes/TraditionalGreen/Makefile.am
@@ -50,6 +50,8 @@ Files: common/Makefile.am
       desktop-themes/BlackMATE/gtk-2.0/assets/Makefile.am
       desktop-themes/BlackMATE/gtk-2.0/Makefile.am
       desktop-themes/BlackMATE/metacity-1/Makefile.am
+       desktop-themes/BlackMATE-border/Makefile.am
+       desktop-themes/BlackMATE-border/metacity-1/Makefile.am
       desktop-themes/BlueMenta/cinnamon/Makefile.am
       desktop-themes/BlueMenta/gtk-3.0/borders/Makefile.am
       desktop-themes/BlueMenta/gtk-3.0/assets/Makefile.am
@@ -69,12 +71,16 @@ Files: common/Makefile.am
       desktop-themes/BlueMenta/gtk-2.0/apps/Others/Makefile.am
       desktop-themes/BlueMenta/gtk-2.0/apps/Caja/Makefile.am
       desktop-themes/BlueMenta/metacity-1/Makefile.am
+       desktop-themes/BlueMenta-border/Makefile.am
+       desktop-themes/BlueMenta-border/metacity-1/Makefile.am
       desktop-themes/GreenLaguna/gtk-3.0/assets/Makefile.am
       desktop-themes/GreenLaguna/gtk-3.0/Makefile.am
       desktop-themes/GreenLaguna/Makefile.am
       desktop-themes/GreenLaguna/gtk-2.0/Styles/Makefile.am
       desktop-themes/GreenLaguna/gtk-2.0/Makefile.am
       desktop-themes/GreenLaguna/metacity-1/Makefile.am
+       desktop-themes/GreenLaguna-border/Makefile.am
+       desktop-themes/GreenLaguna-border/metacity-1/Makefile.am
       desktop-themes/HighContrastInverse/Makefile.am
       desktop-themes/Menta/cinnamon/Makefile.am
       desktop-themes/Menta/gtk-3.0/borders/Makefile.am
@@ -95,6 +101,8 @@ Files: common/Makefile.am
       desktop-themes/Menta/gtk-2.0/apps/Others/Makefile.am
       desktop-themes/Menta/gtk-2.0/apps/Caja/Makefile.am
       desktop-themes/Menta/metacity-1/Makefile.am
+       desktop-themes/Menta-border/Makefile.am
+       desktop-themes/Menta-border/metacity-1/Makefile.am
       icon-themes/Makefile.am
       marco-themes/HighContrast/metacity-theme-1.xml
       marco-themes/Makefile.am
@@ -130,11 +138,16 @@ Comment:
 Please link to http://www.gnome.org where available.

 Files: desktop-themes/BlackMATE/*
+       desktop-themes/BlackMATE-border/*
       desktop-themes/GreenLaguna/*
+       desktop-themes/GreenLaguna-border/*
       desktop-themes/Menta/*
+       desktop-themes/Menta-border/*
       desktop-themes/TraditionalGreen/*
       desktop-themes/Blue-Submarine/*
+       desktop-themes/Blue-Submarine-border/*
       desktop-themes/Green-Submarine/*
+       desktop-themes/Green-Submarine-border/*
 Copyright: 2013, Wolfgang Ulbrich <chat-to-me@raveit.de>
 License: GPL-3+
 Comment:
@@ -157,6 +170,7 @@ Comment:
 Applying licenses as found in desktop-themes/*/COPYING.

 Files: desktop-themes/BlueMenta/*
+       desktop-themes/BlueMenta-border/*
 Copyright: 2007, Free Software Foundation, Inc.
 License: GPL-3+

@@ -215,7 +229,8 @@ License: LGPL-2.1+
 Comment:
 Applying license as found in COPYING file in this package's base folder.

-Files: .tx/config
+Files: .travis.yml
+       .tx/config
       AUTHORS
       COPYING
       ChangeLog

--- a/debian/mate-themes.dirs
+++ b/debian/mate-themes.dirs
 # required for update-alternatives
 # using /usr/share/icons/mate/cursor.theme to provide /usr/share/icons/default/index.theme (x-cursor-theme) in auto mode
 usr/share/icons/default/
-
-# FIXME: These empty dirs have to stay until Debian stretch+1.
-# See https://bugs.debian.org/792841
-usr/share/icons/ContrastHighLargePrintInverse/
-usr/share/icons/Fog/
-usr/share/icons/Quid/
--- a/debian/mate-themes.lintian-overrides
+++ b/debian/mate-themes.lintian-overrides
-# FIXME: These empty dirs have to stay until Debian stretch+1.
-# See https://bugs.debian.org/792841
-mate-themes: package-contains-empty-directory usr/share/icons/ContrastHighLargePrintInverse/
-mate-themes: package-contains-empty-directory usr/share/icons/Fog/
-mate-themes: package-contains-empty-directory usr/share/icons/Quid/
+# required for update-alternatives, using /usr/share/icons/mate/cursor.theme to provide /usr/share/icons/default/index.theme (x-cursor-theme) in auto mode
+mate-themes: package-contains-empty-directory usr/share/icons/default/
--- a/debian/mate-themes.prerm
+++ b/debian/mate-themes.prerm
@@ -8,11 +8,6 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
        /usr/share/icons/mate-black/cursor.theme

 	rm -f /usr/share/icons/ContrastHigh/icon-theme.cache
-	# FIXME: The below removals have to stay until stretch+1.
-	# See https://bugs.debian.org/792841
-	rm -f /usr/share/icons/ContrastHighLargePrintInverse/icon-theme.cache
-	rm -f /usr/share/icons/Fog/icon-theme.cache
-	rm -f /usr/share/icons/Quid/icon-theme.cache
 fi

 #DEBHELPER#
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,12 @@ override_dh_install:
 	# remove extra-license-file
 	rm -rfv debian/mate-themes/usr/share/themes/*/COPYING
 	rm -rfv debian/mate-themes/usr/share/themes/TraditionalOk/doc/gpl-3.0*.txt
+	rm -rfv debian/mate-themes/usr/share/locale/
+	rm  -fv debian/mate-themes/usr/share/themes/*/README
+	rm  -fv debian/mate-themes/usr/share/themes/BlueMenta/emerald/README
+	rm  -fv debian/mate-themes/usr/share/themes/Menta/emerald/README
+	rm  -fv debian/mate-themes/usr/share/themes/Menta/gtk-2.0/widgets/README
+	rm  -fv debian/mate-themes/usr/share/themes/TraditionalOk/xfwm4/README
 	# add cursor theme entries
 	cp debian/mate-white.theme debian/mate-themes/usr/share/icons/mate/cursor.theme
 	cp debian/mate-black.theme debian/mate-themes/usr/share/icons/mate-black/cursor.theme