summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-13 20:01:34 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-13 20:01:45 +0000
commitdc7893c767f6432da1cddadc187fad21b7d0257f (patch)
tree3527e4e4e89c5191f5b8c0e57fe93d13d200e320
parentReleasing progress-linux version 1.1.2-2~dschinn1. (diff)
downloadpostorius-dc7893c767f6432da1cddadc187fad21b7d0257f.zip
postorius-dc7893c767f6432da1cddadc187fad21b7d0257f.tar.xz
Merging debian version 1.1.2-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog17
-rw-r--r--debian/compat2
-rw-r--r--debian/control4
-rw-r--r--debian/dirs1
-rwxr-xr-xdebian/rules5
-rw-r--r--debian/source/lintian-overrides9
6 files changed, 35 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index bae5bbc..758480e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+postorius (1.1.2-3) unstable; urgency=medium
+
+ [ Jonas Meurer ]
+ * d/control:
+ - Don't recommend mailman3, recommend mailman3-web instead.
+
+ [ Pierre-Elliott Bécue ]
+ * d/control:
+ - Raise debhelper build dependency level to 11
+ * d/compat: Bump to 11
+ * d/s/lintian-overrides: Add an override for the missing python3 package.
+ * d/rules:
+ - Add a rule to move the static directory in /usr/share and link against
+ it in /usr/lib/…
+
+ -- Pierre-Elliott Bécue <becue@crans.org> Fri, 16 Mar 2018 16:57:27 +0100
+
postorius (1.1.2-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index c48b7b7..0dbb1a3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ XSBC-Original-Maintainer: Debian Mailman Team <pkg-mailman-hackers@lists.alioth.
XSBC-Original-Uploaders: Pierre-Elliott Bécue <becue@crans.org>,
Jonas Meurer <jonas@freesources.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11),
dh-python,
python-all,
python-bs4,
@@ -38,7 +38,7 @@ Depends: libjs-jquery,
python-sphinx-rtd-theme,
${misc:Depends},
${python:Depends}
-Recommends: mailman3-core
+Recommends: mailman3-web
Description: Web user interface to access GNU Mailman3
The Postorius Django app provides a web user interface
to access GNU Mailman3, and manage it. This interface
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..fbe1b9d
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/share/python-django-postorius
diff --git a/debian/rules b/debian/rules
index a1fbef3..f2f61d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,11 @@ override_dh_auto_install:
ln -sf /usr/share/javascript/bootstrap/js/bootstrap.min.js {} \;
find debian/python-django-postorius -name 'glyphicons-halflings-regular.ttf' -type f -exec \
ln -sf /usr/share/glewlwyd/webapp/fonts/glyphicons-halflings-regular.ttf {} \;
+ # Move static files outside of the lib directory
+ mv debian/python-django-postorius/usr/lib/python2.7/dist-packages/postorius/static \
+ debian/python-django-postorius/usr/share/python-django-postorius/
+ ln -sf /usr/share/python-django-postorius/static \
+ debian/python-django-postorius/usr/lib/python2.7/dist-packages/postorius/static
override_dh_installchangelogs:
dh_installchangelogs src/postorius/doc/news.rst
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..5b628fc
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,9 @@
+# Postorius is not yet supporting python3. Upstream is currently working on
+# this matter and should soon provide a python3-only version of postorius
+# and drop python2 support.
+#
+# See https://gitlab.com/mailman/postorius/merge_requests/255 for more
+# information. The merge happened into master on commit
+# https://gitlab.com/mailman/postorius/commit/0fc55b19fb8331b138c4377a316d07a146318353
+# and postorius 1.2.0 relase will include it.
+postorius source: python-foo-but-no-python3-foo python-django-postorius