[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-38-g440fb47

[W. van den Akker]

The following commit has been merged in the master branch:
commit 73cbd29479470b659f364832422d8907bc11ac73
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Fri May 17 21:24:26 2013 +0200

    Remove quilt from build dependencies and quilt.make from rules.

diff --git a/debian/control b/debian/control
index 74f6e37..2ea9043 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel at lists.alioth.debian.org>
 Uploaders: Jorge Salamero Sanz <bencer at debian.org>, Thadeu Lima de Souza Cascardo <cascardo at minaslivre.org>, 
  Willem van den Akker <wvdakker at wilsoft.nl>
-Build-Depends: debhelper (>= 9), quilt, autotools-dev, automake, libtool, libssl-dev, libgsasl7-dev (>= 0.2.27), 
+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
 Standards-Version: 3.9.4
diff --git a/debian/rules b/debian/rules
index e49d71f..2b67e87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -18,7 +16,7 @@ LDFLAGS+=$(HARDENING_LDFLAGS)
 export CFLAGS
 export LDFLAGS
 
-config.status: patch configure
+config.status: configure
 	dh_testdir
 
 	libtoolize --force --copy
@@ -60,9 +58,7 @@ build-stamp:  config.status
 build-arch: build
 build-indep: build
 
-clean: clean1 unpatch
-
-clean1:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp

-- 
Jabberd2 XMPP server