Please merge clamtk 3.10-1 (universe) from Debian unstable (main)

Debian->Ubuntu debdiff

Ubuntu->Ubuntu debdiff

clamtk (3.10-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #240735):
    - Change freshclam depends to clamav-freshclam|clamav-data so
      package works with clamav-data (LP: #200619)
     Change maintainer to MOTU

 -- Nathan Handler <email address hidden> Tue, 17 Jun 2008 11:55:17 -0500

Please resubmit the debdiff without the .po file cruft and with a correctly formatted debian/changelog entry. The latter looks to be the result of a hasty copy/paste. Also, please test the new version against the clamav version (0.93.1) in Intrepid if you haven't. If you aren't on Intrepid, you can get 0.93.1 packages from https://launchpad.net/~ubuntu-clamav/+archive

Generally it is considered polite to ask before taking over other people's merges.

I have removed the .po files from the debdiff using filterdiff. The changelog is also properly formatted. I wasn't sure how you wanted me to test clamav version 0.93.1. I increased the version numbers of the clamav and clamav-freshclam dependencies from 0.90 to 0.93.1. After building clamtk, I was able to successfully install the .deb file. I was also able to scan for viruses once I installed clamtk. If this is not what you meant, just say so.

Here is the new Debian->Ubuntu debdiff

Ubuntu->Ubuntu debdiff

clamtk (3.10-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #240735):
    - Change freshclam depends to clamav-freshclam|clamav-data so
      package works with clamav-data (LP: #200619)
    - Change maintainer to MOTU
  * Increased version number of clamav and clamav-freshclam
    Dependencies from 0.90 to 0.93.1

 -- Nathan Handler <email address hidden> Tue, 17 Jun 2008 13:13:34 -0500

You don't need to increase the dependencies. Just upgrade to the new
clamav and test with it.

Also there's no need for the ubuntu to ubuntu debdiffs.

Here is a new Debian->Ubuntu debdiff. It doesn't change the versions of the dependencies. I have tested it with the new clamav (0.93.1), and I was able to successfully scan for viruses.

clamtk (3.10-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #240735):
    - Change freshclam depends to clamav-freshclam|clamav-data so
      package works with clamav-data (LP: #200619)
    - Change maintainer to MOTU

 -- Nathan Handler <email address hidden> Tue, 17 Jun 2008 14:50:12 -0500

Looks good. I'll upload it in a bit. It's been pointed out to me that my
versioning for clamav-data is bogus (not your fault, you just copied mine).
I'll edit that out before I upload it.

Uploaded. Thank you for your contribution to Ubuntu.

This bug was fixed in the package clamtk - 3.10-1ubuntu1

---------------
clamtk (3.10-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #240735):
    - Change freshclam depends to clamav-freshclam|clamav-data so
      package works with clamav-data (LP: #200619)
    - Change maintainer to MOTU

clamtk (3.10-1) unstable; urgency=low

  * New upstream release
  * debian/patches/:
    - 01-fix_clamtk.desktop.patch updated to correctly apply to new
      sources
  * debian/control:
    - updated Standards-Version to 3.8.0 (no changes needed)

clamtk (3.09-1) unstable; urgency=low

  * New upstream release

 -- Nathan Handler <email address hidden> Tue, 17 Jun 2008 14:50:12 -0500