-
Committer:
Bazaar Package Importer
-
Author(s):
Didier Roche
-
Date:
2010-05-31 16:48:21 UTC
-
mfrom:
(1.5.8 upstream)
(1.2.10 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100531164821-i5njc1bg53o2mu0k
Tags: 2.30.1-2ubuntu1
* Merge with debian unstable, remaining changes:
- debian/control.in:
+ Add Vcs-Bzr URL info.
+ build-dep on libpango1.0-dev
- Split network-admin in to separate gnome-network-admin package
- Don't build services-admin
- 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/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/80_gst-packages-common.patch:
+ Used by previous 2 patches
- debian/profiles: Add profiles - see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488256
- debian/rules: i18n magic
- debian/watch: Watch unstable series
* refresh debian/patches/90_relibtoolize.patch