Please merge hostname (3.03) from Debian Testing

[Vikram Dhillon]

Binary package hint: hostname

Changelogs:

Latest Ubuntu Changelog:
hostname (3.01ubuntu1) lucid; urgency=low

  * Resynchronise with Debian. Remaining changes:
    - Install Upstart job to set hostname on startup, but do not run it in
      postinst.
    - Build-depend on newer debhelper for Upstart-aware dh_installinit.

hostname (3.01) unstable; urgency=low

  * Made 'hostname -s' only display the host name cut at the first dot.
    (Closes: #552482)

hostname (3.00) unstable; urgency=low

  * Bumped versioned conflict against nis. (Closes: #546753)
  * End beta phase and bump major version to 3.

hostname (2.99) unstable; urgency=low

  [ Cristian Greco ]
  * attempt to clarify program documentation in usage() and manpage.
  * bump version to 2.99
  * Add versioned Replaces/Conflicts against nis (<< 3.17-29), which
    drops the {yp,nis,} commands.
 -- Colin Watson < <email address hidden>> Mon, 14 Dec 2009 15:02:30 +0000

Latest Debian Changelog:

hostname (3.03) unstable; urgency=low

   * Do not use buffer on error return. (Closes: #565634) - thanks to
     Marco d'Itri <email address hidden>
 -- Michael Meskes <email address hidden> Tue, 19 Jan 2010 09:07:56 +0100

Since this is a merge, I'll provide a patch in a minute, the package builds fine in a lucid-chroot:

dpkg-deb: building package `hostname' in `../hostname_3.03_i386.deb'.
 dpkg-genchanges >../hostname_3.03_i386.changes
dpkg-genchanges: including full source code in upload
dpkg-buildpackage: full upload; Debian-native package (full source is included)
I: Copying back the cached apt archive contents
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env
I: removing directory /var/cache/pbuilder/build//14861 and its subdirectories

[Vikram Dhillon (dhillon-v10)]

Applies fine with -p0

$ patch -p0 < debian.diff
patching file debian/changelog
patching file debian/control
patching file debian/rules
patching file debian/upstart
$

[Colin Watson (cjwatson)]

Please do not modify Standards-Version in Ubuntu changes; it isn't useful and it just has the effect of increasing our delta against Debian, which we should only be doing if there's some concrete benefit. See the Ubuntu Policy Manual.

Please copy and paste the previous "Remaining changes" changelog entry. While it's fine to improve on this rather than just copying it verbatim, in this case the previous entry is much more descriptive than yours so it should be used instead.

You incorrectly reverted a Debian change to the Uploaders field in debian/control.

Fix these and I'll sponsor it. Thanks.

[Vikram Dhillon (dhillon-v10)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/01/2010 07:28 PM, Colin Watson wrote:
> Please do not modify Standards-Version in Ubuntu changes; it isn't
> useful and it just has the effect of increasing our delta against
> Debian, which we should only be doing if there's some concrete benefit.
> See the Ubuntu Policy Manual.
>
> Please copy and paste the previous "Remaining changes" changelog entry.
> While it's fine to improve on this rather than just copying it verbatim,
> in this case the previous entry is much more descriptive than yours so
> it should be used instead.
>
> You incorrectly reverted a Debian change to the Uploaders field in
> debian/control.
>
> Fix these and I'll sponsor it. Thanks.
>
> ** Changed in: hostname (Ubuntu)
> Assignee: (unassigned) => Colin Watson (cjwatson)
>

Sorry about inconvenience Colin, I have made the changes that you
suggested, as for the change in Uploaders the changelog said that the
person changed his email address, so I just did the same. I didn't
remove anything, just modified the email. Here's the new diff, hopefully
it is free of errors :)

- --
Regards,
Vikram Dhillon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkuTARkACgkQcoBavQdRHcxD0wCeNN+mL/S2+hQnh2aywXPm8Vyf
vDwAnjgOXsE8ERFGsVa7xXnH+CEQpqfR
=itI8
-----END PGP SIGNATURE-----

[Colin Watson (cjwatson)]

The problem is that you *reverted* the Debian developer's e-mail address change - that is, you changed it *back* to what it was before. Naughty. :-) If you're merging in the normal way, you should not have to try to explicitly repeat Debian changes, and thereby risk getting them the wrong way round like this.

I've fixed up this part of your patch and uploaded. Thanks!