diff -u gnome-system-tools-2.29.91/debian/gnome-system-tools.manpages gnome-system-tools-2.29.91/debian/gnome-system-tools.manpages --- gnome-system-tools-2.29.91/debian/gnome-system-tools.manpages +++ gnome-system-tools-2.29.91/debian/gnome-system-tools.manpages @@ -1,3 +1,4 @@ +debian/services-admin.1 debian/shares-admin.1 debian/time-admin.1 debian/users-admin.1 diff -u gnome-system-tools-2.29.91/debian/rules gnome-system-tools-2.29.91/debian/rules --- gnome-system-tools-2.29.91/debian/rules +++ gnome-system-tools-2.29.91/debian/rules @@ -10,8 +10,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-schemas-install \ --disable-nautilus \ - --disable-scrollkeeper \ - --disable-services + --disable-scrollkeeper DEB_DH_MAKESHLIBS_ARGS_gnome-system-tools += --no-act @@ -21,4 +20,5 @@ build/gnome-system-tools:: cd doc/network; make pot + cd doc/services; make pot cd doc/time; make pot cd doc/users; make pot diff -u gnome-system-tools-2.29.91/debian/changelog gnome-system-tools-2.29.91/debian/changelog --- gnome-system-tools-2.29.91/debian/changelog +++ gnome-system-tools-2.29.91/debian/changelog @@ -1,3 +1,10 @@ +gnome-system-tools (2.29.91-0ubuntu3) lucid; urgency=low + + * Re-enable services-admin, since the system-tools-backends are + Upstart-compliant since 2.8.2. + + -- Milan Bouchet-Valat Thu, 11 Mar 2010 23:06:25 +0100 + gnome-system-tools (2.29.91-0ubuntu2) lucid; urgency=low * debian/patches/26_user_profiles_conf.patch: diff -u gnome-system-tools-2.29.91/debian/gnome-system-tools.menu gnome-system-tools-2.29.91/debian/gnome-system-tools.menu --- gnome-system-tools-2.29.91/debian/gnome-system-tools.menu +++ gnome-system-tools-2.29.91/debian/gnome-system-tools.menu @@ -14,0 +15,5 @@ + +?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\ + hints="RunLevel"\ + title="Services Admin" command="/usr/bin/services-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/services.xpm" diff -u gnome-system-tools-2.29.91/debian/gnome-system-tools.install gnome-system-tools-2.29.91/debian/gnome-system-tools.install --- gnome-system-tools-2.29.91/debian/gnome-system-tools.install +++ gnome-system-tools-2.29.91/debian/gnome-system-tools.install @@ -1,8 +1,10 @@ +debian/pixmaps/services.xpm usr/share/gnome-system-tools/pixmaps/ debian/pixmaps/shares.xpm usr/share/gnome-system-tools/pixmaps/ debian/pixmaps/time.xpm usr/share/gnome-system-tools/pixmaps/ debian/pixmaps/users.xpm usr/share/gnome-system-tools/pixmaps/ debian/tmp/etc/gconf debian/tmp/etc/gnome-system-tools +debian/tmp/usr/bin/services-admin debian/tmp/usr/bin/shares-admin debian/tmp/usr/bin/time-admin debian/tmp/usr/bin/users-admin @@ -13,10 +15,13 @@ debian/tmp/usr/share/omf/time-admin debian/tmp/usr/share/omf/users-admin debian/tmp/usr/share/omf/shares-admin +debian/tmp/usr/share/omf/services-admin debian/tmp/usr/share/gnome-system-tools +debian/tmp/usr/share/applications/services.desktop debian/tmp/usr/share/applications/shares.desktop debian/tmp/usr/share/applications/time.desktop debian/tmp/usr/share/applications/users.desktop +debian/tmp/usr/share/gnome/help/services-admin debian/tmp/usr/share/gnome/help/shares-admin debian/tmp/usr/share/gnome/help/time-admin debian/tmp/usr/share/gnome/help/users-admin