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

Branch merges

Propose for merging

No branches dependent on this one.

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

Julien Lavergne (community): Approve on 2014-12-27

Diff: 4275 lines (+3598/-401)

20 files modified

.pc/02-disable-Werror.patch/configure.ac (+0/-367)
.pc/90-fix-mime-null-crash.patch/src/base/fm-file-info.c (+1851/-0)
.pc/90-fix-mime-null-crash.patch/src/base/fm-mime-type.c (+484/-0)
.pc/90-fix-mime-null-crash.patch/src/base/fm-templates.c (+1108/-0)
.pc/applied-patches (+1/-1)
configure.ac (+1/-1)
debian/changelog (+23/-0)
debian/control (+19/-9)
debian/copyright (+29/-2)
debian/libfm-dev.install (+1/-0)
debian/libfm-extra4.lintian-overrides (+2/-0)
debian/libfm4.docs (+0/-1)
debian/patches/02-disable-Werror.patch (+0/-13)
debian/patches/90-fix-mime-null-crash.patch (+59/-0)
debian/patches/series (+1/-1)
debian/rules (+4/-4)
debian/source/lintian-overrides (+2/-0)
src/base/fm-file-info.c (+5/-0)
src/base/fm-mime-type.c (+2/-1)
src/base/fm-templates.c (+6/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

25. By Jackson Doak on 2014-12-13

Drop accidentally left in change

24. By Jackson Doak on 2014-12-13

Drop some unneeded changes

23. By Jackson Doak on 2014-11-24

* 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.

22. By Julien Lavergne on 2014-10-16

* New upstream release.
* debian/patches:
 - 02-disable-Werror.patch: Refreshed.

21. By Jackson Doak on 2014-09-19

* 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.

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.