Please merge diggler 0.9-16 (universe) from Debian unstable (main).

Changelog since current intrepid version 0.9-14ubuntu3:

diggler (0.9-16) unstable; urgency=low

  * install.rdf: Allow to use with any Iceweasel 3.0.x.

 -- Mike Hommey <email address hidden> Sun, 03 Aug 2008 09:46:30 +0200

diggler (0.9-15) unstable; urgency=low

  * install.rdf: Allow to use with Iceweasel 3.0.

 -- Mike Hommey <email address hidden> Mon, 16 Jun 2008 00:55:00 +0200

No, we can't sync it. Please take a look at this portion of the debdiff:

-Depends: firefox-2 | seamonkey-browser
-Description: A set of URL manipulation utilities for Seamonkey and Firefox's location bar
+Depends: iceweasel | iceape-browser
+Description: A set of URL manipulation utilities for Iceape and Iceweasel's location bar

OK! converting to a merge...

diggler (0.9-15ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #254614)
  * properly install extension in firefox/extensions directory and
    switch
    depends to firefox 2 as we are not yet compatible (LP: #217993) with
    ffox 3
    - update debian/control
    - update debian/links
 * install.rdf: Allow to use with any Iceweasel 3.0.x.

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

Can you update the merge to -16?

diggler (0.9-16ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #254614)
  * properly install extension in firefox/extensions directory and
    switch
    depends to firefox 2 as we are not yet compatible (LP: #217993) with
    ffox 3
    - update debian/control
    - update debian/links
 * install.rdf: Allow to use with any Iceweasel 3.0.x.

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

Can you please update debian/changelog to not include the changes that were done in the debian revisions, but just the changes that your revision makes?

daniel@devel:~/diggler-0.9$ patch -p1 < ../new%20file%2011
patching file debian/control
patching file debian/links
patching file debian/changelog
patch: **** malformed patch at line 80:

daniel@devel:~/diggler-0.9$

Do you edit the patch file manually? Can you just run
  debdiff diggler_0.9-16.dsc diggler_0.9-16ubuntu1.dsc > dedian.debdiff
and attach the file here?

oops.. Sorry I dint know that patch would not work in case of manual editing..

Here is the regenerated debdiff

The good news is, your patch can be successfully applied to diggler version 0.9-16 from Debian. However, your debian/changelog entry still has a small error in it. The line that says "depends to firefox 2 as we are not yet compatible (LP: #217993) with" should be moved up so that it is on the same line as "switch". You can then wrap the line as needed to keep it under the 80 character limit. Also, the "properly install extension in firefox/extensions directory and" line is a retained Ubuntu change. It should be indented, and it should be have a '-' in front of it instead of a '*'. This also means that the two update lines will have to be indented more. They should have a '+' in front of them instead of a '-'. Since bumping the Standards-Version was a new change that you introduced, it should be listed at the bottom (below the retained Ubuntu changes). From looking at your patch, it appears you also added a Homepage field in debian/control. You should mention this in your changelog entry. This is a new change, just like bumping the standards-version, so it should be listed at the bottom.

Okay nathan..:)

okay nathan done.

Your debian/changelog entry is still not perfect. Maybe I am not being clear in what I am saying. Here is how the entry should look:

diggler (0.9-16ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #254614)
    - properly install extension in firefox/extensions directory and switch
      depends to firefox 2 as we are not yet compatible with ffox 3
      + update debian/control
      + update debian/links
  * Bump standards version to 3.8.0.
  * Add a homepage field.

 -- Bhavani Shankar <email address hidden> Sat, 16 Aug 2008 20:02:53 +0530

You should have each change on its own line, not combined on one line. Also, you don't need to specify the bug numbers for retained Ubuntu changes in a merge. You should also take note at how I have the lines indented.

OKay! I m learning day by day :)

intrepid wont have any firefox-2 when we release, so this merge is not really required.

Can you please check with us and the mozilla-extensions team in #ubuntu-mozillateam to talk about the options?

OK alexander if yes i ll request a sync.

No. A sync would get us back to

Depends: iceweasel | iceape-browser
Description: A set of URL manipulation utilities for Iceape and Iceweasel's location bar

OK daniel shall I remove firefox 2 dependency?

As far as I understand Alexander, we need to replace iceweasel with firefox-3.

Ok sir I have made the necessary changes.

Good work. I just changed "3.8.0." to "3.8.0" in debian/control

This bug was fixed in the package diggler - 0.9-16ubuntu1

---------------
diggler (0.9-16ubuntu1) intrepid; urgency=low

   * Merge from debian unstable, remaining changes: (LP: #254614)
    - properly install extension in firefox/extensions directory and switch
      + update debian/control
      + update debian/links
  * Bump standards version to 3.8.0.
  * Add a homepage field.

diggler (0.9-16) unstable; urgency=low

  * install.rdf: Allow to use with any Iceweasel 3.0.x.

diggler (0.9-15) unstable; urgency=low

  * install.rdf: Allow to use with Iceweasel 3.0.

 -- Bhavani Shankar <email address hidden> Mon, 18 Aug 2008 19:22:00 +0530