Please merge beagle 0.3.8-1 (universe) from Debian unstable (main).

Changelog since current intrepid version 0.3.7-2ubuntu1:

beagle (0.3.8-1) unstable; urgency=low

  * Remove dependencies on libgnome2.0-dev and libgnomevfs-dev
  * Bump libgtk-dev dependency to 2.10
  * Bump Standards-Version to 3.8.0
  * debian/patches:
    + fix_evolution_namespace: dropped, applied upstream.

 -- Jose Carlos Garcia Sogo <email address hidden> Sun, 20 Jul 2008 13:54:48 +0200

What about these changes?
    - debian/control:
      + Rename ice{weasel,dove}-beagle to {mozilla,thunderbird}-beagle and
        and update the dependencies accordingly.
    - debian/rules:
      + Install the mozilla-beagle and thunderbird-beagle extensions.
    - ice{dove,weasel}.dirs:
      + Renamed to {mozilla,thunderbird}-beagle.dirs.
      + Fixed paths to point to usr/lib/{firefox,thunderbird}

Yup OK...I ll do it...

Converting to a merge..

beagle (0.3.8-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #255232)
  * Remove dependencies on libgnome2.0-dev and libgnomevfs-dev
  * Bump libgtk-dev dependency to 2.10
  * Bump Standards-Version to 3.8.0
  * debian/patches:
    + fix_evolution_namespace: dropped, applied upstream.
    - debian/control:
      + Rename ice{weasel,dove}-beagle to {mozilla,thunderbird}-beagle
      and update the dependencies accordingly.
    - debian/rules:
      + Install the mozilla-beagle and thunderbird-beagle extensions.
    - ice{dove,weasel}.dirs:
      + Renamed to {mozilla,thunderbird}-beagle.dirs.
      + Fixed paths to point to usr/lib/{firefox,thunderbird}

 -- Bhavani Shankar <email address hidden> Sat, 09 Aug 2008 17:16:34 +0530

Looks good generally, can you please remove these entries from the changelog:

  * Remove dependencies on libgnome2.0-dev and libgnomevfs-dev
  * Bump libgtk-dev dependency to 2.10
  * Bump Standards-Version to 3.8.0
  * debian/patches:
    + fix_evolution_namespace: dropped, applied upstream.
    - debian/control:

Since we inherit the changes from Debian, they're not introduced by your version.

http://launchpadlibrarian.net/16741588/new%20file%206 does not apply to the 0.3.8-1 package in Debian.

daniel@devel:~/beagle-0.3.8$ patch -p1 < ../debian.debdiff
patching file debian/iceweasel-beagle.dirs
patching file debian/changelog
patch: **** malformed patch at line 28: * Remove dependencies on libgnome2.0-dev and libgnomevfs-dev

daniel@devel:~/beagle-0.3.8$

Daniel,

Explanation of why bkank spaces are there in the debdiff

GPG Could not verify the signature made.

Regards

Ok here is the newly generated diff:

and I tested it out on my system..

bhavani@intrepid:~/beagle-0.3.8$ patch -p1 < ../debian.debdiff
patching file debian/iceweasel-beagle.dirs
patching file debian/changelog
patching file debian/icedove-beagle.dirs
patching file debian/control
patching file debian/rules
patching file po/pt_BR.po
patching file po/nb.po
patching file po/cs.po
patching file po/oc.po
patching file po/hu.po
patching file po/it.po
patching file po/es.po
patching file po/fr.po
patching file po/sv.po
patching file debian/mozilla-beagle.dirs
patching file debian/thunderbird-beagle.dirs
bhavani@intrepid:~/beagle-0.3.8$

Why do we do translation changes?

patching file po/pt_BR.po
patching file po/nb.po
patching file po/cs.po
patching file po/oc.po
patching file po/hu.po
patching file po/it.po
patching file po/es.po
patching file po/fr.po
patching file po/sv.po

Okay sir I ll rectify them in couple of days.

Okay daniel, here is the modified debdiff

Is this updated beagle going to make it into Intrepid?

yes jason

This bug was fixed in the package beagle - 0.3.8-1ubuntu1

---------------
beagle (0.3.8-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #255232)
    - debian/control:
      + Rename ice{weasel,dove}-beagle to {mozilla,thunderbird}-beagle
      and update the dependencies accordingly.
    - debian/rules:
      + Install the mozilla-beagle and thunderbird-beagle extensions.
    - ice{dove,weasel}.dirs:
      + Renamed to {mozilla,thunderbird}-beagle.dirs.
      + Fixed paths to point to usr/lib/{firefox,thunderbird}

beagle (0.3.8-1) unstable; urgency=low

  * Remove dependencies on libgnome2.0-dev and libgnomevfs-dev
  * Bump libgtk-dev dependency to 2.10
  * Bump Standards-Version to 3.8.0
  * debian/patches:
    + fix_evolution_namespace: dropped, applied upstream.

 -- Bhavani Shankar <email address hidden> Tue, 19 Aug 2008 19:17:47 +0530