diff -Nru libfm-1.2.3/debian/changelog libfm-1.2.3/debian/changelog
--- libfm-1.2.3/debian/changelog	2014-10-23 20:23:47.000000000 +0200
+++ libfm-1.2.3/debian/changelog	2015-08-16 00:02:17.000000000 +0200
@@ -1,3 +1,22 @@
+libfm (1.2.3-1ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control, debian/rules:
+      + Build using dh-autoreconf.
+    - debian/control:
+      + Library packages are M-A: same.
+    - debian/control, debian/rules, debian/lxshortcut*:
+      + Build lxshortcut and lxshortcut-dbg packages.
+    - debian/libfm-tools.install:
+      + Install libfm-pref-apps desktop file.
+    - debian/patches/02-disable-Werror.patch:
+      + Disable build using -Werror.
+  * Drop following change, fixed in Debian:
+   - debian/libfm-dev.postinst:
+     + Remove /usr/include/libfm, even if it is not empty.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Sat, 15 Aug 2015 23:52:52 +0200
+
 libfm (1.2.3-1) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.6.
@@ -11,6 +30,26 @@
 
  -- Andriy Grytsenko <andrej@rep.kiev.ua>  Tue, 14 Oct 2014 21:39:45 +0300
 
+libfm (1.2.3-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+   - 02-disable-Werror.patch: Refreshed.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Thu, 16 Oct 2014 07:27:48 +0200
+
+libfm (1.2.2.1-3ubuntu1) utopic; urgency=medium
+
+  * 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.
+
+ -- Jackson Doak <noskcaj@ubuntu.com>  Fri, 19 Sep 2014 07:49:23 +1000
+
 libfm (1.2.2.1-3) unstable; urgency=low
 
   * Fixing FTBFS on some architectures (i386, etc.).
@@ -26,6 +65,18 @@
 
  -- Andriy Grytsenko <andrej@rep.kiev.ua>  Wed, 10 Sep 2014 15:24:55 +0300
 
+libfm (1.2.2.1-1ubuntu1) utopic; urgency=medium
+
+  * 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.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 04 Sep 2014 17:40:47 +0200
+
 libfm (1.2.2.1-1) unstable; urgency=low
 
   * Replacing direct Pre-Depends on multiarch-support (fix lintian warning).
@@ -40,6 +91,16 @@
 
  -- Andriy Grytsenko <andrej@rep.kiev.ua>  Wed, 27 Aug 2014 15:10:23 +0300
 
+libfm (1.2.2.1-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+   - 02-disable-Werror.patch: Refreshed.
+  * debian/libfm-dev.install:
+   - Add libfm-extra.pc.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 31 Aug 2014 15:37:58 +0200
+
 libfm (1.2.1-1) unstable; urgency=low
 
   * Remove duplicate "Section: libs" from binary packages.
@@ -49,6 +110,46 @@
 
  -- Andriy Grytsenko <andrej@rep.kiev.ua>  Thu, 03 Jul 2014 17:18:21 +0300
 
+libfm (1.2.1-0ubuntu1) utopic; urgency=medium
+
+  * 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."
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 06 Jul 2014 13:43:10 +0200
+
+libfm (1.2.0-1ubuntu2) trusty; urgency=medium
+
+  * debian/control:
+   - libfm-gtk-data breaks libfm-data, since images folder was misplaced in
+     previous revision. (LP: #1288105).
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Wed, 12 Mar 2014 23:00:57 +0100
+
+libfm (1.2.0-1ubuntu1) trusty; urgency=low
+
+  * 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.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 02 Mar 2014 12:25:13 +0100
+
 libfm (1.2.0-1) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.5.
@@ -75,6 +176,50 @@
 
  -- Andriy Grytsenko <andrej@rep.kiev.ua>  Thu, 20 Feb 2014 03:40:04 +0200
 
+libfm (1.2.0-0ubuntu1) trusty; urgency=low
+
+  * 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.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Wed, 19 Feb 2014 22:14:42 +0100
+
+libfm (1.1.2.2-1ubuntu2) trusty; urgency=medium
+
+  * Fix syntax in debian/rules so that dh-autoreconf actually runs.
+  * Disable -Werror to fix FTBFS while autoreconfing.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 11 Jan 2014 19:38:49 -0500
+
+libfm (1.1.2.2-1ubuntu1) trusty; urgency=low
+
+  * Use dh-autoreconf for arm64 and ppc64el, resolving FTBFS.
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Sat, 11 Jan 2014 15:11:11 -0500
+
 libfm (1.1.2.2-1) unstable; urgency=low
 
   [ Andriy Grytsenko ]
diff -Nru libfm-1.2.3/debian/control libfm-1.2.3/debian/control
--- libfm-1.2.3/debian/control	2014-10-18 03:47:40.000000000 +0200
+++ libfm-1.2.3/debian/control	2015-05-09 12:06:20.000000000 +0200
@@ -1,7 +1,8 @@
 Source: libfm
 Section: libs
 Priority: optional
-Maintainer: Debian LXDE Maintainers <lxde-debian@lists.lxde.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian LXDE Maintainers <lxde-debian@lists.lxde.org>
 Uploaders:
  Andrew Lee (李健秋) <ajqlee@debian.org>,
  Martin Bagge <brother@bsnet.se>,
@@ -10,7 +11,7 @@
  debhelper (>= 9), autotools-dev, gtk-doc-tools, intltool,
  libdbus-glib-1-dev, libglib2.0-dev, libgtk2.0-dev, libexif-dev,
  libmenu-cache-dev (>=0.5.0), libtool, pkg-config, valac,
- libglib2.0-doc, libgtk-3-doc
+ libglib2.0-doc, libgtk-3-doc, dh-autoreconf
 Standards-Version: 3.9.6
 Homepage: http://pcmanfm.sourceforge.net/
 Vcs-Browser: http://git.lxde.org/gitweb/?p=debian/libfm.git
@@ -18,8 +19,7 @@
 
 Package: libfm4
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}, libfm-data (>= 1.2.0~), lxmenu-data
 Recommends: libfm-modules
 Description: file management support (core library)
@@ -41,8 +41,7 @@
 
 Package: libfm-extra4
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: file management support (extra library)
  LibFM provides file management functions built on top of Glib/GIO
@@ -53,9 +52,8 @@
 Package: libfm-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, libfm4 (= ${binary:Version}),
- libfm-extra4 (= ${binary:Version}), libglib2.0-dev
+ libfm-extra4 (= ${binary:Version})
 Suggests: libfm-doc
 Description: file management support (core development files)
  LibFM provides file management functions built on top of Glib/GIO,
@@ -66,9 +64,8 @@
 Package: libfm-gtk-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, libfm-dev (= ${binary:Version}),
- libfm-gtk4 (= ${binary:Version}), libgtk2.0-dev
+ libfm-gtk4 (= ${binary:Version})
 Breaks: libfm-dev (<< 1.0.2)
 Description: file management support (GTK+ GUI development files)
  LibFM provides file management functions built on top of Glib/GIO,
@@ -93,7 +90,6 @@
 Section: debug
 Priority: extra
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, libfm4 (= ${binary:Version}),
  libfm-extra4 (= ${binary:Version})
 Breaks: libfm1-dbg
@@ -108,7 +104,6 @@
 Section: debug
 Priority: extra
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, libfm-gtk4 (= ${binary:Version})
 Breaks: libfm-dbg (<< 1.0.2)
 Description: file management support (libfm-gtk debug)
@@ -121,7 +116,6 @@
 Section: debug
 Priority: extra
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, libfm-modules (= ${binary:Version})
 Description: file management support (libfm-modules debug)
  LibFM provides file management functions built on top of Glib/GIO,
@@ -132,7 +126,6 @@
 Package: libfm-data
 Section: misc
 Architecture: all
-Multi-Arch: foreign
 Depends: ${misc:Depends}
 Breaks: libfm0, libfm1
 Replaces: libfm0, libfm1
@@ -145,9 +138,8 @@
 Package: libfm-gtk-data
 Section: misc
 Architecture: all
-Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: libfm-gtk0, libfm-gtk-bin (<< 1.0)
+Breaks: libfm-gtk0, libfm-gtk-bin (<< 1.0), libfm-data (<< 1.2.0-1ubuntu1)
 Replaces: libfm-gtk0
 Description: file management support (GTK+ library common data)
  LibFM provides file management functions built on top of Glib/GIO,
@@ -157,8 +149,7 @@
 
 Package: libfm-gtk4
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}, libfm4 (= ${binary:Version}),
          libfm-gtk-data (>= 1.2.0~)
 Suggests: libfm-tools, nautilus-actions
@@ -171,10 +162,10 @@
 Package: libfm-tools
 Section: misc
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libfm-modules
-Conflicts: libfm-gtk-bin, lxshortcut
-Replaces: libfm-gtk-bin, lxshortcut
-Provides: libfm-gtk-bin, lxshortcut
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libfm-gtk-bin
+Replaces: libfm-gtk-bin
+Provides: libfm-gtk-bin
 Description: file management support (utilities)
  LibFM provides file management functions built on top of Glib/GIO
  giving a convenient higher-level API.
@@ -183,10 +174,34 @@
 
 Package: libfm-modules
 Architecture: any
-Multi-Arch: same
+Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: file management support (loadable modules for library)
  LibFM provides file management functions built on top of Glib/GIO
  giving a convenient higher-level API.
  .
  This package contains loadable modules used by libfm* libraries.
+
+Package: lxshortcut
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: LXDE application shortcut editor
+ LXShortcut is a GUI application for the Lightweight X11 Desktop Environment
+ (LXDE).
+ .
+ It allows creating and editing application shortcuts compatible with the
+ freedesktop.org Desktop Entry specification.
+
+Package: lxshortcut-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: lxshortcut (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: LXDE application shortcut editor - debug
+ LXShortcut is a GUI application for the Lightweight X11 Desktop Environment
+ (LXDE).
+ .
+ It allows creating and editing application shortcuts compatible with the
+ freedesktop.org Desktop Entry specification.
+ .
+ This package contains the debugging symbols for lxshortcut.
diff -Nru libfm-1.2.3/debian/libfm-tools.install libfm-1.2.3/debian/libfm-tools.install
--- libfm-1.2.3/debian/libfm-tools.install	2014-10-14 18:48:58.000000000 +0200
+++ libfm-1.2.3/debian/libfm-tools.install	2015-05-09 12:06:20.000000000 +0200
@@ -1,5 +1,3 @@
 usr/bin/libfm-pref-apps
-usr/bin/lxshortcut
-usr/share/applications
+usr/share/applications/libfm-pref-apps.desktop
 usr/share/man/man1/libfm-pref-apps.1
-usr/share/man/man1/lxshortcut.1
diff -Nru libfm-1.2.3/debian/lxshortcut.install libfm-1.2.3/debian/lxshortcut.install
--- libfm-1.2.3/debian/lxshortcut.install	1970-01-01 01:00:00.000000000 +0100
+++ libfm-1.2.3/debian/lxshortcut.install	2015-05-09 12:06:20.000000000 +0200
@@ -0,0 +1,3 @@
+usr/bin/lxshortcut
+usr/share/applications/lxshortcut.desktop
+usr/share/man/man1/lxshortcut.1
diff -Nru libfm-1.2.3/debian/lxshortcut.manpages libfm-1.2.3/debian/lxshortcut.manpages
--- libfm-1.2.3/debian/lxshortcut.manpages	1970-01-01 01:00:00.000000000 +0100
+++ libfm-1.2.3/debian/lxshortcut.manpages	2015-05-09 12:06:20.000000000 +0200
@@ -0,0 +1 @@
+data/lxshortcut.1
diff -Nru libfm-1.2.3/debian/patches/02-disable-Werror.patch libfm-1.2.3/debian/patches/02-disable-Werror.patch
--- libfm-1.2.3/debian/patches/02-disable-Werror.patch	1970-01-01 01:00:00.000000000 +0100
+++ libfm-1.2.3/debian/patches/02-disable-Werror.patch	2015-05-09 12:06:20.000000000 +0200
@@ -0,0 +1,13 @@
+Index: libfm-1.2.3/configure.ac
+===================================================================
+--- libfm-1.2.3.orig/configure.ac	2014-10-16 07:28:24.462235941 +0200
++++ libfm-1.2.3/configure.ac	2014-10-16 07:28:46.130841380 +0200
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.2.3], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
+ 
diff -Nru libfm-1.2.3/debian/patches/series libfm-1.2.3/debian/patches/series
--- libfm-1.2.3/debian/patches/series	2014-10-23 20:09:19.000000000 +0200
+++ libfm-1.2.3/debian/patches/series	2015-05-09 12:06:20.000000000 +0200
@@ -1,2 +1,3 @@
 01-lxde-conf.patch
 90-fix-mime-null-crash.patch
+02-disable-Werror.patch
diff -Nru libfm-1.2.3/debian/rules libfm-1.2.3/debian/rules
--- libfm-1.2.3/debian/rules	2014-10-18 03:47:40.000000000 +0200
+++ libfm-1.2.3/debian/rules	2015-05-09 12:06:20.000000000 +0200
@@ -5,7 +5,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh ${@} --parallel
+	dh ${@} --parallel --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-debug --enable-gtk-doc --enable-udisks --disable-silent-rules
@@ -31,4 +31,5 @@
 	dh_strip -plibfm4 -plibfm-extra4 --dbg-package=libfm-dbg
 	dh_strip -plibfm-gtk4 --dbg-package=libfm-gtk-dbg
 	dh_strip -plibfm-modules --dbg-package=libfm-modules-dbg
-	dh_strip -Nlibfm4 -Nlibfm-extra4 -Nlibfm-gtk4 -Nlibfm-modules
+	dh_strip -plxshortcut --dbg-package=lxshortcut-dbg
+	dh_strip -Nlibfm4 -Nlibfm-extra4 -Nlibfm-gtk4 -Nlibfm-modules -Nlxshortcut