diff -Nru spacefm-0.9.0/debian/changelog spacefm-0.9.0/debian/changelog --- spacefm-0.9.0/debian/changelog 2013-10-25 09:42:44.000000000 +0200 +++ spacefm-0.9.0/debian/changelog 2013-11-04 19:05:38.000000000 +0100 @@ -1,3 +1,28 @@ +spacefm (0.9.0-3ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. (LP: #1247918) Remaining changes: + - debian/patches/fix-unity-menu.patch: + + Fix issue with Unity global menu. + + -- Artur Rona Mon, 04 Nov 2013 18:49:42 +0100 + +spacefm (0.9.0-3) unstable; urgency=low + + * debian/control: + + bump version in Breaks and Replaces to really fix upgrade issue. + (Closes: #728158) + + -- Mateusz Łukasik Thu, 31 Oct 2013 20:46:45 +0100 + +spacefm (0.9.0-2) unstable; urgency=high + + * debian/control: + + update Breaks and Replaces to fix upgrade issue + for spacefm-common package. (Closes: #728158) + + Bump standards to 3.9.5.0 (no changes required). + + -- Mateusz Łukasik Tue, 29 Oct 2013 07:45:56 +0100 + spacefm (0.9.0-1ubuntu1) trusty; urgency=low * Add debian/patches/fix-unity-menu.patch to fix issue with Unity global diff -Nru spacefm-0.9.0/debian/control spacefm-0.9.0/debian/control --- spacefm-0.9.0/debian/control 2013-10-24 09:06:42.000000000 +0200 +++ spacefm-0.9.0/debian/control 2013-11-01 22:43:16.000000000 +0100 @@ -6,7 +6,7 @@ libcairo2-dev, libpango1.0-dev, libx11-dev, intltool, pkg-config, libglib2.0-dev, libstartup-notification0-dev, libdbus-1-dev, libgdk-pixbuf2.0-dev, libudev-dev, hicolor-icon-theme, libgtk-3-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.5.0 Homepage: http://ignorantguru.github.com/spacefm/ Vcs-Git: git://github.com/mati75/spacefm.git Vcs-Browser: https://github.com/mati75/spacefm.git @@ -17,8 +17,9 @@ dbus, desktop-file-utils, shared-mime-info, libgtk2.0-bin Recommends: udisks | udisks2, sshfs, hicolor-icon-theme | faenza-icon-theme Suggests: udevil, eject, lsof, wget, ktsuss, gksu -Replaces: spacefm-gtk3 +Replaces: spacefm-gtk3, spacefm (<< 0.9.0-1) Conflicts: spacefm-hal, spacefm-gtk3 +Breaks: spacefm (<< 0.9) Description: Multi-panel tabbed file manager - GTK2 version SpaceFM is tabbed file manager with built-in VFS, udev-based device manager, customizable menu system and bash integration. @@ -36,8 +37,8 @@ Package: spacefm-common Architecture: all Depends: ${misc:Depends} -Replaces: spacefm (<< 0.8.7-1) -Breaks: spacefm (<< 0.8.7-1), spacefm-gtk3 (<< 0.8.7-1) +Replaces: spacefm (<< 0.9) +Breaks: spacefm (<< 0.9), spacefm-gtk3 (<< 0.9) Recommends: spacefm-gtk3 | spacefm Description: Multi-panel tabbed file manager - common files SpaceFM is tabbed file manager with built-in VFS, udev-based @@ -52,8 +53,9 @@ dbus, desktop-file-utils, shared-mime-info, libgtk-3-bin Recommends: udisks | udisks2, sshfs, hicolor-icon-theme | faenza-icon-theme Suggests: udevil, eject, lsof, wget, ktsuss, gksu -Replaces: spacefm +Replaces: spacefm, spacefm-gtk3 Conflicts: spacefm-hal, spacefm +Breaks: spacefm-gtk3 (<< 0.9) Description: Multi-panel tabbed file manager - GTK3 version SpaceFM is tabbed file manager with built-in VFS, udev-based device manager, customizable menu system and bash integration. diff -Nru spacefm-0.9.0/debian/patches/fix-unity-menu.patch spacefm-0.9.0/debian/patches/fix-unity-menu.patch --- spacefm-0.9.0/debian/patches/fix-unity-menu.patch 2013-03-19 19:37:23.000000000 +0100 +++ spacefm-0.9.0/debian/patches/fix-unity-menu.patch 2013-11-04 18:49:20.000000000 +0100 @@ -1,4 +1,7 @@ Description: Fix load unity menu. +Bug: https://github.com/IgnorantGuru/spacefm/issues/49 +Author: Mateusz Łukasik + --- spacefm-0.8.7.orig/data/spacefm.desktop.in +++ spacefm-0.8.7/data/spacefm.desktop.in @@ -2,7 +2,7 @@ diff -Nru spacefm-0.9.0/debian/spacefm-gtk3.postinst spacefm-0.9.0/debian/spacefm-gtk3.postinst --- spacefm-0.9.0/debian/spacefm-gtk3.postinst 2013-10-23 09:00:01.000000000 +0200 +++ spacefm-0.9.0/debian/spacefm-gtk3.postinst 2013-11-01 22:43:16.000000000 +0100 @@ -20,7 +20,7 @@ case "$1" in configure) - echo "Icons cache is now configured. Please wait" + echo "Icons cache is now configured. Please wait..." if [ -x /usr/bin/update-mime-database ] && [ -x /usr/bin/update-desktop-database ]; then update-mime-database /usr/share/mime > /dev/null update-desktop-database -q diff -Nru spacefm-0.9.0/debian/spacefm.postinst spacefm-0.9.0/debian/spacefm.postinst --- spacefm-0.9.0/debian/spacefm.postinst 2013-10-23 08:58:56.000000000 +0200 +++ spacefm-0.9.0/debian/spacefm.postinst 2013-11-01 22:43:16.000000000 +0100 @@ -20,7 +20,7 @@ case "$1" in configure) - echo "Icons cache is now configured. Please wait" + echo "Icons cache is now configured. Please wait..." if [ -x /usr/bin/update-mime-database ] && [ -x /usr/bin/update-desktop-database ]; then update-mime-database /usr/share/mime > /dev/null update-desktop-database -q