[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-20-g03771f3
W. van den Akker
wvdakker at wilsoft.nl
Wed Jan 16 12:35:51 UTC 2013
The following commit has been merged in the master branch:
commit 0d3ab918dd549c84264e7d08570995a697d41c24
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date: Wed Jan 16 12:43:52 2013 +0100
Converted to quilt 3.0.
diff --git a/debian/changelog b/debian/changelog
index 2948dea..3b69c60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ jabberd2 (2.2.17-1) UNRELEASED; urgency=low
options.
* debian/rules: include hardening options.
* debian/rules: added build-arch, build-indep.
+ * debian/rules: replaced line dpatch.make with quilt.make
+ Now quilt 3.0 compatible. Converted dpatch patches to quilt.
* debian/watch: updated URL (Closes: #543415).
* debian/dirs, debian/postinst: removed /var/run/jabber2 (Closes: #689538).
* debian/component.d: removed 20resolver. Resolver is not included anymore
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5afea71..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-pkgname.dpatch
-etc_pidpath.dpatch
-etc_logpath.dpatch
-etc_dbpath.dpatch
diff --git a/debian/patches/etc_dbpath.dpatch b/debian/patches/etc_dbpath.diff
old mode 100755
new mode 100644
similarity index 57%
rename from debian/patches/etc_dbpath.dpatch
rename to debian/patches/etc_dbpath.diff
index 1d2c48e..074757e
--- a/debian/patches/etc_dbpath.dpatch
+++ b/debian/patches/etc_dbpath.diff
@@ -1,47 +1,43 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## etc_dbpath.dpatch by Jorge Salamero Sanz <bencer at cauterized.net>
-## DP: changes in etc files the path of databases
+Description: Changes in etc files the path of the databases
+Author: Jorge Salamero Sanz <bencer at cauterized.net>
- at DPATCH@
-diff -urNad jabberd2~/etc/c2s.xml.dist.in jabberd2/etc/c2s.xml.dist.in
---- jabberd2~/etc/c2s.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/c2s.xml.dist.in 2009-04-17 18:23:54.000000000 +0100
-@@ -435,7 +435,7 @@
+--- a/etc/c2s.xml.dist.in
++++ b/etc/c2s.xml.dist.in
+@@ -421,7 +421,7 @@
<!-- SQLite driver configuration -->
<sqlite>
<!-- Database name -->
-- <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
+- <dbname>@localstatedir@/@package@/db/sqlite.db</dbname>
+ <dbname>/var/lib/jabberd2/sqlite.db</dbname>
<!-- Transacation support. If this is commented out, transactions
will be disabled. This might make database accesses faster,
-@@ -449,7 +449,7 @@
+@@ -502,7 +502,7 @@
<!-- Berkeley DB module configuration -->
<db>
<!-- Directory to store database files under -->
-- <path>@localstatedir@/jabberd/db</path>
+- <path>@localstatedir@/@package@/db</path>
+ <path>/var/lib/jabberd2/</path>
<!-- Synchronize the database to disk after each write. If you
disable this, database accesses may be faster, but data may
-diff -urNad jabberd2~/etc/sm.xml.dist.in jabberd2/etc/sm.xml.dist.in
---- jabberd2~/etc/sm.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/sm.xml.dist.in 2009-04-17 18:23:54.000000000 +0100
-@@ -153,7 +153,7 @@
- implementation does not implement the 'count' callback). -->
- <db>
- <!-- Directory to store database files under -->
-- <path>@localstatedir@/jabberd/db</path>
-+ <path>/var/lib/jabberd2/</path>
-
- <!-- Synchronize the database to disk after each write. If you
- disable this, database accesses may be faster, but data may
-@@ -178,7 +178,7 @@
+--- a/etc/sm.xml.dist.in
++++ b/etc/sm.xml.dist.in
+@@ -133,7 +133,7 @@
<!-- SQLite driver configuration -->
<sqlite>
<!-- Database name -->
-- <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
+- <dbname>@localstatedir@/@package@/db/sqlite.db</dbname>
+ <dbname>/var/lib/jabberd2/sqlite.db</dbname>
<!-- Transacation support. If this is commented out, transactions
will be disabled. This might make database accesses faster,
+@@ -199,7 +199,7 @@
+ implementation does not implement the 'count' callback). -->
+ <db>
+ <!-- Directory to store database files under -->
+- <path>@localstatedir@/@package@/db</path>
++ <path>/var/lib/jabberd2/</path>
+
+ <!-- Synchronize the database to disk after each write. If you
+ disable this, database accesses may be faster, but data may
diff --git a/debian/patches/etc_logpath.dpatch b/debian/patches/etc_logpath.diff
old mode 100755
new mode 100644
similarity index 52%
rename from debian/patches/etc_logpath.dpatch
rename to debian/patches/etc_logpath.diff
index 93460bb..e8b66fe
--- a/debian/patches/etc_logpath.dpatch
+++ b/debian/patches/etc_logpath.diff
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## etc_logpath.dpatch by Jorge Salamero Sanz <bencer at cauterized.net>
-## DP: changes in etc files the path of logs
+Description: Changes in etc files the path of the log files
+Author: Jorge Salamero Sanz <bencer at cauterized.net>
- at DPATCH@
-diff -urNad jabberd2~/etc/c2s.xml.dist.in jabberd2/etc/c2s.xml.dist.in
---- jabberd2~/etc/c2s.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/c2s.xml.dist.in 2009-04-17 18:24:13.000000000 +0100
+--- a/etc/c2s.xml.dist.in
++++ b/etc/c2s.xml.dist.in
@@ -50,7 +50,7 @@
</router>
@@ -20,19 +17,18 @@ diff -urNad jabberd2~/etc/c2s.xml.dist.in jabberd2/etc/c2s.xml.dist.in
<!-- If logging to file, this is the filename of the logfile -->
- <!--
-- <file>@localstatedir@/jabberd/log/c2s.log</file>
+- <file>@localstatedir@/@package@/log/c2s.log</file>
- -->
+
+ <file>/var/log/jabberd2/c2s.log</file>
+
- </log>
- <!-- Local network configuration -->
-diff -urNad jabberd2~/etc/router.xml.dist.in jabberd2/etc/router.xml.dist.in
---- jabberd2~/etc/router.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/router.xml.dist.in 2009-04-17 18:24:13.000000000 +0100
+ <!-- Filename of the debug logfile -->
+ <!--
+--- a/etc/router.xml.dist.in
++++ b/etc/router.xml.dist.in
@@ -8,7 +8,7 @@
- <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
+ <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
- <log type='syslog'>
@@ -45,17 +41,16 @@ diff -urNad jabberd2~/etc/router.xml.dist.in jabberd2/etc/router.xml.dist.in
<!-- If logging to file, this is the filename of the logfile -->
- <!--
-- <file>@localstatedir@/jabberd/log/router.log</file>
+- <file>@localstatedir@/@package@/log/router.log</file>
- -->
+
+ <file>/var/log/jabberd2/router.log</file>
+
- </log>
- <!-- Local network configuration -->
-diff -urNad jabberd2~/etc/s2s.xml.dist.in jabberd2/etc/s2s.xml.dist.in
---- jabberd2~/etc/s2s.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/s2s.xml.dist.in 2009-04-17 18:24:13.000000000 +0100
+ <!-- Filename of the debug logfile -->
+ <!--
+--- a/etc/s2s.xml.dist.in
++++ b/etc/s2s.xml.dist.in
@@ -60,7 +60,7 @@
</router>
@@ -70,18 +65,17 @@ diff -urNad jabberd2~/etc/s2s.xml.dist.in jabberd2/etc/s2s.xml.dist.in
<!-- if logging to file, this is the filename of the logfile -->
- <!--
-- <file>@localstatedir@/jabberd/log/s2s.log</file>
+- <file>@localstatedir@/@package@/log/s2s.log</file>
- -->
+
+ <file>/var/log/jabberd2/s2s.log</file>
+
- </log>
- <!-- Local network configuration -->
-diff -urNad jabberd2~/etc/sm.xml.dist.in jabberd2/etc/sm.xml.dist.in
---- jabberd2~/etc/sm.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/sm.xml.dist.in 2009-04-17 18:24:13.000000000 +0100
-@@ -52,7 +52,7 @@
+ <!-- Filename of the debug logfile -->
+ <!--
+--- a/etc/sm.xml.dist.in
++++ b/etc/sm.xml.dist.in
+@@ -50,7 +50,7 @@
</router>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -90,16 +84,16 @@ diff -urNad jabberd2~/etc/sm.xml.dist.in jabberd2/etc/sm.xml.dist.in
<!-- If logging to syslog, this is the log ident -->
<ident>jabberd/sm</ident>
-@@ -61,9 +61,9 @@
+@@ -59,9 +59,9 @@
<facility>local3</facility>
<!-- If logging to file, this is the filename of the logfile -->
- <!--
-- <file>@localstatedir@/jabberd/log/sm.log</file>
+- <file>@localstatedir@/@package@/log/sm.log</file>
- -->
+
+ <file>/var/log/jabberd2/sm.log</file>
+
- </log>
- <!-- Storage database configuration -->
+ <!-- Filename of the debug logfile -->
+ <!--
diff --git a/debian/patches/etc_pidpath.diff b/debian/patches/etc_pidpath.diff
new file mode 100644
index 0000000..673369d
--- /dev/null
+++ b/debian/patches/etc_pidpath.diff
@@ -0,0 +1,47 @@
+Description: Changes in etc files the path of the pidfiles
+Author: Jorge Salamero Sanz <bencer at cauterized.net>
+
+--- a/etc/c2s.xml.dist.in
++++ b/etc/c2s.xml.dist.in
+@@ -5,7 +5,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
+- <pidfile>@localstatedir@/@package@/pid/c2s.pid</pidfile>
++ <pidfile>/var/run/jabberd2/c2s.pid</pidfile>
+
+ <!-- Router connection configuration -->
+ <router>
+--- a/etc/router.xml.dist.in
++++ b/etc/router.xml.dist.in
+@@ -5,7 +5,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
+- <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile>
++ <pidfile>/var/run/jabberd2/router.pid</pidfile>
+
+ <!-- Log configuration - type is "syslog", "file" or "stdout" -->
+ <log type='file'>
+--- a/etc/s2s.xml.dist.in
++++ b/etc/s2s.xml.dist.in
+@@ -5,7 +5,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
+- <pidfile>@localstatedir@/@package@/pid/s2s.pid</pidfile>
++ <pidfile>/var/run/jabberd2/s2s.pid</pidfile>
+
+ <!-- Router connection configuration -->
+ <router>
+--- a/etc/sm.xml.dist.in
++++ b/etc/sm.xml.dist.in
+@@ -5,7 +5,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
+- <pidfile>@localstatedir@/@package@/pid/sm.pid</pidfile>
++ <pidfile>/var/run/jabberd2/sm.pid</pidfile>
+
+ <!-- Router connection configuration -->
+ <router>
diff --git a/debian/patches/etc_pidpath.dpatch b/debian/patches/etc_pidpath.dpatch
deleted file mode 100755
index f14b7b1..0000000
--- a/debian/patches/etc_pidpath.dpatch
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## etc_pidpath.dpatch by Jorge Salamero Sanz <bencer at cauterized.net>
-## DP: changes in etc files the path of logs
-
- at DPATCH@
-diff -urNad jabberd2~/etc/c2s.xml.dist.in jabberd2/etc/c2s.xml.dist.in
---- jabberd2~/etc/c2s.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/c2s.xml.dist.in 2009-04-17 18:26:44.000000000 +0100
-@@ -5,7 +5,7 @@
-
- <!-- The process ID file. Comment this out if you don't need to know
- the process ID from outside the process (eg for control scripts) -->
-- <pidfile>@localstatedir@/jabberd/pid/c2s.pid</pidfile>
-+ <pidfile>/var/run/jabberd2/c2s.pid</pidfile>
-
- <!-- Router connection configuration -->
- <router>
-diff -urNad jabberd2~/etc/router.xml.dist.in jabberd2/etc/router.xml.dist.in
---- jabberd2~/etc/router.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/router.xml.dist.in 2009-04-17 18:26:44.000000000 +0100
-@@ -5,7 +5,7 @@
-
- <!-- The process ID file. Comment this out if you don't need to know
- the process ID from outside the process (eg for control scripts) -->
-- <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
-+ <pidfile>/var/run/jabberd2/router.pid</pidfile>
-
- <!-- Log configuration - type is "syslog", "file" or "stdout" -->
- <log type='syslog'>
-diff -urNad jabberd2~/etc/s2s.xml.dist.in jabberd2/etc/s2s.xml.dist.in
---- jabberd2~/etc/s2s.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/s2s.xml.dist.in 2009-04-17 18:26:44.000000000 +0100
-@@ -5,7 +5,7 @@
-
- <!-- The process ID file. Comment this out if you don't need to know
- the process ID from outside the process (eg for control scripts) -->
-- <pidfile>@localstatedir@/jabberd/pid/s2s.pid</pidfile>
-+ <pidfile>/var/run/jabberd2/s2s.pid</pidfile>
-
- <!-- Router connection configuration -->
- <router>
-diff -urNad jabberd2~/etc/sm.xml.dist.in jabberd2/etc/sm.xml.dist.in
---- jabberd2~/etc/sm.xml.dist.in 2009-02-24 22:28:35.000000000 +0000
-+++ jabberd2/etc/sm.xml.dist.in 2009-04-17 18:26:44.000000000 +0100
-@@ -7,7 +7,7 @@
-
- <!-- The process ID file. Comment this out if you don't need to know
- the process ID from outside the process (eg for control scripts) -->
-- <pidfile>@localstatedir@/jabberd/pid/sm.pid</pidfile>
-+ <pidfile>/var/run/jabberd2/sm.pid</pidfile>
-
- <!-- Router connection configuration -->
- <router>
diff --git a/debian/patches/pkgname.diff b/debian/patches/pkgname.diff
new file mode 100644
index 0000000..dd0fe18
--- /dev/null
+++ b/debian/patches/pkgname.diff
@@ -0,0 +1,14 @@
+Description: Changes the name of the package
+Author: Jorge Salamero Sanz <bencer at cauterized.net>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ # Process this file with autoconf to produce a configure script.
+
+ AC_PREREQ(2.61)
+-AC_INIT([jabberd], [2.2.17], [jabberd2 at lists.xiaoka.com])
++AC_INIT([jabberd2], [2.2.17], [jabberd2 at lists.xiaoka.com])
+ AC_CONFIG_SRCDIR([sx/sx.h])
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE
diff --git a/debian/patches/pkgname.dpatch b/debian/patches/pkgname.dpatch
deleted file mode 100755
index b426714..0000000
--- a/debian/patches/pkgname.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pkgname.dpatch by Jorge Salamero Sanz <bencer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad jabberd2~/configure.ac jabberd2/configure.ac
---- jabberd2~/configure.ac 2009-05-01 14:39:39.000000000 +0100
-+++ jabberd2/configure.ac 2009-05-01 15:20:03.000000000 +0100
-@@ -2,7 +2,7 @@
- # Process this file with autoconf to produce a configure script.
-
- AC_PREREQ(2.61)
--AC_INIT([jabberd], [2.2.8], [jabberd2 at lists.xiaoka.com])
-+AC_INIT([jabberd2], [2.2.8], [jabberd2 at lists.xiaoka.com])
- AC_CONFIG_SRCDIR([sx/sx.h])
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cc1c191
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+etc_dbpath.diff
+etc_logpath.diff
+etc_pidpath.diff
+pkgname.diff
diff --git a/debian/rules b/debian/rules
index e52f390..502a987 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+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)
--
Jabberd2 XMPP server
More information about the Pkg-xmpp-commits
mailing list