lp:~noskcaj/ubuntu/utopic/libfm/merge2

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/utopic/libfm

Daniel Holbach (community): Approve on 2014-10-15

Diff: 70 lines (+32/-2)

4 files modified

debian/changelog (+27/-0)
debian/libfm-dev.install (+1/-1)
debian/local/source_libfm.py (+1/-1)
debian/rules (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

22. By Jackson Doak on 2014-09-18

fix typo

21. By Jackson Doak on 2014-09-18

* Merge with Debian; remaining changes:
  - Build using dh-autoreconf.
  - Library packages are M-A: same.
  - Build lxshortcut and lxshortcut-dbg packages.
  - libfm-tools: Install libfm-pref-apps desktop file.
  - Disable build using -Werror.
  - libfm-dev.postinst: Remove /usr/include/libfm, even if it is not empty.
* Fixing FTBFS on some architectures (i386, etc.).
* Revert "Fixing priorities on -dev and -doc packages: should be 'extra'."
* Fixing priorities on -dev and -doc packages: should be 'extra'.
* Adding lxpolkit to apport report (see bug 760397 in BTS).
* Fix handling of symlink in libfm-dev package (Closes: #753778).

20. By Matthias Klose on 2014-09-04

* Merge with Debian; remaining changes:
  - Build using dh-autoreconf.
  - Library packages are M-A: same.
  - Build lxshortcut and lxshortcut-dbg packages.
  - libfm-tools: Install libfm-pref-apps desktop file.
  - Disable build using -Werror.
* libfm-dev.postinst: Remove /usr/include/libfm, even if it is not empty.

19. By Julien Lavergne on 2014-08-31

* New upstream release.
* debian/patches:
 - 02-disable-Werror.patch: Refreshed.
* debian/libfm-dev.install:
 - Add libfm-extra.pc.

18. By Julien Lavergne on 2014-07-06

* New upstream release.
* debian/patches:
 - 02-disable-Werror.patch: Refreshed.
 - 90_hide_lxshortcut.patch: Remove, merged upstream.
* debian/rules:
 - Revert "Use single docs directory for all packages."

17. By Julien Lavergne on 2014-03-12

* debian/control:
 - libfm-gtk-data breaks libfm-data, since images folder was misplaced in
   previous revision. (LP: #1288105).

16. By Julien Lavergne on 2014-03-02

* Merge from Debian unstable, Ubuntu remaining changes :
* debian/patches:
 - 02-disable-Werror.patch: Disable -Werror to fix FTBFS while autoreconfing.
 - 90_hide_lxshortcut.patch: From upstream, hide lxshortcut from the menu
   (LP: #1282740)
* debian/rules:
 - Use dh-autoreconf for arm64 and ppc64el, resolving FTBFS.
 - Add lxshortcut-dbg package.
* debian/control:
 - Add lxshortcut and lxshortcut-dbg binaries.
 - Remove conflicts/replaces between libfm-tools and lxshortcut.
 - Add build-depends on dh-autoreconf.
 - Replace GTK by GTK+ in descriptions.
 - Remove useless section.
* debian/libfm-tools.install & debian/lxshortcut.install
 - Move lxshortcut content to lxshortcut binary.

15. By Julien Lavergne on 2014-02-19

* New upstream release.
* Bump soname to 4, and add the version in *.install files.
* debian/patches:
 - 02-disable-Werror.patch: Refreshed.
* debian/libfm-tools:
 - Update files.
* debian/libfm-modules.install & debian/control:
 - Add libfm-modules binary for modules of the library.
* debian/libfm-extra4.install & debian/control:
 - Add libfm-extra4 binary for extra library.
* debian/control:
 - Add libfm-modules to libfm recommends.
 - Add libfm-extra4 to libfm-dev depends.
 - Remove useless section.
* debian/rules:
 - Remove also .a and .la files in modules.
* debian/libfm-data.install:
 - Add images and terminals.list.
* debian/libfm-dev.install :
 - Add libfm-extra.so.
* debian/lxshortcut.install & debian/control:
 - Add lxshortcut binary since it's shipped with libfm now.
* debian/lxshortcut.manpages:
 - Add manpage for lxshortcut.
* debian/*.symbols:
 - Update with new symbols.

14. By Logan Rosen on 2014-01-11

* Fix syntax in debian/rules so that dh-autoreconf actually runs.
* Disable -Werror to fix FTBFS while autoreconfing.

13. By Daniel T Chen on 2014-01-11

Use dh-autoreconf for arm64 and ppc64el, resolving FTBFS.