[Pkg-xmpp-commits] [SCM] Jabber MUC (Multi User Chat) branch, master, updated. 053fd55267ace98f9d1d5987881c6c15298793e9

[W. van den Akker]

The following commit has been merged in the master branch:
commit 053fd55267ace98f9d1d5987881c6c15298793e9
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Fri Jan 18 12:24:26 2013 +0100

    Added hardening-no-relro to lintian-overrides.

diff --git a/debian/changelog b/debian/changelog
index 4f82a7b..e6a24d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ jabber-muc (0.8-4) UNRELEASED; urgency=low
   * Removed /var/run (Closes: #689894).
     - debian/dirs: removed /var/run entry.
     - debian/postinst: removed /var/run entries.
-    - debian/lintian-overrides: removed. Not needed anymore.
+    - debian/lintian-overrides: removed /var/run entry. 
     - debian/rules: removed lintian-overrides copy operation.
   * debian/rules: include hardening options.
+    - debian/lintian-overrides: added hardening-no-relro.
   * debian/rules: added build-arch, build-indep.
   * debian/rules: added include quilt.make
     debian/control: added quilt dependency.
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..2807993
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,2 @@
+# proberbly false positives in mu-conference
+jabberd-muc binary: hardening-no-relo
diff --git a/debian/rules b/debian/rules
index 8c8a089..62a026f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,9 @@ install: build
 	install -m 644 $(CURDIR)/debian/jabberd2-muc.xml $(CURDIR)/debian/jabber-muc/etc/jabberd2/muc.xml
 	install -m 644 $(CURDIR)/debian/default $(CURDIR)/debian/jabber-muc/etc/default/jabber-muc
 	install -m 755 $(CURDIR)/debian/component.d/60muc $(CURDIR)/debian/jabber-muc/etc/jabberd2/component.d/60muc
-
+	# lintian overrides
+	install -D -m 644 $(CURDIR)/debian/lintian-overrides $(CURDIR)/debian/jabber-muc/usr/share/lintian/overrides/jabber-muc
+ 
 binary-indep:
 
 binary-arch: build install

-- 
Jabber MUC (Multi User Chat)