=== modified file 'debian/changelog' --- debian/changelog 2008-06-25 09:58:28 +0000 +++ debian/changelog 2008-06-27 12:28:45 +0000 @@ -1,30 +1,46 @@ gnome-system-tools (2.22.0-1ubuntu1) intrepid; urgency=low - * Merge from Debian (LP: #). Remaining changes: + * Merge from Debian (LP: #242880). Remaining changes: - Make it possible to create a group by using the tool by not ignoring the group name that was chosen. (LP: #205144) This is debian/patches/85_users_fix_add_group.patch. + - http://bugzilla.gnome.org/show_bug.cgi?id=529228 + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488249 - change from svn, correctly configure the network interfaces, thanks to the different people who worked on the issue (lp: #185854) debian/patches/90_from_svn_correctly_configure_interface.patch: + - http://bugzilla.gnome.org/show_bug.cgi?id=526137 + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488250 - debian/control, debian/control.in: remove gksu from Depends, add policykit-gnome to Recommends; needed to press the Unlock button - in network-admin, LP: #206198 + in network-admin, LP: #206198. + - Ubuntu-specific as Debian hasn't enabled policykit. - If a user already exists then set the home directory text box to display their home directory, rather than the default for their profile. This avoids changing the homedir inadvertantly when a user's homedir isn't the default for their profile, in particular the root user on Ubuntu. (LP: #198172) + - http://bugzilla.gnome.org/show_bug.cgi?id=523180 + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488252 - list the sambashare group as known so it can be used when adding users debian/patches/25_sambashare_group_definition.patch: + - Unsure if this should be forwarded to Debian. + - list the lpadmin group as known so it can be used when adding users + (lp: #152107) + debian/patches/24_lpadmin_group_definition.patch: + - Unsure if this should be forwarded to Debian. + - Add some extra known services for services-admin. + - debian/patches/10_add_missing_services.patch + - Unsure if this should be forwarded to Debian. - debian/patches/22_root_only.patch: - really remove this change which is not used nor required - - list the lpadmin group as known so it can be used when adding users - (lp: #152107) - debian/patches/24_lpadmin_group_definition.patch: + - Ubuntu-specific. - translate extra shares admin strings (lp: #200107) debian/patches/84_translate_extra_strings.patch: + - http://bugzilla.gnome.org/show_bug.cgi?id=522276 + - Not needed in Debian, as they don't have extra translations. - Build-dep in libpolkit-dbus-dev >=0.5 to get policykit support. + - Ubuntu-specific. - Update the internal model of users and groups with each operation, so that it does not become inconsistent with the real world in /etc/passwd and /etc/group. @@ -35,10 +51,23 @@ http://svn.gnome.org/viewvc/gnome-system-tools?view=revision&revision=4017 - LP: #26338 - debian/patches/23_users_update_model.patch: + - Unsure if this should be forwarded to Debian. - don't Recommends gnome-control-center since the current version doesn't require it (LP: #137915) + - Unsure if this should be forwarded to Debian. - Replace "Bootloaders" and "Runlevels" with "Services" and "Shares" in the description. + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488255 + - Add profiles. + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488256 + - Add an apply button to Network Locations. + - http://bugzilla.gnome.org/show_bug.cgi?id=540478 + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488260 + - Install nfs, ntp and samba on demand. + - Unsure if this should be forwarded to Debian. + - Don't show "shares-admin" under GNOME. + - debian/patches/11_shares_admin_not_listed_under_gnome.patch + - Ubuntu-specific. * Refresh all packages and transition them to quilt patches. -- James Westby Tue, 24 Jun 2008 14:05:30 +0100 === modified file 'debian/control' --- debian/control 2008-06-25 09:58:28 +0000 +++ debian/control 2008-06-27 12:28:45 +0000 @@ -14,10 +14,10 @@ libgtk2.0-dev (>= 2.11.3), cracklib2-dev, libglib2.0-dev (>= 2.15.2), - libgconf2-dev (>= 2.10.0-1), + libgconf2-dev (>= 2.2.0), libdbus-1-dev (>= 0.32), libiw-dev, - libnautilus-extension-dev (>= 2.10.0-1), + libnautilus-extension-dev (>= 2.9.3), gettext, libxml-parser-perl, gnome-pkg-tools, @@ -34,7 +34,6 @@ perl, system-tools-backends Recommends: policykit-gnome -Conflicts: system-tools-backends (<< 2.2) Suggests: ntp, samba-common, wvdial @@ -50,8 +49,8 @@ * Full integration with the new GNOME Control Center. * An user-friendly interface to carry out the main administration tasks. * The use of a common user interface in every system. - * A common structure that makes easy the development of new system tools. - Nowadays there are tools for managing: + * A common structure that makes easy the development of new system tools. + Nowadays there are tools for managing: - Users and groups - Date and time - Network configuration @@ -63,7 +62,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, gnome-system-tools -Replaces: gnome-system-tools (<< 2.20.0-3) +Replaces: gnome-system-tools (<< 2.22.0-1ubuntu1) Description: GNOME Network Administration Tool The GNOME System Tools are a fully integrated set of tools aimed to make easy the job that means the computer administration on an UNIX or Linux system. === modified file 'debian/control.in' --- debian/control.in 2008-06-25 09:58:28 +0000 +++ debian/control.in 2008-06-27 12:28:45 +0000 @@ -14,10 +14,10 @@ libgtk2.0-dev (>= 2.11.3), cracklib2-dev, libglib2.0-dev (>= 2.15.2), - libgconf2-dev (>= 2.10.0-1), + libgconf2-dev (>= 2.2.0), libdbus-1-dev (>= 0.32), libiw-dev, - libnautilus-extension-dev (>= 2.10.0-1), + libnautilus-extension-dev (>= 2.9.3), gettext, libxml-parser-perl, gnome-pkg-tools, @@ -34,7 +34,6 @@ perl, system-tools-backends Recommends: policykit-gnome -Conflicts: system-tools-backends (<< 2.2) Suggests: ntp, samba-common, wvdial @@ -50,8 +49,8 @@ * Full integration with the new GNOME Control Center. * An user-friendly interface to carry out the main administration tasks. * The use of a common user interface in every system. - * A common structure that makes easy the development of new system tools. - Nowadays there are tools for managing: + * A common structure that makes easy the development of new system tools. + Nowadays there are tools for managing: - Users and groups - Date and time - Network configuration @@ -63,7 +62,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, gnome-system-tools -Replaces: gnome-system-tools (<< 2.20.0-3) +Replaces: gnome-system-tools (<< 2.22.0-1ubuntu1) Description: GNOME Network Administration Tool The GNOME System Tools are a fully integrated set of tools aimed to make easy the job that means the computer administration on an UNIX or Linux system. === modified file 'debian/rules' --- debian/rules 2008-06-25 09:58:28 +0000 +++ debian/rules 2008-06-27 12:28:45 +0000 @@ -1,17 +1,9 @@ #!/usr/bin/make -f -# Gnome Team include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -# get-orig-source target -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk - include /usr/share/cdbs/1/rules/debhelper.mk -# Including this gives us a number of rules typical to a GNOME -# program, including setting GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1. -# Note that this class inherits from autotools.mk and docbookxml.mk, -# so you don't need to include those too. include /usr/share/cdbs/1/class/gnome.mk - include /usr/share/cdbs/1/rules/patchsys-quilt.mk LDFLAGS += -Wl,-z,defs -Wl,-O1