Please merge pcmanx-gtk2 0.3.9-2 (universe) from Debian testing (main)

Have the other debdiff if needed will upload.

Added LP bug number in changelog

Nice job: it's a complex merge, and it seems to be done very well.
I only have some comments on the debdiff:
- why do you delete part of the patch iceape-dev.dpatch ? You don't apply it after, so it could stay as-is
- instead of duplicating almost the full content of the patch iceape-dev.dpatch, I would have made a smaller patch on the top of this patch
- there are 2 translation files in your debdiff. They shouldn't be there

Otherwise, looks good.

Thanks to fix those small issues.

Fabrice

Fabrice,
  Thank you, after looking at what I have I'm not sure why iceape patch was still in there I had removed it. I must have changed the package after making the debdiff, probably because I looked at it and realised that was wrong. Sorry about that. Good idea about the smaller patch on top of the iceape patch I will do that.

As for the translations, I did not change those. They stumped me too, maybe a past undocumented Ubuntu change? I left them in because "that is how I found it" if you want me to replace the files with the debian versions I can do that, a couple other source files are also changed.

Ezra

Ok so here is the revised debdiff, let me know what you want done about the translations.

Hi,

The po files are generated in your setup, as they are not there before. They should then be dropped.
Also, I don't understand why we still have this huge iceape patch in your debdiff. Can you explain me that?

Sorry to bug you about: I'm just trying to keep it easier for the next merge :-)

Thanks,
Fabrice

  OK the iceape-dev patch that is in this debdiff is the one from a newer version of pcmanx-gtk2 in Debian instead of reproducing the majority of that patch I made a very small patch that reverses the changes that we don't want. I tried to make that more clear in the changelog as even I got confused when I went back to work on it again.

  As for the translations I double and triple checked, they were definitely there from a previous person. I will take them out though.

Ezra

- Replaced the ubuntu version of the po files with the debian versions.
- deleted gcc_4.4.dpatch as its not needed anymore.

pcmanx-gtk2 (0.3.9-2ubuntu1) lucid; urgency=low

  * Merge from debian testing (LP: #482944), remaining changes:
    - packages that Depend/Recommend/Suggest firefox
      (meta-package) must alternatively Depend/Recommend/Suggest abrowser
    - debian/mozilla-plugin-pcmanx.links: s/iceape/seamonkey/;
      s/iceweasel/firefox/.
    - debian/control: add "| seamonkey-browser" to mozilla-plugin-pcmanx
      Recommends field.
    - debian/rules: use "dh_makeshlibs -V -Xfirefox" instead of
      "dh_makeshlibs -V -Xiceweasel" in binary-arch target.
    - debian/mozilla-plugin-pcmanx.install: s/iceape/xulrunner/.
    - mozilla-plugin-pcmanx.{postinst,postrm}: s/iceape/seamonkey/;
      s/iceweasel/firefox/.

  * debian/mozilla-plugin-pcmanx.install
    - Changed usr/lib/xulrunner-devel-1.9/bin/plugins usr/lib/pcmanx-gtk2 to
      usr/lib/xulrunner-devel-1.9.1.5/bin/plugins /usr/lib/pcmanx-gtk2
      and usr/lib/xulrunner-devel-1.9/bin/components usr/lib/pcmanx-gtk2 to
      usr/lib/xulrunner-devel-1.9.1.5/bin/components
      /usr/lib/pcmanx-gtk2" to fix FTBFS
  * debian/patches
    - Added zap-iceape.dpatch to protect from iceape-dev.dpatch messing
      with firefox entries
  * debian/rules
    - Changed "rm $(CURDIR)/debian/tmp/usr/lib/xulrunner-devel-1.9/bin/components/pcmanx.png"
      to "rm (CURDIR)/debian/tmp/usr/lib/xulrunner-devel-1.9.1.5/bin/components/pcmanx.png"
  * debian/control
    - Replaced libxul-dev build-depend with xulrunner-dev closing (LP: #352968)

Uploaded. Thanks for your work :-)

This bug was fixed in the package pcmanx-gtk2 - 0.3.9-2ubuntu1

---------------
pcmanx-gtk2 (0.3.9-2ubuntu1) lucid; urgency=low

  * Merge from debian testing (LP: #482944), remaining changes:
    - packages that Depend/Recommend/Suggest firefox
      (meta-package) must alternatively Depend/Recommend/Suggest abrowser
    - debian/mozilla-plugin-pcmanx.links: s/iceape/seamonkey/;
      s/iceweasel/firefox/.
    - debian/control: add "| seamonkey-browser" to mozilla-plugin-pcmanx
      Recommends field.
    - debian/rules: use "dh_makeshlibs -V -Xfirefox" instead of
      "dh_makeshlibs -V -Xiceweasel" in binary-arch target.
    - debian/mozilla-plugin-pcmanx.install: s/iceape/xulrunner/.
    - mozilla-plugin-pcmanx.{postinst,postrm}: s/iceape/seamonkey/;
      s/iceweasel/firefox/.
  * debian/mozilla-plugin-pcmanx.install
    - Changed xulrunner-devel-1.9 to xulrunner-devel-1.9.1.5 to fix FTBFS
  * debian/patches
    - Added zap-iceape.dpatch to protect from iceape-dev.dpatch messing
      with firefox entries
  * debian/rules
    - Changed xulrunner-devel-1.9 to xulrunner-devel-1.9.1.5
  * debian/control
    - Replaced libxul-dev build-depend with xulrunner-dev closing (LP: #352968)
 -- Ezra Reeves <email address hidden> Tue, 24 Nov 2009 17:01:07 -0500