Please merge gkrellm 2.3.2-2 (universe) from Debian unstable (main).

Attached the .diff.gz file.

It's a new upstream release. The debdiff between the old Ubuntu .dsc and the new one was too long (~47K lines).

What about the debian->ubuntu debdiff?

Oups! Forgot to attach it.

Thanks Iain.

This bug was fixed in the package gkrellm - 2.3.2-2ubuntu1

---------------
gkrellm (2.3.2-2ubuntu1) jaunty; urgency=low

  * Merge from debian unstable (LP: #294883), remaining changes:
   + debian/control:
    - Adjust Conflicts/Replaces versions for Ubuntu.
   + debian/rules:
    - Add --no start optiom to DEB_DH_INSTALLINIT_ARGS to avoid errors
      during upgrade and removal phases.

gkrellm (2.3.2-2) unstable; urgency=medium

  * debian/gkrellm.install
    - added installation of "log.h" header; thanks to Bradley Smith for the
      report; Closes: #504209

gkrellm (2.3.2-1) unstable; urgency=low

  * Adopting packages; Closes: #494725
  * New upstream release
    - add linux sysfs battery interface, preferred over deprecated /proc/acpi
      interface; Closes: #463779
  * debian/control
    - set me as maintainer (adoption)
    - added Homepage field
    - updated Vcs-{Git,Browser} field
    - changed a bit the descriptions
    - added build-dep on libntlm0-dev, needed by upstream to remove smb* files
  * debian/patches/01_gkrellmd.conf.patch
    - refreshed for new upstream code
  * debian/patches/02_memory_leak.patch
    - removed since merged upstream
  * debian/patches/03_sysfs-battery-patch_476641.patch
    - removed since merged upstream
  * debian/patches/04_fix_manpage_hyphen.patch
    - added to fix hyphen-used-as-minus-sign lintian warning
  * debian/patches/05_bts437033_fix_strip.patch
    - added to fix binary stripping; thanks to Julien Danjou for the report;
      Closes: #437033
  * debian/copyright
    - updated upstream email address
    - updated copyright years
    - added license boilerplate
    - updated list of files with different copyright notices
  * debian/gkrellmd.{postinst,postrm}
    - shell script set "-e" flag; lintian warning
    - moved user check into "if" statement
  * debian/gkrellmd.postrm
    - replaced "--remove-all-files" option with "--system"

 -- Iulian Udrea <email address hidden> Wed, 05 Nov 2008 04:04:56 +0000