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

W. van den Akker wvdakker at wilsoft.nl
Fri Jan 18 11:04:39 UTC 2013


The following commit has been merged in the master branch:
commit 66dfb628a19455cd56d2b8b8456c7b40ec022856
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Fri Jan 18 12:01:22 2013 +0100

    Make quilt 3.0 compatible.

diff --git a/debian/changelog b/debian/changelog
index d73a6db..4f82a7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ jabber-muc (0.8-4) UNRELEASED; urgency=low
     - debian/rules: removed lintian-overrides copy operation.
   * debian/rules: include hardening options.
   * debian/rules: added build-arch, build-indep.
+  * debian/rules: added include quilt.make
+    debian/control: added quilt dependency.
+    Now quilt 3.0 compatible.
   * debian/control: added Vcs-git and Vcs-Browser tags.
   * debian/component.d/60muc: added status option.
   * Bump standards version to 3.9.4.
diff --git a/debian/control b/debian/control
index fe80412..02e6130 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +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
+Build-Depends: debhelper (>= 9.0.0), quilt, 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;a=summary
 Vcs-Git: git://anonscm.debian.org/pkg-xmpp/jabber-muc.git
diff --git a/debian/rules b/debian/rules
index ff34ec0..8c8a089 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # 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)
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Jabber MUC (Multi User Chat)



More information about the Pkg-xmpp-commits mailing list