From c0d09e598a153624532f8d3b2ebcab5808e6c958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 14 Oct 2017 22:26:22 +0200 Subject: Install mwctools.py to /usr/share/mwc; New debian/patches/0001-config.patch; New debian/NEWS.Debian --- debian/NEWS.Debian | 6 +++ debian/changelog | 10 +++++ debian/mwc.install | 1 + debian/patches/0001-config.patch | 83 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 101 insertions(+) create mode 100644 debian/NEWS.Debian create mode 100644 debian/patches/0001-config.patch diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian new file mode 100644 index 0000000..339080e --- /dev/null +++ b/debian/NEWS.Debian @@ -0,0 +1,6 @@ +mwc (2.0.4-2) unstable; urgency=high + + Since release 2.0.0 the syntacs of the config file has + changed. Please read the sample for rewrite. + + -- Jörg Frings-Fürst Sat, 14 Oct 2017 19:57:10 +0200 diff --git a/debian/changelog b/debian/changelog index 716efc8..8c50dab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +mwc (2.0.4-2) UNRELEASED; urgency=medium + + * debian/mwc.install: + - Install mwctools.py to /usr/share/mwc (Closes: #877924). + * New debian/patches/0001-config.patch: + - Add loading config from every path (Closes: #877927). + * New debian/NEWS.Debian about the new config file syntax. + + -- Jörg Frings-Fürst Sat, 14 Oct 2017 19:57:10 +0200 + mwc (2.0.4-1) unstable; urgency=medium * New upstream release: diff --git a/debian/mwc.install b/debian/mwc.install index d893da8..65e0d12 100644 --- a/debian/mwc.install +++ b/debian/mwc.install @@ -1,2 +1,3 @@ mwc.py /usr/share/mwc +mwctools.py /usr/share/mwc mwcfeedserver.py /usr/share/mwc diff --git a/debian/patches/0001-config.patch b/debian/patches/0001-config.patch new file mode 100644 index 0000000..df47bb4 --- /dev/null +++ b/debian/patches/0001-config.patch @@ -0,0 +1,83 @@ +Description: add loading config from every path + Add loading config from every path + Separation data / program +Author: Jörg Frings-Fürst +Last-Update: 2017-10-14 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/mwc.py +=================================================================== +--- trunk.orig/mwc.py ++++ trunk/mwc.py +@@ -198,7 +198,7 @@ def pollWebsites(): + + + if __name__ == "__main__": +- configMod = 'config' ++ configMod = '/etc/mwc/mwc-config' + dryrun = None + + try: +@@ -215,7 +215,23 @@ if __name__ == "__main__": + elif opt in ('-d', '--dry-run'): + dryrun = arg + +- config = importlib.import_module(configMod) ++ # ++ # add code to load config from nonsystem path ++ # and change to datadir ++ # ++ try: ++ path = os.path.dirname(configMod) ++ fullname = os.path.basename(configMod) ++ sys.path.append(path) ++ config = importlib.import_module(fullname) ++ except: ++ print('Error: loading config') ++ sys.exit(2) ++ try: ++ os.chdir(config.datadir) ++ except: ++ print('Error: datadir not found') ++ sys.exit(3) + + if dryrun: + for thesite in config.sites: +Index: trunk/mwcfeedserver.py +=================================================================== +--- trunk.orig/mwcfeedserver.py ++++ trunk/mwcfeedserver.py +@@ -14,7 +14,7 @@ import getopt + + bind = 'localhost' + port = 8000 +-configMod = 'config' ++configMod = '/etc/mwc/mwc-config' + + + try: +@@ -34,7 +34,23 @@ for opt, arg in opts: + elif opt in ('-p', '--port'): + port = int(arg) + +-config = importlib.import_module(configMod) ++ # ++ # add code to load config from nonsystem path ++ # and change to datadir ++ # ++ try: ++ path = os.path.dirname(configMod) ++ fullname = os.path.basename(configMod) ++ sys.path.append(path) ++ config = importlib.import_module(fullname) ++ except: ++ print('Error: loading config') ++ sys.exit(2) ++ try: ++ os.chdir(config.datadir) ++ except: ++ print('Error: datadir not found') ++ sys.exit(3) + + + handler = http.server.SimpleHTTPRequestHandler diff --git a/debian/patches/series b/debian/patches/series index e69de29..2361bcf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-config.patch -- cgit v1.2.3 From 1540375cfd64f8a64cb2130334768b3ceaa5e548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 14 Oct 2017 22:30:24 +0200 Subject: release change release and date/time --- debian/NEWS.Debian | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index 339080e..a9040c4 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -3,4 +3,4 @@ mwc (2.0.4-2) unstable; urgency=high Since release 2.0.0 the syntacs of the config file has changed. Please read the sample for rewrite. - -- Jörg Frings-Fürst Sat, 14 Oct 2017 19:57:10 +0200 + -- Jörg Frings-Fürst Sat, 14 Oct 2017 22:27:29 +0200 diff --git a/debian/changelog b/debian/changelog index 8c50dab..2162255 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mwc (2.0.4-2) UNRELEASED; urgency=medium +mwc (2.0.4-2) unstable; urgency=high * debian/mwc.install: - Install mwctools.py to /usr/share/mwc (Closes: #877924). @@ -6,7 +6,7 @@ mwc (2.0.4-2) UNRELEASED; urgency=medium - Add loading config from every path (Closes: #877927). * New debian/NEWS.Debian about the new config file syntax. - -- Jörg Frings-Fürst Sat, 14 Oct 2017 19:57:10 +0200 + -- Jörg Frings-Fürst Sat, 14 Oct 2017 22:27:29 +0200 mwc (2.0.4-1) unstable; urgency=medium -- cgit v1.2.3 From a7f52a74b4b83db02df95eedbd5453905728ef3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 14 Oct 2017 22:38:36 +0200 Subject: Typo debian/NEWS.Debian --- debian/NEWS.Debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index a9040c4..f2337b3 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,6 +1,6 @@ mwc (2.0.4-2) unstable; urgency=high - Since release 2.0.0 the syntacs of the config file has + Since release 2.0.0 the syntax of the config file has changed. Please read the sample for rewrite. -- Jörg Frings-Fürst Sat, 14 Oct 2017 22:27:29 +0200 -- cgit v1.2.3 From 6630bb378337c0d0f772f159fb44efcd8d3556d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 14 Oct 2017 22:43:03 +0200 Subject: rewrite debian/changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2162255..365e657 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,9 @@ mwc (2.0.4-2) unstable; urgency=high * debian/mwc.install: - Install mwctools.py to /usr/share/mwc (Closes: #877924). + * New debian/NEWS.Debian about the new config file syntax. * New debian/patches/0001-config.patch: - Add loading config from every path (Closes: #877927). - * New debian/NEWS.Debian about the new config file syntax. -- Jörg Frings-Fürst Sat, 14 Oct 2017 22:27:29 +0200 -- cgit v1.2.3 From d4b8cfbc35f7e27d14b280459298ca327a8f5cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 20:32:51 +0100 Subject: Change to my new email-address; Remove trailing white spaces --- debian/changelog | 10 ++++++++-- debian/control | 4 ++-- debian/copyright | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 365e657..9598b46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,14 @@ mwc (2.0.4-2) unstable; urgency=high * New debian/NEWS.Debian about the new config file syntax. * New debian/patches/0001-config.patch: - Add loading config from every path (Closes: #877927). + * Change to my new email-address: + - debian/control, + - debian/copyright. + * Remove trailing white spaces: + - debian/changelog + - debian/control - -- Jörg Frings-Fürst Sat, 14 Oct 2017 22:27:29 +0200 + -- Jörg Frings-Fürst Sat, 14 Oct 2017 22:27:29 +0200 mwc (2.0.4-1) unstable; urgency=medium @@ -43,7 +49,7 @@ mwc (1.7.2-3) unstable; urgency=medium mwc (1.7.2-2) unstable; urgency=medium * debian/control: - - Replace Depends python-cssselect with python3-cssselect + - Replace Depends python-cssselect with python3-cssselect (Closes: #764787). - Bump Standards-Version to 3.9.6 (no changes required). diff --git a/debian/control b/debian/control index 792ce2a..7ed06b7 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: mwc Section: utils Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 10), dh-python, @@ -13,7 +13,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mwc.git Package: mwc Architecture: all -Depends: +Depends: ${misc:Depends}, ${python3:Depends}, python3-lxml, diff --git a/debian/copyright b/debian/copyright index 4976aef..a566481 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Copyright: 2013-2017 Michael Till Beck License: GPL-2+ Files: debian/* -Copyright: 2014-2017 Jörg Frings-Fürst +Copyright: 2014-2017 Jörg Frings-Fürst License: GPL-3+ License: GPL-2+ -- cgit v1.2.3 From 937f9edeab93cb465890ded079ca3d0b3057d135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 20:34:20 +0100 Subject: d/changelog: Change date/time to release --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9598b46..003ea80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ mwc (2.0.4-2) unstable; urgency=high - debian/changelog - debian/control - -- Jörg Frings-Fürst Sat, 14 Oct 2017 22:27:29 +0200 + -- Jörg Frings-Fürst Sun, 12 Nov 2017 20:33:09 +0100 mwc (2.0.4-1) unstable; urgency=medium -- cgit v1.2.3 From c94d7517f09b199a9937581fb41dd4ab469593f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 3 Dec 2017 21:40:35 +0100 Subject: Declare compliance with Debian Policy 4.1.2.0 --- debian/changelog | 3 ++- debian/control | 2 +- debian/files | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index 003ea80..5f52218 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,9 @@ mwc (2.0.4-2) unstable; urgency=high * Remove trailing white spaces: - debian/changelog - debian/control + * Declare compliance with Debian Policy 4.1.2.0 (No changes needed). - -- Jörg Frings-Fürst Sun, 12 Nov 2017 20:33:09 +0100 + -- Jörg Frings-Fürst Sun, 03 Dec 2017 21:20:52 +0100 mwc (2.0.4-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 7ed06b7..b02a75e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 10), dh-python, python3-all -Standards-Version: 4.1.1 +Standards-Version: 4.1.2.0 Homepage: https://github.com/Debianguru/MailWebsiteChanges Vcs-Git: git://anonscm.debian.org/collab-maint/mwc.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mwc.git diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..ac96ecc --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +mwc_2.0.4-2_source.buildinfo utils optional -- cgit v1.2.3