Merge gnome-photo-printer 0.7.0-1.1ubuntu1 (universe) from Debian unstable

Here is the debdiff between 0.7.0-1.2 (Debian) and 0.7.0-1.2ubuntu1 (Ubuntu)

Here is the debdiff between the old Ubuntu ( 0.7.0-1.1ubuntu1 ) and the new one ( 0.7.0-1.2ubuntu1 )

Hi Alessandro, this patch, doesnt apply clean to debian package, also you have changes in .po files. Please review the diff. Unsubscribing sponsors, please re-susbcribe it with these issues fixed.

Cheers,

patch -p1 --dry-run < ../debian-ubuntu.debdiff
patching file config.guess
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 18.
Hunk #3 FAILED at 56.
Hunk #4 succeeded at 68 (offset -1 lines).
Hunk #5 succeeded at 90 (offset -1 lines).
Hunk #6 FAILED at 131.
Hunk #7 FAILED at 172.
Hunk #8 FAILED at 301.
Hunk #9 succeeded at 356 (offset 5 lines).
Hunk #10 succeeded at 371 (offset 5 lines).
Hunk #11 FAILED at 386.
Hunk #12 succeeded at 448 with fuzz 2 (offset 5 lines).
Hunk #13 FAILED at 479.
Hunk #14 succeeded at 514 (offset 5 lines).
Hunk #15 FAILED at 524.
Hunk #16 FAILED at 549.
Hunk #17 FAILED at 587.
Hunk #18 succeeded at 631 with fuzz 2 (offset 5 lines).
Hunk #19 FAILED at 664.
Hunk #20 FAILED at 895.
Hunk #21 FAILED at 909.
Hunk #22 FAILED at 949.
Hunk #23 succeeded at 980 with fuzz 2 (offset -19 lines).
Hunk #24 FAILED at 1007.
Hunk #25 FAILED at 1121.
Hunk #26 FAILED at 1235.
Hunk #27 succeeded at 1307 (offset -3 lines).
Hunk #28 succeeded at 1396 (offset -3 lines).
Hunk #29 succeeded at 1410 (offset -3 lines).
Hunk #30 succeeded at 1436 (offset -3 lines).
18 out of 30 hunks FAILED -- saving rejects to file config.guess.rej
patching file config.guess
Reversed (or previously applied) patch detected! Assume -R? [n]

Here is the new debdiff between Debian and Ubuntu. I tested it, and all works fine. I hope it's good.

Good work. I just took the liberty to wrap the changelog entry at 80 chars.

This bug was fixed in the package gnome-photo-printer - 0.7.0-1.2ubuntu1

---------------
gnome-photo-printer (0.7.0-1.2ubuntu1) raring; urgency=low

  * Merge from Debian unstable. (LP: #1090456) Remaining changes:
    - src/Makefile.am: Fix placement of libs so that the binary links
      correctly. Fixes FTBFS. (LP: #770999)
  * Delete .png extension in .desktop file (Closes: #662978)

gnome-photo-printer (0.7.0-1.2) unstable; urgency=low

  * Non maintainer upload.
  * Update de.po. Closes: 631317.
  * Apply some fixes to the desktop file, adresses: 662978.
 -- Alessandro Losavio <email address hidden> Wed, 19 Dec 2012 15:28:51 +0000