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

[Jackson Doak]

new debian bugfix release

[Daniel Holbach (dholbach)]

Thanks. Uploaded. Sitting in the queue right now.

review: Approve

Unmerged revisions

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

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-04 17:40:47 +0000
+++ debian/changelog	2014-09-18 22:06:48 +0000
@@ -1,3 +1,30 @@
+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 <[e-mail]>  Fri, 19 Sep 2014 07:49:23 +1000
+
+libfm (1.2.2.1-3) unstable; urgency=low
+
+  * Fixing FTBFS on some architectures (i386, etc.).
+  * Revert "Fixing priorities on -dev and -doc packages: should be 'extra'."
+
+ -- Andriy Grytsenko <[e-mail]>  Fri, 12 Sep 2014 00:18:26 +0300
+
+libfm (1.2.2.1-2) unstable; urgency=low
+
+  * 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).
+
+ -- Andriy Grytsenko <[e-mail]>  Wed, 10 Sep 2014 15:24:55 +0300
+
 libfm (1.2.2.1-1ubuntu1) utopic; urgency=medium
 
   * Merge with Debian; remaining changes:
 
=== modified file 'debian/libfm-dev.install'
--- debian/libfm-dev.install	2014-09-04 17:40:47 +0000
+++ debian/libfm-dev.install	2014-09-18 22:06:48 +0000
@@ -1,4 +1,4 @@
-usr/include
+usr/include/libfm-1.0
 usr/lib/*/libfm.so
 usr/lib/*/libfm-extra.so
 usr/lib/*/pkgconfig/libfm.pc
 
=== modified file 'debian/local/source_libfm.py'
--- debian/local/source_libfm.py	2014-02-20 03:40:04 +0000
+++ debian/local/source_libfm.py	2014-09-18 22:06:48 +0000
@@ -44,7 +44,7 @@
 report_pcmanfm_home = "Config_pcmanfm_Home_" + session
 
 #List of packages which could be involved with pcmanfm
-RELATED_PACKAGES = ["libmenu-cache1","libmenu-cache3","libfm4","libfm-modules","udisks","gvfs","gvfs-backend","lxde-icon-theme","gnome-icon-theme"]
+RELATED_PACKAGES = ["libmenu-cache1","libmenu-cache3","libfm4","libfm-modules","udisks","gvfs","gvfs-backend","lxde-icon-theme","gnome-icon-theme","lxpolkit"]
 
 def add_info(report):
     # If a config file exist in HOME, report it instead of the system one.
 
=== modified file 'debian/rules'
--- debian/rules	2014-09-04 17:40:47 +0000
+++ debian/rules	2014-09-18 22:06:48 +0000
@@ -17,6 +17,9 @@
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+	# removing symlink, it will be created in postinst instead
+	rm -rf debian/tmp/usr/include/libfm
+
 override_dh_install:
 	dh_install --fail-missing