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

[W. van den Akker]

The following commit has been merged in the master branch:
commit 768501a02631515bfb46c4a29108eaaac96f8083
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Sun May 19 21:11:36 2013 +0200

    Make it a pure debhelper package.

diff --git a/debian/TODO b/debian/TODO
index 301e34c..d710eb3 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,4 +1,3 @@
 * Make scripts (component.d more standard)
 
-* make debian/rules as a pure debhelper package.
 
diff --git a/debian/changelog b/debian/changelog
index 3809437..cfec47e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ jabber-muc (0.8-6) unstable; urgency=low
     - debian/lintian-overrides: removed /var/run entry. 
     - debian/rules: removed lintian-overrides copy operation.
   * Make debian/component.d/* less bashish.
+  * Make it a debhelper package:
+    + debian/rules: debhelper compliant
+    + debian/jabberd2-muc.xml: renamed to muc.xml.
+    + debian/install: file created. Needed for rules.
+    + debian/default: made some corrections and comments.
+    + debian/control: remove hardening-includes. Not needed anymore.
+  * debian/TODO: updated.
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Fri, 17 May 2013 19:27:19 +0200
 
diff --git a/debian/control b/debian/control
index b87a0f9..ea3e046 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel at lists.alioth.debian.org>
 Uploaders: Willem van den Akker <wvdakker at wilsoft.nl>
-Build-Depends: debhelper (>= 9.0.0), libglib2.0-dev, libexpat1-dev, libidn11-dev, 
- hardening-includes
+Build-Depends: debhelper (>= 9.0.0), libglib2.0-dev, libexpat1-dev, libidn11-dev
 Homepage: https://gna.org/projects/mu-conference/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xmpp/jabber-muc.git
 Vcs-Git: git://anonscm.debian.org/pkg-xmpp/jabber-muc.git
diff --git a/debian/default b/debian/default
index 19acf47..f1a257a 100644
--- a/debian/default
+++ b/debian/default
@@ -1,4 +1,6 @@
-# /etc/default/jabber-muc
+# Defaults for jabberd2 initscript
+# sourced by /etc/init.d/jabberd2
+# installed at /etc/default/jabber-muc by the maintainer scripts
 
 # user and group
 USER=jabber
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..189402c
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,4 @@
+debian/component.d/60muc etc/jabberd2/component.d
+debian/muc.xml etc/jabberd2
+src/mu-conference usr/sbin
+
diff --git a/debian/jabberd2-muc.xml b/debian/muc.xml
similarity index 100%
rename from debian/jabberd2-muc.xml
rename to debian/muc.xml
diff --git a/debian/rules b/debian/rules
index 51f6407..840e234 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,82 +1,18 @@
 #!/usr/bin/make -f
+# rules to package jabber-muc
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# set hardening option
-include /usr/share/hardening-includes/hardening.make
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
-export CFLAGS
-export LDFLAGS
+# Use debhelper's dh
+%:
+	dh $@ 
 
-configure: configure-stamp
 
-configure-stamp:
-	dh_testdir
-
-	touch $@
-
-build: build-stamp
-
-build-stamp: configure-stamp
-	dh_testdir
-
-	make
-
-	touch $@
-
-build-arch: build
-build-indep: build
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	make clean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	# misc installs
-	install -m 755 $(CURDIR)/src/mu-conference $(CURDIR)/debian/jabber-muc/usr/sbin/mu-conference
-	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
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install
-#	dh_installdebconf
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

-- 
Jabber MUC (Multi User Chat)