[wishlist]Please merge blam 1.8.5-1 from Debian unstable (main)

I think i've merged it (Would be my first merge), i hope the debdiff is good.

Please remove all "only in patch2: unchanged:" from the end of the debdiff, i think you have filter some po files and that's why they are in there.
Also you need to suscribe the universe sponsors for sponsorship and mark the bug as confirmed, as it's explained on the wiki[1]

1. https://wiki.ubuntu.com/MOTU/Sponsorship/SponsorsQueue

ok new debdiff after removing: "only in patch2: unchanged:"

It is free to be merged for any other person...

fails to build:
make[1]: Entering directory `/tmp/buildd/blam-1.8.5'
for i in ./config.guess ./config.sub ; do \
                if test -e $i.cdbs-orig ; then \
                        mv $i.cdbs-orig $i ; \
                fi ; \
        done
make[1]: Leaving directory `/tmp/buildd/blam-1.8.5'
if [ "debian/stamp-patched" = "reverse-patches" ]; then rm -f debian/stamp-patched; fi
patches: debian/patches/01_no_imendio_news.patch debian/patches/10_xul1.9.patch debian/patches/99_autotools_rerun.patch debian/patches/PlanetDebian.patch debian/patches/PlanetUbuntu.patch
Trying patch debian/patches/01_no_imendio_news.patch at level 1 ... success.
Trying patch debian/patches/10_xul1.9.patch at level 1 ... success.
Trying patch debian/patches/99_autotools_rerun.patch at level 1 ... 0 ... 2 ... failure.
make: *** [debian/stamp-patched] Error 1
dpkg-buildpackage: failure: debian/rules build gave error exit status 2
pbuilder: Failed autobuilding of package

looks, like you'll need to rerun autotools in 99_autotools_rerun.patch.

unsubscribing ubuntu-universe-sponsors, please resubscribe once you've a new debdiff to look at, thanks.

I left this merge because someone told me that was going to be hard for a beginner (me) to do the patch, so it wasn't suscribed to u-u-s. But i just noticed that someone suscribed it to u-u-s, and it wasn't me :). So if you could help me in creating the new patch i will more than glad to finish it :).

Ok, fixed autotools_rerun.patch and this should be final debdiff, hope it is good.

you fixed some stuff and they are not reflected on the changelog, please add you changes to the changelog.

fixed changelog.

This bug was fixed in the package blam - 1.8.5-1ubuntu1

---------------
blam (1.8.5-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable (LP: #226670), remaining changes:
    - xulrunner 1.9 + dependent sharp
      + debian/control: raise build-depends bar to libgecko2.0-cil (>= 0.11)
      + make use of standalone glue for C++ code and dependent gecko sharp
        module for C# parts; fixup configure.in accordingly
        - add debian/patches/10_xul1.9.patch
    - Added debian/patches/PlanetUbuntu.patch
  * Updated rerun autools patch:
    - debian/patches/99_autotools_rerun.patch
  * debian/rules: Added configure flag to pass libxul-embedding-unstable
    as default, Fixes build-bustage.

 -- Andres Rodriguez <email address hidden> Sun, 17 Aug 2008 23:16:06 -0500