- up for 1.2.1

Changed files:
    meld-desktop.patch -> 1.7

diff --git a/meld-desktop.patch b/meld-desktop.patch
index bc74db72405a3c4851533d246b3c0d45b3224b2a..6266856fea603bd712e1dd44f642f726f174f624 100644 (file)
--- a/meld-desktop.patch
+++ b/meld-desktop.patch
@@ -1,13 +1,52 @@
-diff -urN meld-0.9.4.1.orig/meld.desktop.in meld-0.9.4.1/meld.desktop.in
---- meld.orig/meld.desktop.in  2004-02-19 23:47:40.000000000 +0100
-+++ meld/meld.desktop.in.new   2004-11-17 14:28:05.943528776 +0100
-@@ -6,7 +6,8 @@
- Terminal=false
+diff -Nur meld-1.2.1.orig/meld.desktop.in meld-1.2.1.desktop/meld.desktop.in
+--- meld-1.2.1.orig/meld.desktop.in    2008-11-15 03:39:56.000000000 -0700
++++ meld-1.2.1.desktop/meld.desktop.in 2008-11-23 14:13:02.000000000 -0700
+@@ -7,7 +7,8 @@
  Type=Application
  Icon=meld
+ StartupNotify=true
 -Categories=GNOME;Application;Development;
 +Categories=GTK;GNOME;Development;
 +MimeType=text/x-patch;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=meld
  X-GNOME-Bugzilla-Component=general
+diff -Nur meld-1.2.1.orig/meld.desktop.in.orig meld-1.2.1.desktop/meld.desktop.in.orig
+--- meld-1.2.1.orig/meld.desktop.in.orig       1969-12-31 17:00:00.000000000 -0700
++++ meld-1.2.1.desktop/meld.desktop.in.orig    2008-11-15 03:39:56.000000000 -0700
+@@ -0,0 +1,13 @@
++[Desktop Entry]
++Encoding=UTF-8
++_Name=Meld Diff Viewer
++_Comment=Compare and merge your files
++Exec=meld
++Terminal=false
++Type=Application
++Icon=meld
++StartupNotify=true
++Categories=GNOME;Application;Development;
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=meld
++X-GNOME-Bugzilla-Component=general
+diff -Nur meld-1.2.1.orig/meld.desktop.in.rej meld-1.2.1.desktop/meld.desktop.in.rej
+--- meld-1.2.1.orig/meld.desktop.in.rej        1969-12-31 17:00:00.000000000 -0700
++++ meld-1.2.1.desktop/meld.desktop.in.rej     2008-11-23 14:13:00.000000000 -0700
+@@ -0,0 +1,18 @@
++***************
++*** 6,12 ****
++  Terminal=false
++  Type=Application
++  Icon=meld
++- Categories=GNOME;Application;Development;
++  X-GNOME-Bugzilla-Bugzilla=GNOME
++  X-GNOME-Bugzilla-Product=meld
++  X-GNOME-Bugzilla-Component=general
++--- 6,13 ----
++  Terminal=false
++  Type=Application
++  Icon=meld
+++ Categories=GTK;GNOME;Development;
+++ MimeType=text/x-patch;
++  X-GNOME-Bugzilla-Bugzilla=GNOME
++  X-GNOME-Bugzilla-Product=meld
++  X-GNOME-Bugzilla-Component=general