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

Proposed by Mohamed Alaa
Status: Rejected
Rejected by: Iain Lane
Proposed branch: lp:~m-alaa8/ubuntu/saucy/pcmanfm/fix-for-993996
Merge into: lp:ubuntu/saucy/pcmanfm
Diff against target: 48 lines (+30/-0)
3 files modified
debian/changelog (+6/-0)
debian/patches/02_remove_old_mimetype.patch (+23/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~m-alaa8/ubuntu/saucy/pcmanfm/fix-for-993996
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+195625@code.launchpad.net

Description of the change

Fix for bug

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

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

26. By Mohamed Alaa

Updated patch information

Revision history for this message
Mohamed Alaa (m-alaa8) wrote :

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

Revision history for this message
Julien Lavergne (gilir) wrote :

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.

Revision history for this message
Mohamed Alaa (m-alaa8) wrote :

> 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

Revision history for this message
Mohamed Alaa (m-alaa8) wrote :

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.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

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

Revision history for this message
Mohamed Alaa (m-alaa8) wrote :

Should I delete this propose and the branch?

Unmerged revisions

26. By Mohamed Alaa

Updated patch information

25. By Mohamed Alaa

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-13 23:02:56 +0000
3+++ debian/changelog 2013-11-19 21:30:03 +0000
4@@ -1,3 +1,9 @@
5+pcmanfm (1.1.2-0ubuntu2) saucy; urgency=low
6+
7+ * debian/patches/02_remove_old_mimetype.patch: Removed old MIME type (LP: #993996)
8+
9+ -- Mohamed Alaa <m.alaa8@gmail.com> Mon, 18 Nov 2013 18:03:13 +0300
10+
11 pcmanfm (1.1.2-0ubuntu1) saucy; urgency=low
12
13 * New upstream release (LP: #1210689)
14
15=== added file 'debian/patches/02_remove_old_mimetype.patch'
16--- debian/patches/02_remove_old_mimetype.patch 1970-01-01 00:00:00 +0000
17+++ debian/patches/02_remove_old_mimetype.patch 2013-11-19 21:30:03 +0000
18@@ -0,0 +1,23 @@
19+## Description: Removes old MIME type string from pcmanfm desktop file
20+## Origin/Author: Mohamed Alaa <m.alaa8@gmail.com
21+## Bug: (LP: #993996)
22+Index: pcmanfm.dev/data/pcmanfm.desktop
23+===================================================================
24+--- pcmanfm.dev.orig/data/pcmanfm.desktop 2013-11-18 18:00:42.521929000 +0300
25++++ pcmanfm.dev/data/pcmanfm.desktop 2013-11-18 18:02:29.059454707 +0300
26+@@ -139,4 +139,4 @@
27+ Exec=pcmanfm %U
28+ StartupNotify=true
29+ Terminal=false
30+-MimeType=x-directory/normal;inode/directory;
31++MimeType=inode/directory;
32+Index: pcmanfm.dev/data/pcmanfm.desktop.in
33+===================================================================
34+--- pcmanfm.dev.orig/data/pcmanfm.desktop.in 2013-11-18 18:00:42.521929000 +0300
35++++ pcmanfm.dev/data/pcmanfm.desktop.in 2013-11-18 18:02:41.031681423 +0300
36+@@ -8,4 +8,4 @@
37+ Exec=pcmanfm %U
38+ StartupNotify=true
39+ Terminal=false
40+-MimeType=x-directory/normal;inode/directory;
41++MimeType=inode/directory;
42
43=== modified file 'debian/patches/series'
44--- debian/patches/series 2012-10-05 18:38:55 +0000
45+++ debian/patches/series 2013-11-19 21:30:03 +0000
46@@ -1,1 +1,2 @@
47 01_hide_home_button.patch
48+02_remove_old_mimetype.patch

Subscribers

People subscribed via source and target branches

to all changes: