diff -u jabberd2-2.2.8/debian/control jabberd2-2.2.8/debian/control --- jabberd2-2.2.8/debian/control +++ jabberd2-2.2.8/debian/control @@ -1,7 +1,8 @@ Source: jabberd2 Section: net Priority: optional -Maintainer: Debian XMPP Maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian XMPP Maintainers Uploaders: Jorge Salamero Sanz , Thadeu Lima de Souza Cascardo Build-Depends: debhelper (>= 7), dpatch, 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 Standards-Version: 3.8.1 @@ -9,8 +10,8 @@ Package: jabberd2 Architecture: any -Conflicts: jabberd2-bdb, jabberd2-mysql, jabberd2-pgsql, jabberd2-ldap-bdb, jabberd2-ldap-mysql, jabberd2-ldap-pgsql -Replaces: jabberd2-bdb, jabberd2-mysql, jabberd2-pgsql, jabberd2-ldap-bdb, jabberd2-ldap-mysql, jabberd2-ldap-pgsql +Conflicts: jabberd2-bdb, jabberd2-mysql, jabberd2-pgsql, jabberd2-ldap-bdb, jabberd2-ldap-mysql, jabberd2-ldap-pgsql, jabber +Replaces: jabberd2-bdb, jabberd2-mysql, jabberd2-pgsql, jabberd2-ldap-bdb, jabberd2-ldap-mysql, jabberd2-ldap-pgsql, jabber Depends: adduser, ${shlibs:Depends} Description: Jabber instant messenger server Jabber is a free instant messaging server based on XMPP. diff -u jabberd2-2.2.8/debian/init jabberd2-2.2.8/debian/init --- jabberd2-2.2.8/debian/init +++ jabberd2-2.2.8/debian/init @@ -22,6 +22,11 @@ chown ${USER}:${GROUP} ${PIDPATH} fi +if [ ! -d "$PIDPATH" ];then + mkdir "$PIDPATH" + chown jabber:adm "$PIDPATH" +fi + case "$1" in start) echo -n "Starting Jabber services:" diff -u jabberd2-2.2.8/debian/changelog jabberd2-2.2.8/debian/changelog --- jabberd2-2.2.8/debian/changelog +++ jabberd2-2.2.8/debian/changelog @@ -1,3 +1,14 @@ +jabberd2 (2.2.8-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #373246) + - debian/control + - Conflict/Replace jabber for jabberd2 + - debian/init + - create /var/run/jabber directory with correct permissions + * Fixes at least: LP: #320522) + + -- Andreas Moog Thu, 07 May 2009 13:39:06 +0200 + jabberd2 (2.2.8-1) unstable; urgency=low * New Upstream Version (Closes: #525417). @@ -25,6 +36,84 @@ -- Jorge Salamero Sanz Fri, 17 Apr 2009 16:39:07 +0100 +jabberd2 (2.2.1-1.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + Modify Maintainer field as per spec + + Added Conflicts and Replaces: ..., jabber for jabberd2 + + Build-Dep on libdb-dev instead of versionized libdb*-dev + - debian/rules: Added libtoolize call (jabberd2 ships with + an older ltmain.sh version that conflicts with the + current libtool version) + - debian/init: create /var/run/jabber directory with correct + permissions + + + -- Stephan Hermann Mon, 01 Dec 2008 08:13:21 +0000 + +jabberd2 (2.2.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Prevent an implicit pointer conversion of the return pointer from + crypt() (Closes: #493768). + * Define LDAP_DEPRECATED to continue to make use of a deprecated API + without implicitly converting returned pointers (Closes: #493765) + + -- dann frazier Mon, 17 Nov 2008 19:36:16 -0700 + +jabberd2 (2.2.1-1ubuntu2) jaunty; urgency=low + + * debian/control: b-d on libdb-dev instead of versionized libdb*-dev + + -- Stephan Hermann Thu, 13 Nov 2008 07:16:12 +0000 + +jabberd2 (2.2.1-1ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable (LP: #257130), remaining changes: + - debian/control: + + Modify Maintainer field as per spec + + Depend on libdb4.6-dev instead of libdb4.4-dev + + Added Conflicts and Replaces: ..., jabber for jabberd2 + - debian/rules: Added libtoolize call (jabberd2 ships with + an older ltmain.sh version that conflicts with the + current libtool version) + - debian/init: create /var/run/jabber directory with correct + permissions + * Dropped changes: + - Debian already depends on libpq-dev + + -- Nicolai Spohrer Tue, 12 Aug 2008 16:13:43 +0200 + +jabberd2 (2.2.1-1) unstable; urgency=low + + * New upstream release (Closes: #403750). + + photo support in mod_iq_vcard included (Closes: #311170). + + c2s no longer crashes when speaking ssl to the tls port + (Closes: #245306). + * Packaging is completly new almost from scratch: + * Multiple binaries packages merged into a single binary with support for + all databases and auth methods + (Closes: #386900, #414152, #406459, #357733, #386653, #406460). + * compat: updated to version 5. + * control: no longer depends on jabber-common (Closes: #324829). + * control: updated to libpq-dev (Closes: #409765). + * control: built against libgsasl (Closes: #402498). + * control: Homepage field. + * copyright: completly new file. + * default, [pre|post]scripts: daemons run as jabber:jabber + (Closes: #440302). + * dirs, docs: updated with minor changes. + * init: updated to use LSB headers. + * lintian-overrides: jabberd2 is licensed with the openssl exception. + * logrotate: logs are rotated (Closes: #345212). + * watch: new watch file with the new upstream authors. + * patches: + + change PKGNAME from jabberd to jabberd2. + + change defaults paths to LSB compatible. + + -- Jorge Salamero Sanz Thu, 17 Jul 2008 12:38:05 +0200 + jabberd2 (2.1.24.1-1) unstable; urgency=low * New upstream release (Closes: #403750). @@ -54,6 +143,37 @@ -- Jorge Salamero Sanz Fri, 04 Apr 2008 09:59:47 +0000 +jabberd2 (2.0s11-1ubuntu4) hardy; urgency=low + + * Rebuild adainst libdb4.6 (LP: #187448) + + -- Nicolas Valcárcel Wed, 30 Jan 2008 17:57:58 -0500 + +jabberd2 (2.0s11-1ubuntu3) hardy; urgency=low + + * Rebuild against libldap2.4-2 + + -- Emmet Hikory Thu, 24 Jan 2008 21:56:43 +0900 + +jabberd2 (2.0s11-1ubuntu2) gutsy; urgency=low + + * debian/jabberd2.init: correct typo in pid directory creation + (LP: #147157) + * really modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Lionel Porcheron Mon, 08 Oct 2007 00:53:24 +0200 + +jabberd2 (2.0s11-1ubuntu1) gutsy; urgency=low + + * now use Debian package in experimental (LP: #119545) + * debian/control: change postresql-dev in libpq-dev in build depends + * debian/control: adding Conflicts to jabber package + * debian/jabberd2.init: create /var/run/jabber directory with correct + permissions + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Lionel Porcheron Mon, 25 Jun 2007 16:41:27 +0200 + jabberd2 (2.0s11-1) experimental; urgency=low * New upstream release (closes: #357874).