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

[W. van den Akker]

The following commit has been merged in the master branch:
commit 1879129a3ec7633b3ee0ba944c4d2dae67b3124d
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Wed Jan 16 12:46:26 2013 +0100

    Added man_hypen.diff, sm_typo.diff and usr_etc.diff.

diff --git a/debian/changelog b/debian/changelog
index 3b69c60..a9c83c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ jabberd2 (2.2.17-1) UNRELEASED; urgency=low
     (Closes: #689539).
   * debian/preinst, debian/postrm: removed resolver entries.
   * debian/lintian-overrides: overrides false positives.
+  * Added patches man_hypen.diff, sm_typo.diff and usr_etc.diff.
   * Bumped up Standards Version to 3.9.4.
   * Bumped up debhelper to 9.
 
diff --git a/debian/patches/man_hypen.diff b/debian/patches/man_hypen.diff
new file mode 100644
index 0000000..89d29dc
--- /dev/null
+++ b/debian/patches/man_hypen.diff
@@ -0,0 +1,58 @@
+Description: Replace minus with the correct hypen escape.
+Author: Willem van den Akker <wvdakker at wilsoft.nl>
+
+--- a/man/c2s.8.in
++++ b/man/c2s.8.in
+@@ -16,7 +16,7 @@
+ Alternate configuration file to use. The compiled-in default is @sysconfdir@/c2s.xml.
+ .TP
+ .B \-D
+-Print debugging output. You should configure jabberd with the --enable-debug switch to enable this.
++Print debugging output. You should configure jabberd with the \(hy\(hyenable\(hydebug switch to enable this.
+ .SH SEE ALSO
+ .BR jabberd (8)
+ .BR @jabberd_router_bin@ (8)
+--- a/man/jabberd.8.in
++++ b/man/jabberd.8.in
+@@ -16,7 +16,7 @@
+ Alternate configuration file to use. The compiled-in default is @sysconfdir@/jabberd.cfg
+ .TP
+ .B \-D
+-Print debugging output. You should configure jabberd with the --enable-debug switch to enable this.
++Print debugging output. You should configure jabberd with the \(hy\(hyenable\(hydebug switch to enable this.
+ .SH SEE ALSO
+ .BR @jabberd_c2s_bin@ (8)
+ .BR @jabberd_router_bin@ (8)
+--- a/man/router.8.in
++++ b/man/router.8.in
+@@ -16,7 +16,7 @@
+ Alternate configuration file to use. The compiled-in default is @sysconfdir@/router.xml.
+ .TP
+ .B \-D
+-Print debugging output. You should configure jabberd with the --enable-debug switch to enable this.
++Print debugging output. You should configure jabberd with the \(hy\(hyenable\(hydebug switch to enable this.
+ .SH SEE ALSO
+ .BR jabberd (8)
+ .BR @jabberd_c2s_bin@ (8)
+--- a/man/s2s.8.in
++++ b/man/s2s.8.in
+@@ -16,7 +16,7 @@
+ Alternate configuration file to use. The compiled-in default is @sysconfdir@/s2s.xml.
+ .TP
+ .B \-D
+-Print debugging output. You should configure jabberd with the --enable-debug switch to enable this.
++Print debugging output. You should configure jabberd with the \(hy\(hyenable\(hydebug switch to enable this.
+ .SH SEE ALSO
+ .BR jabberd (8)
+ .BR @jabberd_c2s_bin@ (8)
+--- a/man/sm.8.in
++++ b/man/sm.8.in
+@@ -16,7 +16,7 @@
+ Alternate configuration file to use. The compiled-in default is @sysconfdir@/sm.xml.
+ .TP
+ .B \-D
+-Print debugging output. You should configure jabberd with the --enable-debug switch to enable this.
++Print debugging output. You should configure jabberd with the \(hy\(hyenable\(hydebug switch to enable this.
+ .SH SEE ALSO
+ .BR jabberd (8)
+ .BR @jabberd_c2s_bin@ (8)
diff --git a/debian/patches/series b/debian/patches/series
index cc1c191..13eb0ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+man_hypen.diff
+sm_typo.diff
+usr_etc.diff
 etc_dbpath.diff
 etc_logpath.diff
 etc_pidpath.diff
diff --git a/debian/patches/sm_typo.diff b/debian/patches/sm_typo.diff
new file mode 100644
index 0000000..d4f453d
--- /dev/null
+++ b/debian/patches/sm_typo.diff
@@ -0,0 +1,14 @@
+Description: Fix typo in mm.c
+Author: Willem van den Akker <wvdakker at wilsoft.nl>
+
+--- a/sm/mm.c
++++ b/sm/mm.c
+@@ -64,7 +64,7 @@
+     if (modules_path != NULL)
+         log_write(sm->log, LOG_NOTICE, "modules search path: %s", modules_path);
+     else
+-        log_write(sm->log, LOG_NOTICE, "modules search path undefined, using deafult: "LIBRARY_DIR);
++        log_write(sm->log, LOG_NOTICE, "modules search path undefined, using default: "LIBRARY_DIR);
+ 
+     celem = nad_find_elem(sm->config->nad, celem, -1, "chain", 1);
+     while(celem >= 0) {
diff --git a/debian/patches/usr_etc.diff b/debian/patches/usr_etc.diff
new file mode 100644
index 0000000..33c2746
--- /dev/null
+++ b/debian/patches/usr_etc.diff
@@ -0,0 +1,14 @@
+Description: Changes the path of the init files
+Author: Willem van den Akker <wvdakker at wilsoft.nl>
+
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -1,7 +1,7 @@
+ LIBTOOL += --quiet
+ 
+ sysconf_DATA = c2s.xml.dist router.xml.dist s2s.xml.dist sm.xml.dist jabberd.cfg.dist router-users.xml.dist router-filter.xml.dist
+-initdir = $(prefix)/etc/init
++initdir = /etc/jabberd2
+ init_DATA = jabberd-c2s.conf jabberd-router.conf jabberd-s2s.conf jabberd-sm.conf
+ configs = $(sysconf_DATA) $(init_DATA)
+ EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in)

-- 
Jabberd2 XMPP server