Please merge gnome-system-tools 2.22.0-1 (main) from Debian unstable (main)

Hi,

Attached is the debdiff for the merge. There were quite a lot
of remaining changes, but I think the merge is good.

Thanks,

James

Hi,

As the diff renames lots of files it is quite hard to read. Attached
is the bzr diff for the same thing that shows renames instead.

Thanks,

James

Hi,

And here is the remaining diff to Debian.

Thanks,

James

thank you for your work on that, the changes seem to be mostly correct, some notes though:

changelog:
- some of the ubuntu changes are not listed in the summary, the samba and ntp installation patches and the network-admin apply button one, but that's a detail

control.in:
- the build-depends versionning changes are not required
- the standards-version downgrade is wrong
- the conflicts was a transitional things and not required now
- there is some description lines which have only spacing changes and are not required
- the gnome-network-admin replaces on gnome-system-tools version needs to be updated to the current version because the change is new in this ubuntu version

rules:
- the comments changes are not required

other good job, only the updated replaces version is required to not create conflicts errors on upgrade, other changes are cosmetic, could you do those changes and attach a new debdiff to the bug?

Hi Sebastien,

Thanks for the detailed review.

I have updated the package with your comments, and I attach the new
debdiff.

I will also attach the diff to the last version, which may aid your review.

Thanks,

James

Hi,

Here's the diff since the last submitted version.

Thanks,

James

looks good, thank you for your work there

This bug was fixed in the package gnome-system-tools - 2.22.0-1ubuntu1

---------------
gnome-system-tools (2.22.0-1ubuntu1) intrepid; urgency=low

  * 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.
      - 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
      - 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.
      - This fixes random errors like "unrelated user was dropped from group
        admin", "deleted a different user than the one selected in users-admin",
        etc.
      - Patch backported from SVN head:
        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...