-
Committer:
Bazaar Package Importer
-
Author(s):
Robert Ancell
-
Date:
2010-06-11 16:06:30 UTC
-
mfrom:
(1.5.9 upstream)
(1.2.11 sid)
-
Revision ID:
james.westby@ubuntu.com-20100611160630-8iolgbowspfaydud
Tags: 2.30.2-1ubuntu1
* Merge with debian unstable, remaining Ubuntu changes:
* debian/control.in:
- Build-depend on libpango1.0-dev
- Add Vcs-Bzr URL link
- Add gnome-network-admin package
* debian/rules:
- Run autotools on build
- Don't build services-admin
- Build POT files
* debian/gnome-network-admin.*:
* debian/gnome-system-tools.*:
- Put network-admin in it's own package
* debian/patches/25_sambashare_group_definition.patch:
- Add sambashare to known groups
* debian/patches/26_user_profiles_conf.patch:
- Don't add new user to audio group
* debian/patches/80_gst-packages-common.patch:
- Used by following 2 patches
* debian/patches/81_gst-packages-shares-admin.patch:
- Install nfs-kernel-server and samba on demand
* debian/patches/82_gst-packages-time-admin.patch:
- Install ntp on demand
* debian/patches/90_relibtoolize.patch:
- Not required, autotools now run on build
* debian/watch:
- Watch unstable series