Merge lp:~m-alaa8/ubuntu/saucy/pcmanfm/fix-for-993996 into lp:ubuntu/saucy/pcmanfm

[Mohamed Alaa]

Fix for bug

[Dmitry Shachnev (mitya57)]

Thanks for your work here.

Did you submit the patch upstream? Please do that and replace the placeholders with actual links.

+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL

[lp:~m-alaa8/ubuntu/saucy/pcmanfm/fix-for-993996]

26. By Mohamed Alaa on 2013-11-19

Updated patch information

[Mohamed Alaa (m-alaa8)]

> Thanks for your work here.
>
> Did you submit the patch upstream? Please do that and replace the placeholders
> with actual links.
>
> +## Description: add some description
> +## Origin/Author: add some origin or author
> +## Bug: bug URL

Thanks for your help, I've updated the patch with information, but I haven't submitted it upstream yet, pcmanfm developers do not use launchpad for code hosting, so I have to find where to submit patch.

[Julien Lavergne (gilir)]

You can submit the patch to http://sourceforge.net/tracker/?atid=801864&group_id=156956&func=browse
1.2.0 version of pcmanfm is planned for trusty, so it will be very nice to have included, so we don't have to diverge just for this patch.

[Mohamed Alaa (m-alaa8)]

> You can submit the patch to
> http://sourceforge.net/tracker/?atid=801864&group_id=156956&func=browse
> 1.2.0 version of pcmanfm is planned for trusty, so it will be very nice to
> have included, so we don't have to diverge just for this patch.

Done! Thank you very much :)
https://sourceforge.net/tracker/?func=detail&aid=3615233&group_id=156956&atid=801864

[Mohamed Alaa (m-alaa8)]

http://sourceforge.net/tracker/?func=detail&atid=801864&aid=3615233&group_id=156956
One of the developers said that this issue was fixed in GIT resources, no need for this patch/branch anymore.

[Dmitry Shachnev (mitya57)]

Removing from queue then, as the fix will be included in new upstream release and the bug is low priority.

[Mohamed Alaa (m-alaa8)]

Should I delete this propose and the branch?

Unmerged revisions

26. By Mohamed Alaa on 2013-11-19

Updated patch information

25. By Mohamed Alaa on 2013-11-18

debian/patches/02_remove_old_mimetype.patch: Removed old MIME type (LP: #993996)

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-13 23:02:56 +0000
+++ debian/changelog	2013-11-19 21:30:03 +0000
@@ -1,3 +1,9 @@
+pcmanfm (1.1.2-0ubuntu2) saucy; urgency=low
+
+  * debian/patches/02_remove_old_mimetype.patch: Removed old MIME type (LP: #993996)
+
+ -- Mohamed Alaa <[e-mail]>  Mon, 18 Nov 2013 18:03:13 +0300
+
 pcmanfm (1.1.2-0ubuntu1) saucy; urgency=low
 
   * New upstream release (LP: #1210689)
 
=== added file 'debian/patches/02_remove_old_mimetype.patch'
--- debian/patches/02_remove_old_mimetype.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_remove_old_mimetype.patch	2013-11-19 21:30:03 +0000
@@ -0,0 +1,23 @@
+## Description: Removes old MIME type string from pcmanfm desktop file
+## Origin/Author: Mohamed Alaa <[e-mail]
+## Bug: (LP: #993996)
+Index: pcmanfm.dev/data/pcmanfm.desktop
+===================================================================
+--- pcmanfm.dev.orig/data/pcmanfm.desktop	2013-11-18 18:00:42.521929000 +0300
++++ pcmanfm.dev/data/pcmanfm.desktop	2013-11-18 18:02:29.059454707 +0300
+@@ -139,4 +139,4 @@
+ Exec=pcmanfm %U
+ StartupNotify=true
+ Terminal=false
+-MimeType=x-directory/normal;inode/directory;
++MimeType=inode/directory;
+Index: pcmanfm.dev/data/pcmanfm.desktop.in
+===================================================================
+--- pcmanfm.dev.orig/data/pcmanfm.desktop.in	2013-11-18 18:00:42.521929000 +0300
++++ pcmanfm.dev/data/pcmanfm.desktop.in	2013-11-18 18:02:41.031681423 +0300
+@@ -8,4 +8,4 @@
+ Exec=pcmanfm %U
+ StartupNotify=true
+ Terminal=false
+-MimeType=x-directory/normal;inode/directory;
++MimeType=inode/directory;
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-05 18:38:55 +0000
+++ debian/patches/series	2013-11-19 21:30:03 +0000
@@ -1,1 +1,2 @@
 01_hide_home_button.patch
+02_remove_old_mimetype.patch