-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2008-11-13 13:14:43 UTC
-
mfrom:
(1.2.2 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081113131443-1od7hm3qk2e5wbnb
Tags: 2.0.12-1+nmu1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
- Launchpad Integration: (Ubuntu specific)
+ debian/control.in: Add liblaunchpad-integration-dev build dependency.
+ Add 01_lpi.dpatch: Call launchpad_integration_add_items() in main() and
check for the launchpad-integration pkg-config module.
+ Add 02_autoconf.dpatch: autoconf changes from above patch.
- Update icons: (Ubuntu specific)
+ Add 42_change_pixmaps.dpatch shipping the debian/patched-icons dir.
+ debian/rules: uudecode debian/patched-icons in the config.status rule;
rm these in clean.
- Add desktop-file-onlyshowin.dpatch: Show ekiga in Mobile, too. (Ubuntu
specific).
- D-BUS support: (Debian #467212)
+ debian/rules: configure with --enable-dbus.
+ deiban/control.in: Add libdbus-glib-1-dev build dep.
- debian/rules: Create a PO template on build. (Debian #505535)
- debian/rules: symlink identical Gnome help files within packages. Add
fdupes build dependency for this. (Forwarded to Debian #505536)