Merge 0.4.0-2 from debian

[Jackson Doak]

Please merge mousepad 0.4.0-2 from debian, debdiff attached

[Artur Rona (ari-tczew)]

+mousepad (0.4.0-2ubuntu1) wily; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Switch to gtk3
+
+ -- Ubuntu Merge-o-Matic <email address hidden> Thu, 07 May 2015 05:32:01 +0000

Please at least run 'dch -r' ... I think you're not Ubuntu Merge-o-Matic.
Would be nice to be more verbose and describe in d/changelog, of which file are changes related to.

It won't be sponsored for now, setting as incomplete.

[Artur Rona (ari-tczew)]

$ patch -p1 < ../deb.diff
patching file debian/changelog
patching file debian/control
patching file debian/mousepad.1
patching file debian/rules
patch unexpectedly ends in middle of line
patch: **** malformed patch at line 154:

Cause your debdiff is malformed, it's not possible to diff changes onto file debian/rules.
Please update carefully debian/changelog with command 'dch -r'.
Could you describe please files in debian/changelog, as well? Something like:
- debian/control, debian/rules:
   + Switch to gtk3...

I'm happy to sponsor fixed debdiff.

Thanks!

[Artur Rona (ari-tczew)]

I think you've mismatched attached file. Please re-upload correct one.

[Jackson Doak (noskcaj)]

Hopefully this one is the right one

[Artur Rona (ari-tczew)]

I've tweaked a bit debian/changelog. Thank you for your efforts!

[Launchpad Janitor (janitor)]

This bug was fixed in the package mousepad - 0.4.0-2ubuntu1

---------------
mousepad (0.4.0-2ubuntu1) wily; urgency=low

  * Merge from Debian unstable. (LP: #1458240) Remaining changes:
    - debian/control, debian/rules:
      + Switch to gtk3.

 -- Jackson Doak <email address hidden> Wed, 27 May 2015 06:32:01 +1000