[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-39-gcf7b452
W. van den Akker
wvdakker at wilsoft.nl
Sun May 19 18:47:32 UTC 2013
The following commit has been merged in the master branch:
commit cf7b452eb9a9b7edc8bc08538bb77e267a7317c4
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date: Sun May 19 20:46:50 2013 +0200
Make it a pure debhelper package.
diff --git a/debian/TODO b/debian/TODO
index 58b4180..2e354a1 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,4 +1 @@
* Make scripts (init, component.d more standard)
-
-* make debian/rules as a pure debhelper package.
-
diff --git a/debian/changelog b/debian/changelog
index d8ea8e7..1988a53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,12 @@ jabberd2 (2.2.17-3) unstable; urgency=low
* Added myself to uploaders list (Closes: #589304).
* debian/init, debian/component.d/*: Make less bashish.
* debian/control: Remove inactive uploaders from list.
+ * Make it a debhelper package:
+ + debian/rules: dh compliant.
+ + debian/install: file created. Needed for rules.
+ + debian/default: made some corrections and comments.
+ + debian/control: remove hardening-includes.
+ * debian/TODO: updated.
-- Willem van den Akker <wvdakker at wilsoft.nl> Fri, 17 May 2013 21:17:31 +0200
diff --git a/debian/control b/debian/control
index b2f153e..3c6c48c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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), autotools-dev, automake, libtool, libssl-dev, libgsasl7-dev (>= 0.2.27),
libdb-dev, libpam0g-dev, libmysqlclient15-dev, libpq-dev, libldap2-dev, libsqlite3-dev, libidn11-dev, libexpat1-dev,
- libudns-dev, hardening-includes
+ libudns-dev, dh-autoreconf
Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xmpp/jabberd2.git
Vcs-Git: git://anonscm.debian.org/pkg-xmpp/jabberd2.git
diff --git a/debian/default b/debian/default
index 0734a74..be9828c 100644
--- a/debian/default
+++ b/debian/default
@@ -1,4 +1,6 @@
-# /etc/default/jabberd2 - default values for jabberd2
+# Defaults for jabberd2 initscript
+# sourced by /etc/init.d/jabberd2
+# installed at /etc/default/jabberd2 by the maintainer scripts
# user and group
USER=jabber
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..8a49b34
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,10 @@
+debian/component.d/* etc/jabberd2/component.d
+etc/*.dist usr/share/doc/jabberd2/examples/
+etc/templates/*.dist usr/share/doc/jabberd2/examples/
+
+tools/*.sqlite usr/share/doc/jabberd2/
+tools/*.mysql usr/share/doc/jabberd2/
+tools/*.pgsql usr/share/doc/jabberd2/
+tools/*.oracle usr/share/doc/jabberd2/
+tools/*.sql usr/share/doc/jabberd2/
+tools/*.pl usr/share/doc/jabberd2/
diff --git a/debian/rules b/debian/rules
index 2b67e87..0ef7bd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,20 @@
#!/usr/bin/make -f
+# rules to package jabberd2
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-# set hardening option
-include /usr/share/hardening-includes/hardening.make
+# Use debhelper's dh
+%:
+ dh $@ --with autoreconf
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
-export CFLAGS
-export LDFLAGS
-
-config.status: configure
- dh_testdir
-
- libtoolize --force --copy
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- aclocal
- autoconf
-
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --sysconfdir=/etc/jabberd2 --bindir=\$${prefix}/sbin \
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --prefix=/usr \
+ --bindir=\$${prefix}/sbin \
+ --sysconfdir=/etc/jabberd2 \
--program-prefix=jabberd2- \
--enable-ssl \
--enable-mysql \
@@ -43,80 +26,21 @@ endif
--enable-pipe \
--enable-anon \
--enable-fs \
- --with-sasl=gsasl \
- $(CONFIGURE_EXTRA_FLAGS)
-
-build: build-stamp
+ --with-sasl=gsasl
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch $@
-
-build-arch: build
-build-indep: build
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean
-
-install:
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/jabberd2 install
+override_dh_auto_install:
+ dh_auto_install
# remove *.la files. Do not ship them.
- rm `find $(CURDIR)/debian/jabberd2 -name '*.la'`
+ rm `find debian/jabberd2 -name '*.la'`
+
# remove jabberd wrapper, we use lsb init scripts
- rm $(CURDIR)/debian/jabberd2/etc/jabberd2/jabberd.cfg
- rm $(CURDIR)/debian/jabberd2/usr/sbin/jabberd2-jabberd
- # install component.d scripts
- install -o root -g root -m 0755 debian/component.d/* $(CURDIR)/debian/jabberd2/etc/jabberd2/component.d
- install -o root -g root -m 0755 -d $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/examples
- mv $(CURDIR)/debian/jabberd2/etc/jabberd2/*.dist $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/examples/
- mv $(CURDIR)/debian/jabberd2/etc/jabberd2/templates/*.dist $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/examples/
- # install tools and stuff
- cp $(CURDIR)/tools/*.sqlite $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/
- cp $(CURDIR)/tools/*.mysql $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/
- cp $(CURDIR)/tools/*.pgsql $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/
- cp $(CURDIR)/tools/*.oracle $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/
- cp $(CURDIR)/tools/*.sql $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/
- cp $(CURDIR)/tools/*.pl $(CURDIR)/debian/jabberd2/usr/share/doc/jabberd2/
- # lintian overrides
- install -D -m 644 $(CURDIR)/debian/lintian-overrides $(CURDIR)/debian/jabberd2/usr/share/lintian/overrides/jabberd2
+ rm debian/jabberd2/etc/jabberd2/jabberd.cfg
+ rm debian/jabberd2/usr/sbin/jabberd2-jabberd
-binary-indep:
+ rm debian/jabberd2/etc/jabberd2/*.dist
+ rm debian/jabberd2/etc/jabberd2/templates/*.dist
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
-# dh_installdebconf
- dh_installlogrotate
- dh_installinit
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+override_dh_fixperms:
+ chmod 755 debian/jabberd2/etc/jabberd2/component.d/*
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--
Jabberd2 XMPP server
More information about the Pkg-xmpp-commits
mailing list