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

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1288105: package libfm-gtk-data 1.2.0-1ubuntu1 failed to install/upgrade: trying to overwrite '/usr/share/libfm/images/folder.png', which is also in package libfm-data 1.2.0-0ubuntu1	High	Fix Released
Bug #1363555: [FFe] Merge libfm 1.2.2.1-1 from debian	Undecided	Fix Released

Link a bug report

Related blueprints

22. By Jackson Doak on 2014-08-31

Add closes

21. By Jackson Doak on 2014-08-31

fix typo

20. By Jackson Doak on 2014-08-31

fix typo

19. By Jackson Doak on 2014-08-31

* Merge from Debian unstable, (LP:THINGY) Ubuntu remaining changes :
* debian/patches:
 - 02-disable-Werror.patch: Disable -Werror to fix FTBFS while autoreconfing.
* debian/rules:
 - Use dh-autoreconf for arm64 and ppc64el, resolving FTBFS.
 - Add lxshortcut-dbg package.
 - Revert "Use single docs directory for all packages."
 - Override builddeb to compress as much as possible.
* debian/control:
 - Add lxshortcut and lxshortcut-dbg binaries.
 - Remove conflicts/replaces between libfm-tools and lxshortcut.
 - Add build-depends on dh-autoreconf.
 - libfm-gtk-data breaks libfm-data, since images folder was misplaced in
   previous revision. (LP: #1288105).
* debian/libfm-tools.install & debian/lxshortcut.install
 - Move lxshortcut content to lxshortcut binary.
* Replacing direct Pre-Depends on multiarch-support (fix lintian warning).
* Adding dependency on libfm-modules from libfm-tools.
* Adding libglib2.0-dev and libgtk2.0-dev into Depends for -dev packages.
* Updating multiarch support, multiarch-aware packages should have
  Multi-Arch field.
* Adding libfm-extra.pc into libfm-dev package, it was missing.
* Merging upstream version 1.2.2.1.
* Removing obsolete target override_dh_builddeb from debian/rules file.
* Updating debian/copyright file.
* Remove duplicate "Section: libs" from binary packages.
* Fixing "capitalization-error-in-description" lintian message.
* Revert "Use single docs directory for all packages." (Closes: #744691)
* Merging upstream version 1.2.1.

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.