Viewing all changes in revision 85.
- Committer: Package Import Robot
- Date: 2014-06-20 17:42:08 UTC
- mfrom: (2.5.12 sid)
- Revision ID: package-import@ubuntu.com-20140620174208-3kdurxwjitvjrjph
* Merge with Debian unstable. Remaining changes:
- debian/control:
+ Set Ubuntu Developer as maintainer,
+ build-depend on dh-translation to handle Ubuntu translation,
+ demote pstoedit from Recommends to Suggests (because it's on universe),
- debian/patches/0006_add_unity_quicklist_support.patch: add.
- debian/patches/series: update.
- debian/rules:
+ add dh_translation to handle Ubuntu translation,
+ add python2 to dh addon.
- debian/control:
+ Set Ubuntu Developer as maintainer,
+ build-depend on dh-translation to handle Ubuntu translation,
+ demote pstoedit from Recommends to Suggests (because it's on universe),
- debian/patches/0006_add_unity_quicklist_support.patch: add.
- debian/patches/series: update.
- debian/rules:
+ add dh_translation to handle Ubuntu translation,
+ add python2 to dh addon.
- files added:
- .pc/0006-Fix_FTBFS_on_poppler-0.26.patch
- .pc/0006-Fix_FTBFS_on_poppler-0.26.patch/src
- .pc/0006-Fix_FTBFS_on_poppler-0.26.patch/src/extension
- .pc/0006-Fix_FTBFS_on_poppler-0.26.patch/src/extension/internal
- .pc/0006-Fix_FTBFS_on_poppler-0.26.patch/src/extension/internal/pdfinput
- files removed:
- .pc/0007-Poppler-0.26-compatibility.patch
- .pc/0007-Poppler-0.26-compatibility.patch/src
- .pc/0007-Poppler-0.26-compatibility.patch/src/extension
- .pc/0007-Poppler-0.26-compatibility.patch/src/extension/internal
- .pc/0007-Poppler-0.26-compatibility.patch/src/extension/internal/pdfinput
- files modified:
- .pc/applied-patches
expand all
collapse all
added
removed
