summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-14 11:35:24 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-14 11:35:24 +0100
commit4857b304971c1473ff8c9f3a5912f763fbc4ba33 (patch)
tree7a7f3553985f0a2dcfff8e38f9997719c4b03f48 /debian
parentef84a92a429b724586031878dfc0b38c64d55a23 (diff)
parentc94d7517f09b199a9937581fb41dd4ab469593f1 (diff)
Merge branch 'release/2.0.4-2'2.0.4-2
Diffstat (limited to 'debian')
-rw-r--r--debian/NEWS.Debian6
-rw-r--r--debian/changelog19
-rw-r--r--debian/control6
-rw-r--r--debian/copyright2
-rw-r--r--debian/files1
-rw-r--r--debian/mwc.install1
-rw-r--r--debian/patches/0001-config.patch83
-rw-r--r--debian/patches/series1
8 files changed, 114 insertions, 5 deletions
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
new file mode 100644
index 0000000..f2337b3
--- /dev/null
+++ b/debian/NEWS.Debian
@@ -0,0 +1,6 @@
+mwc (2.0.4-2) unstable; urgency=high
+
+ Since release 2.0.0 the syntax of the config file has
+ changed. Please read the sample for rewrite.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 14 Oct 2017 22:27:29 +0200
diff --git a/debian/changelog b/debian/changelog
index 716efc8..5f52218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+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).
+ * Change to my new email-address:
+ - debian/control,
+ - debian/copyright.
+ * 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 <debian@jff.email> Sun, 03 Dec 2017 21:20:52 +0100
+
mwc (2.0.4-1) unstable; urgency=medium
* New upstream release:
@@ -33,7 +50,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..b02a75e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,19 @@
Source: mwc
Section: utils
Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
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
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 <Debianguru@gmx.de>
License: GPL-2+
Files: debian/*
-Copyright: 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+Copyright: 2014-2017 Jörg Frings-Fürst <debian@jff.email>
License: GPL-3+
License: GPL-2+
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
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 <jff@jff-webhosting.net>
+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