Please merge startupmanager 1.9.13-4 (universe) from Debian testing (main)

[Marco Rodrigues]

The only Ubuntu change remaining is that grub-pc is preffered alternative of grub.

startupmanager (1.9.13-4) unstable; urgency=low

   * debian/control:
     + Replace grub2 (dummy package) by grub-pc. Thanks Colin Watson.

 -- Marco Rodrigues <email address hidden> Thu, 15 Oct 2009 20:04:08 +0100

startupmanager (1.9.13-3) unstable; urgency=low

   * debian/control:
     + Bump Standards-Version to 3.8.3 (no changes).
     + Add grub2 to Depends.
     + Add Usplash to short and long description.
   * debian/startupmanager.1:
     + Add supported Usplash to manual.

 -- Marco Rodrigues <email address hidden> Thu, 17 Sep 2009 12:51:12 +0100

startupmanager (1.9.13-2) unstable; urgency=low

   * Re-add patches directory. Missing in the last upload.
   * debian/patches:
     + Correct patch to add su-to-root to desktop file.
   * debian/copyright:
     + Bump copyright years for translation files.
     + Point package license to GPL-2 to make lintian happy.

 -- Marco Rodrigues <email address hidden> Fri, 10 Jul 2009 17:32:16 +0100

startupmanager (1.9.13-1) unstable; urgency=low

   * New upstream version.
   * Add preinst to remove pycentral files.
   * debian/control:
     + Bump Standards-Version to 3.8.2 (no changes).
     + Migrate from pycentral to pysupport.
     + Add x11-xserver-utils (provides xrandr) to Depends.
   * debian/rules:
     + Migrate from pycentral to pysupport.
   * debian/watch:
     + Fix upstream package name to check latest version.
   * debian/copyright:
     + Bump copyright years.

 -- Marco Rodrigues <email address hidden> Mon, 06 Jul 2009 22:56:06 +0100

[Chris Coulson (chrisccoulson)]

This isn't syncable. From the Ubuntu changelog:

* Depend on grub-pc as a preferred alternative to grub

The Debian package has grub as a preferred alternative to grub-pc, which is different to what the Ubuntu package has ("grub-pc | grub" versus "grub | grub-pc").

Feel free to merge though

[Chris Coulson (chrisccoulson)]

Unsubscribing sponsors for now

[Marco Rodrigues (gothicx)]

That line doesn't means that it will install grub-pc if grub isn't found ? ( grub | grub-pc )

[Chris Coulson (chrisccoulson)]

Yes, "grub | grub-pc" means that it will install grub-pc if grub isn't found - ie, grub is a preferred alternative to grub-pc.

However, in Ubuntu we have "grub-pc | grub", which means that grub will be installed if grub-pc isn't found - ie, grub-pc is a preferred alternative to grub. This is fundamentally different to Debian.

If you can justify dropping the change there, then it can be sync'd. However, if you can't justify dropping this change, then it must be merged instead.

[Chris Coulson (chrisccoulson)]

Looks ok, taking for sponsoring - thanks!

[Launchpad Janitor (janitor)]

This bug was fixed in the package startupmanager - 1.9.13-4ubuntu1

---------------
startupmanager (1.9.13-4ubuntu1) lucid; urgency=low

  * Merge from debian testing, Ubuntu remaining changes (LP: #475269):
    - debian/control: Depend on grub-pc as a preferred
      alternative to grub.
 -- Marco Rodrigues <email address hidden> Sun, 08 Nov 2009 21:47:03 +0000