Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / magnus
Commits:
-
51b50202
by Mike Gabriel at 2023-11-05T13:45:38+00:00
-
8ede0d68
by Mike Gabriel at 2023-11-05T13:45:48+00:00
-
e2af2ef6
by Mike Gabriel at 2023-11-05T14:52:34+01:00
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/1001_py-setup-no-i18n.patch
- + debian/patches/series
Changes:
| 1 | +magnus (1:1.0.3-4) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * debian/control:
|
|
| 4 | + + Add Rules-Requires-Root: field and set it to no.
|
|
| 5 | + + Bump Standards-Version: to 4.6.2. No changes needed.
|
|
| 6 | + * debian/upstream/metadata:
|
|
| 7 | + + Drop obsolete fields Contact: and Name:.
|
|
| 8 | + * debian/patches:
|
|
| 9 | + + Add 1001_py-setup-no-i18n.patch. Fix FTBFS issue due to clean_i18n target
|
|
| 10 | + by dropping all i18n functionality. The 'magnus' tool does not come with
|
|
| 11 | + translation files. (Closes: #1054785).
|
|
| 12 | + |
|
| 13 | + -- Mike Gabriel <sunweaver@debian.org> Sun, 05 Nov 2023 13:46:40 +0000
|
|
| 14 | + |
|
| 1 | 15 | magnus (1:1.0.3-3) unstable; urgency=medium
|
| 2 | 16 | |
| 3 | 17 | * Revert the unintended changes listed below. There were not meant to
|
| ... | ... | @@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13), |
| 9 | 9 | python3,
|
| 10 | 10 | python3-distutils-extra,
|
| 11 | 11 | python3-setuptools,
|
| 12 | -Standards-Version: 4.6.0
|
|
| 12 | +Standards-Version: 4.6.2
|
|
| 13 | 13 | Rules-Requires-Root: no
|
| 14 | 14 | Homepage: https://github.com/stuartlangridge/magnus
|
| 15 | 15 | Vcs-Browser: https://salsa.debian.org/debian-mate-team/magnus
|
| 1 | +Description: Drop all i18n related stuff from setup.py. magnus does not have any translation files.
|
|
| 2 | +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
| 3 | + |
|
| 4 | +--- a/setup.py
|
|
| 5 | ++++ b/setup.py
|
|
| 6 | +@@ -7,15 +7,6 @@
|
|
| 7 | + from glob import glob
|
|
| 8 | + from setuptools import setup
|
|
| 9 | +
|
|
| 10 | +-import DistUtilsExtra.command.build_extra
|
|
| 11 | +-import DistUtilsExtra.command.build_i18n
|
|
| 12 | +-import DistUtilsExtra.command.clean_i18n
|
|
| 13 | +-
|
|
| 14 | +-# to update i18n .mo files (and merge .pot file into .po files) run on Linux:
|
|
| 15 | +-# tx pull -a --minimum-perc=5
|
|
| 16 | +-# python3 setup.py build_i18n -m
|
|
| 17 | +-# tx push -s
|
|
| 18 | +-
|
|
| 19 | + # silence pyflakes, __VERSION__ is properly assigned below...
|
|
| 20 | + __VERSION__ = '0.0.0.0'
|
|
| 21 | + with open('magnus') as f:
|
|
| 22 | +@@ -40,13 +31,6 @@
|
|
| 23 | + ('{prefix}/share/applications'.format(prefix=sys.prefix), ['data/magnus.desktop',]),
|
|
| 24 | + ('/etc/xdg/autostart'.format(prefix=sys.prefix), ['data/magnus-autostart.desktop',]),
|
|
| 25 | + ]
|
|
| 26 | +-#data_files.extend(datafilelist('{prefix}/share/locale'.format(prefix=sys.prefix), 'build/mo'))
|
|
| 27 | +-
|
|
| 28 | +-cmdclass ={
|
|
| 29 | +- "build" : DistUtilsExtra.command.build_extra.build_extra,
|
|
| 30 | +- "build_i18n" : DistUtilsExtra.command.build_i18n.build_i18n,
|
|
| 31 | +- "clean": DistUtilsExtra.command.clean_i18n.clean_i18n,
|
|
| 32 | +-}
|
|
| 33 | +
|
|
| 34 | + setup(
|
|
| 35 | + name = "Magnus",
|
|
| 36 | +@@ -59,5 +43,4 @@
|
|
| 37 | + data_files = data_files,
|
|
| 38 | + install_requires = [ 'setuptools', ],
|
|
| 39 | + scripts = ['magnus'],
|
|
| 40 | +- cmdclass = cmdclass,
|
|
| 41 | + ) |
| 1 | +1001_py-setup-no-i18n.patch |