Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-tweak
Commits:
-
fbf20b49
by Mike Gabriel at 2023-12-26T11:05:32+01:00
-
bc89b599
by Mike Gabriel at 2023-12-26T11:05:32+01:00
-
1bb12601
by Mike Gabriel at 2023-12-26T11:05:32+01:00
-
083b613f
by Mike Gabriel at 2023-12-26T11:05:32+01:00
-
28275047
by Mike Gabriel at 2023-12-26T11:05:32+01:00
-
d30b8c60
by Mike Gabriel at 2023-12-26T11:06:50+01:00
6 changed files:
- debian/changelog
- debian/copyright
- debian/mate-tweak.lintian-overrides
- + debian/patches/1001_fix-clean-i18n.patch
- + debian/patches/series
- debian/rules
Changes:
| 1 | +mate-tweak (22.10.0-3) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * debian/patches:
|
|
| 4 | + + Add 1001_fix-clean-i18n.patch. The clean_i18n command is not compatible
|
|
| 5 | + anymore with distutils's clean command. (Closes: #1054796).
|
|
| 6 | + * debian/rules:
|
|
| 7 | + + Call 'setup.py clean_i18n' manually.
|
|
| 8 | + + Create backup copy of original po/mate-tweak.pot file. Allows rebuilding
|
|
| 9 | + the src:pkg multiple times. (Closes: #1048570).
|
|
| 10 | + * debian/mate-tweak.lintian-overrides:
|
|
| 11 | + + Update syntax of desktop-command-not-in-package override.
|
|
| 12 | + * debian/copyright:
|
|
| 13 | + + Update copyright attribution for debian/.
|
|
| 14 | + |
|
| 15 | + -- Mike Gabriel <sunweaver@debian.org> Tue, 26 Dec 2023 10:46:13 +0100
|
|
| 16 | + |
|
| 1 | 17 | mate-tweak (22.10.0-2) unstable; urgency=medium
|
| 2 | 18 | |
| 3 | 19 | * debian/rules:
|
| ... | ... | @@ -93,7 +93,7 @@ License: GPL-2+ |
| 93 | 93 | |
| 94 | 94 | Files: debian/*
|
| 95 | 95 | Copyright: 2014-2022, Martin Wimpress <code@ubuntu-mate.org>
|
| 96 | - 2015-2022, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
| 96 | + 2015-2023, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
| 97 | 97 | 2015, Vangelis Mouhtsis <vangelis@gnugr.org>
|
| 98 | 98 | License: GPL-2+
|
| 99 | 99 |
| 1 | 1 | # we know that the referenced window managers are not in the mate-tweak package itself
|
| 2 | -mate-tweak: desktop-command-not-in-package usr/share/applications/marco-no-composite.desktop marco |
|
| 2 | +mate-tweak: desktop-command-not-in-package marco [usr/share/applications/marco-no-composite.desktop] |
| 1 | +--- a/setup.py
|
|
| 2 | ++++ b/setup.py
|
|
| 3 | +@@ -67,7 +67,7 @@
|
|
| 4 | + cmdclass ={
|
|
| 5 | + "build" : DistUtilsExtra.command.build_extra.build_extra,
|
|
| 6 | + "build_i18n" : DistUtilsExtra.command.build_i18n.build_i18n,
|
|
| 7 | +- "clean": DistUtilsExtra.command.clean_i18n.clean_i18n,
|
|
| 8 | ++ "clean_i18n": DistUtilsExtra.command.clean_i18n.clean_i18n,
|
|
| 9 | + }
|
|
| 10 | +
|
|
| 11 | + setup( |
| 1 | +1001_fix-clean-i18n.patch |
| ... | ... | @@ -5,6 +5,15 @@ export PYBUILD_SYSTEM=distutils |
| 5 | 5 | %:
|
| 6 | 6 | dh $@ --with python3 --buildsystem=pybuild
|
| 7 | 7 | |
| 8 | + |
|
| 9 | +override_dh_auto_configure:
|
|
| 10 | + # backup original pot file
|
|
| 11 | + if [ -e po/mate-tweak.pot ] && [ ! -e po/mate-tweak.pot.bak ]; then \
|
|
| 12 | + cp po/mate-tweak.pot po/mate-tweak.pot.bak; \
|
|
| 13 | + fi
|
|
| 14 | + |
|
| 15 | + dh_auto_configure --buildsystem=pybuild
|
|
| 16 | + |
|
| 8 | 17 | override_dh_auto_install:
|
| 9 | 18 | dh_auto_install
|
| 10 | 19 | rm debian/mate-tweak/usr/lib/python3*/dist-packages/setup*.py*
|
| ... | ... | @@ -12,9 +21,15 @@ override_dh_auto_install: |
| 12 | 21 | override_dh_auto_clean:
|
| 13 | 22 | rm -Rf mate_tweak.egg-info/
|
| 14 | 23 | |
| 24 | + # restore original pot file
|
|
| 25 | + if [ -e po/mate-tweak.pot.bak ]; then \
|
|
| 26 | + mv po/mate-tweak.pot.bak po/mate-tweak.pot; \
|
|
| 27 | + fi
|
|
| 28 | + |
|
| 15 | 29 | # dh_auto_clean with pybuild/distutils only works if setup.py is
|
| 16 | 30 | # present
|
| 17 | 31 | if [ -f setup.py ]; then \
|
| 32 | + python3 setup.py clean_i18n; \
|
|
| 18 | 33 | dh_auto_clean; \
|
| 19 | 34 | fi
|
| 20 | 35 |