« back to all changes in this revision
Viewing changes to util/Makefile.am
- Committer: Bazaar Package Importer
- Date: 2008-08-12 16:13:43 UTC
- mfrom: (1.1.3 upstream) (0.1.2 sid)
- Revision ID: james.westby@ubuntu.com-20080812161343-6trz3r97dtevxd17
* 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
- 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
- files added:
- README.protocol
- storage
- sx/scod
- files removed:
- PROTOCOL
- expat
- resolver
- scod
- files modified:
- AUTHORS
added
removed
util/Makefile.am
