[Pkg-sympa-commits] [sympa] 25/30: Various fixes related to Sympa 6.2
Emmanuel Bouthenot
kolter at moszumanska.debian.org
Mon Sep 19 20:08:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
kolter pushed a commit to branch master
in repository sympa.
commit bdcc3222dfc600eef98257e3f9a11e92c59aaefc
Author: Emmanuel Bouthenot <kolter at openics.org>
Date: Mon Sep 19 21:44:57 2016 +0200
Various fixes related to Sympa 6.2
---
debian/control | 8 ++++++-
debian/rules | 67 +++++++++++++++++++++++++++++++++++++++++++---------
debian/sympa.install | 4 ++--
debian/sympa.links | 21 ++++++++++------
4 files changed, 79 insertions(+), 21 deletions(-)
diff --git a/debian/control b/debian/control
index 7ab0c9d..b709895 100644
--- a/debian/control
+++ b/debian/control
@@ -85,7 +85,13 @@ Depends:
libterm-progressbar-perl,
libmime-lite-html-perl,
libunicode-linebreak-perl,
- libsoap-lite-perl
+ libsoap-lite-perl,
+ fonts-font-awesome,
+ libjs-jquery,
+ libjs-jquery-ui,
+ libjs-jquery-placeholder,
+ libjs-modernizr,
+ libjs-twitter-bootstrap
Replaces: wwsympa
Provides: wwsympa
Conflicts: wwsympa
diff --git a/debian/rules b/debian/rules
index dcc7563..a3fd9e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,9 @@ PACKAGE = $(shell dh_listpackages)
DEBDIR = $(CURDIR)/debian
TMP = $(DEBDIR)/$(PACKAGE)
-UPSTREAMSTUFF = src/etc/list_aliases.tt2 src/lib/Sympa/Constants.pm sympa.spec
-UPSTREAMSTUFF += po-wwsympa/stamp-po po/stamp-po
+UPSTREAMSTUFF = META.json sympa.spec
+UPSTREAMSTUFF += $(shell find po -iname 'stamp-po')
+UPSTREAMSTUFF += $(shell find po -type f -iname '*.po*' | sed 's/\.upstream//')
override_dh_auto_configure:
dh_auto_configure -- \
@@ -25,12 +26,27 @@ override_dh_auto_configure:
--with-perl=/usr/bin/perl \
--with-user=sympa \
--with-group=sympa \
- --with-aliases_file=/etc/mail/sympa/aliases
- touch src/etc/ca-bundle.crt
+ --with-aliases_file=/etc/mail/sympa/aliases \
+ --disable-smtpc
# Backup upstream stuff
for file in $(UPSTREAMSTUFF); do \
- [ ! -e $$file ] || [ -e $$file.upstream ] || mv $$file $$file.upstream; \
+ if [ -e $$file ] && [ ! -e $$file.upstream ] ; then \
+ cp $$file $$file.upstream ; \
+ fi \
done
+ # Simulate presence of files removed from the DFSG repacked tarball
+ mkdir -p www/external/html5shiv
+ touch \
+ default/ca-bundle.crt \
+ www/external/jquery.js \
+ www/external/html5shiv/html5shiv.js \
+ www/external/jquery-ui.js \
+ www/external/jquery-ui.css \
+ www/external/modernizr.custom.js \
+ www/external/foundation/js/vendor/modernizr.js \
+ www/external/foundation/js/vendor/placeholder.js \
+ www/external/foundation/js/vendor/jquery.cookie.js \
+ www/external/foundation/js/vendor/jquery.js
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
@@ -41,11 +57,23 @@ override_dh_auto_install:
dh_auto_install
rm -rf \
$(TMP)/run \
- $(TMP)/usr/share/sympa/default/ca-bundle.crt \
$(TMP)/etc/sympa/sympa.conf \
- $(TMP)/etc/sympa/wwsympa.conf \
+ $(TMP)/etc/sympa/smrsh \
+ $(TMP)/usr/share/sympa/default/ca-bundle.crt \
+ $(TMP)/usr/share/sympa/bin/create_db.Sybase \
$(TMP)/etc/sympa/data_structure.version \
- $(TMP)/usr/share/sympa/bin/sympa_soap_client.pl
+ $(TMP)/usr/share/sympa/bin/sympa_soap_client.pl \
+ $(TMP)/var/lib/sympa/static_content/external/jquery.js \
+ $(TMP)/var/lib/sympa/static_content/external/html5shiv/html5shiv.js \
+ $(TMP)/var/lib/sympa/static_content/external/jquery-ui.js \
+ $(TMP)/var/lib/sympa/static_content/external/jquery-ui.css \
+ $(TMP)/var/lib/sympa/static_content/external/modernizr.custom.js \
+ $(TMP)/var/lib/sympa/static_content/external/foundation/js/vendor/modernizr.js \
+ $(TMP)/var/lib/sympa/static_content/external/foundation/js/vendor/placeholder.js \
+ $(TMP)/var/lib/sympa/static_content/external/foundation/js/vendor/jquery.cookie.js \
+ $(TMP)/var/lib/sympa/static_content/external/foundation/js/vendor/jquery.js \
+ $(TMP)/var/lib/sympa/static_content/external/font-awesome/ \
+ $(TMP)/var/lib/sympa/static_content/fonts/foundation-icons/preview.html
mv $(TMP)/usr/share/doc/sympa/samples $(TMP)/usr/share/doc/sympa/examples
override_dh_systemd_enable:
@@ -60,12 +88,29 @@ override_dh_installinit:
override_dh_clean:
dh_clean
- rm -f src/etc/ca-bundle.crt debian/sympa_wizard.8
- rm -f po/*.gmo po-wwsympa/*.gmo
+ rm -f po/*/*.gmo
+ rm -f po/*/stamp-po
+ rm -f config.status.lineno
+ rm -f debian/sympa_wizard.8
rm -rf $(DEBDIR)/dbconfig-common/install
+ # Remove files not present in the DFSG repacked tarball
+ rm -f default/ca-bundle.crt \
+ www/external/jquery.js \
+ www/external/html5shiv/html5shiv.js \
+ www/external/jquery-ui.js \
+ www/external/jquery-ui.css \
+ www/external/modernizr.custom.js \
+ www/external/foundation/js/vendor/modernizr.js \
+ www/external/foundation/js/vendor/placeholder.js \
+ www/external/foundation/js/vendor/jquery.cookie.js \
+ www/external/foundation/js/vendor/jquery.js
+ rmdir --ignore-fail-on-non-empty www/external/html5shiv || true
# Restore upstream stuff
for file in $(UPSTREAMSTUFF); do \
- [ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \
+ if [ -e $$file.upstream ] ; then \
+ rm -f $$file; \
+ mv $$file.upstream $$file; \
+ fi \
done
%:
diff --git a/debian/sympa.install b/debian/sympa.install
index 15cb7d7..22ce80c 100644
--- a/debian/sympa.install
+++ b/debian/sympa.install
@@ -5,5 +5,5 @@ debian/conf/apache2/sympa-soap.conf etc/apache2/conf-available
debian/conf/auth.conf etc/sympa
debian/conf/sympa.conf-smime.in etc/sympa
debian/conf/topics.conf etc/sympa
-debian/dbconfig-common/* usr/share/dbconfig-common/data/sympa
-soap/sympa_soap_client.pl usr/share/doc/sympa/examples/script
+#debian/dbconfig-common/* usr/share/dbconfig-common/data/sympa
+src/bin/sympa_soap_client.pl usr/share/doc/sympa/examples/script
diff --git a/debian/sympa.links b/debian/sympa.links
index 2af1e09..f21affb 100644
--- a/debian/sympa.links
+++ b/debian/sympa.links
@@ -1,7 +1,14 @@
-/etc/ssl/certs/ca-certificates.crt /usr/share/sympa/default/ca-bundle.crt
-/usr/lib/sympa/bin/alias_manager.pl /usr/bin/alias_manager
-/usr/lib/sympa/bin/sympa.pl /usr/bin/sympa
-/usr/lib/sympa/bin/sympa_wizard.pl /usr/bin/sympa_wizard
-/usr/lib/sympa/bin/queue /usr/lib/sympa/lib/sympa/queue
-/usr/lib/sympa/bin/familyqueue /usr/lib/sympa/lib/sympa/familyqueue
-/usr/lib/sympa/bin/bouncequeue /usr/lib/sympa/lib/sympa/bouncequeue
+/etc/ssl/certs/ca-certificates.crt /usr/share/sympa/default/ca-bundle.crt
+/usr/lib/sympa/bin/alias_manager.pl /usr/bin/alias_manager
+/usr/lib/sympa/bin/sympa.pl /usr/bin/sympa
+/usr/lib/sympa/bin/sympa_wizard.pl /usr/bin/sympa_wizard
+/usr/lib/sympa/bin/queue /usr/lib/sympa/lib/sympa/queue
+/usr/lib/sympa/bin/familyqueue /usr/lib/sympa/lib/sympa/familyqueue
+/usr/lib/sympa/bin/bouncequeue /usr/lib/sympa/lib/sympa/bouncequeue
+/usr/share/fonts-font-awesome /var/lib/sympa/static_content/external/font-awesome
+/usr/share/javascript/jquery/jquery.js /var/lib/sympa/static_content/external/jquery.js
+/usr/share/twitter-bootstrap/files/html5shiv/html5shiv.js /var/lib/sympa/static_content/external/html5shiv/html5shiv.js
+/usr/share/javascript/jquery-ui/jquery-ui.js /var/lib/sympa/static_content/external/jquery-ui.js
+/usr/share/javascript/jquery-ui/themes/base/jquery-ui.css /var/lib/sympa/static_content/external/jquery-ui.css
+/usr/share/javascript/modernizr/modernizr.js /var/lib/sympa/static_content/external/foundation/js/vendor/modernizr.js
+/usr/share/javascript/jquery-placeholder/jquery.placeholder.js /var/lib/sympa/static_content/external/foundation/js/vendor/placeholder.js
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/sympa.git
More information about the Pkg-sympa-commits
mailing list