packages: meld/meld-GNUmakefile.patch, meld/meld-desktop.patch, meld/meld-g...

qwiat qwiat at pld-linux.org
Sat Oct 16 16:42:12 CEST 2010 

Author: qwiat                        Date: Sat Oct 16 14:42:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.4.0

---- Files affected:
packages/meld:
   meld-GNUmakefile.patch (1.1 -> 1.2) , meld-desktop.patch (1.7 -> 1.8) , meld-glob.patch (1.2 -> 1.3) , meld.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: packages/meld/meld-GNUmakefile.patch
diff -u packages/meld/meld-GNUmakefile.patch:1.1 packages/meld/meld-GNUmakefile.patch:1.2
--- packages/meld/meld-GNUmakefile.patch:1.1	Wed Feb  1 23:01:12 2006
+++ packages/meld/meld-GNUmakefile.patch	Sat Oct 16 16:42:07 2010
@@ -1,5 +1,5 @@
---- meld-1.1.3/help/C/GNUmakefile.orig	2006-02-01 22:54:56.000000000 +0100
-+++ meld-1.1.3/help/C/GNUmakefile	2006-02-01 22:55:15.000000000 +0100
+--- meld-1.1.3/help/C/Makefile.orig	2006-02-01 22:54:56.000000000 +0100
++++ meld-1.1.3/help/C/Makefile	2006-02-01 22:55:15.000000000 +0100
 @@ -10,7 +10,7 @@
  
  .PHONY : all
@@ -18,8 +18,8 @@
  
  .PHONY : uninstall
  uninstall :
---- meld-1.1.3/help/es/GNUmakefile.orig	2006-02-01 22:54:07.000000000 +0100
-+++ meld-1.1.3/help/es/GNUmakefile	2006-02-01 22:54:48.000000000 +0100
+--- meld-1.1.3/help/es/Makefile.orig	2006-02-01 22:54:07.000000000 +0100
++++ meld-1.1.3/help/es/Makefile	2006-02-01 22:54:48.000000000 +0100
 @@ -10,7 +10,7 @@
  
  .PHONY : all

================================================================
Index: packages/meld/meld-desktop.patch
diff -u packages/meld/meld-desktop.patch:1.7 packages/meld/meld-desktop.patch:1.8
--- packages/meld/meld-desktop.patch:1.7	Sun Nov 23 22:23:19 2008
+++ packages/meld/meld-desktop.patch	Sat Oct 16 16:42:07 2010
@@ -1,6 +1,6 @@
 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
+--- meld-1.2.1.orig/data/meld.desktop.in	2008-11-15 03:39:56.000000000 -0700
++++ meld-1.2.1.desktop/data/meld.desktop.in	2008-11-23 14:13:02.000000000 -0700
 @@ -7,7 +7,8 @@
  Type=Application
  Icon=meld
@@ -11,42 +11,3 @@
  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

================================================================
Index: packages/meld/meld-glob.patch
diff -u packages/meld/meld-glob.patch:1.2 packages/meld/meld-glob.patch:1.3
--- packages/meld/meld-glob.patch:1.2	Wed Sep 30 23:22:49 2009
+++ packages/meld/meld-glob.patch	Sat Oct 16 16:42:07 2010
@@ -1,11 +1,11 @@
---- meld-1.3.1/vc/__init__.py	2009-08-14 07:01:33.000000000 +0200
-+++ meld-1.3.1/vc/__init__.py.new	2009-09-30 20:18:47.250060327 +0200
+--- meld-1.4.0/meld/vc/__init__.py	2010-10-16 16:21:54.138033646 +0200
++++ meld-1.4.0/meld/vc/__init__.py.new	2010-10-16 16:22:36.518129763 +0200
 @@ -28,7 +28,7 @@
  def load_plugins():
      _vcdir = os.path.dirname(os.path.abspath(__file__))
      ret = []
 -    for plugin in glob.glob(os.path.join(_vcdir, "[a-z]*.py")):
 +    for plugin in glob.glob(os.path.join(_vcdir, "[a-z]*.pyc")):
-         modname = "vc.%s" % os.path.basename(os.path.splitext(plugin)[0])
+         modname = "meld.vc.%s" % os.path.basename(os.path.splitext(plugin)[0])
          ret.append( __import__(modname, globals(), locals(), "*") )
      return ret

================================================================
Index: packages/meld/meld.spec
diff -u packages/meld/meld.spec:1.62 packages/meld/meld.spec:1.63
--- packages/meld/meld.spec:1.62	Fri Jul  9 13:19:37 2010
+++ packages/meld/meld.spec	Sat Oct 16 16:42:07 2010
@@ -5,12 +5,12 @@
 Summary:	Visual diff and merge tool
 Summary(pl.UTF-8):	Wizualne narzędzie do oglądania i włączania zmian (diff)
 Name:		meld
-Version:	1.3.1
-Release:	3
+Version:	1.4.0
+Release:	1
 License:	GPL
 Group:		Applications/Text
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/meld/1.3/%{name}-%{version}.tar.bz2
-# Source0-md5:	05885811cf0bccc051c3f44938ff54ed
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/meld/1.4/%{name}-%{version}.tar.bz2
+# Source0-md5:	b675ec2006c4452469cf501c51b2a689
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-GNUmakefile.patch
 Patch2:		%{name}-glob.patch
@@ -58,10 +58,6 @@
 %patch1 -p1
 %patch2 -p1
 
-mv -f po/sr\@{Latn,latin}.po
-
-cp -r help/C/figures help/fr/figures
-
 %build
 # Nasty quickfix - some translations are broken for now
 rm -f po/{hu,ja,ru}.po
@@ -102,8 +98,10 @@
 %doc AUTHORS
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{py_sitedir}/%{name}
+%dir %{py_sitedir}/%{name}/%{name}
 %{py_sitedir}/%{name}/*.py[co]
-%{py_sitedir}/%{name}/vc
+%{py_sitedir}/%{name}/%{name}/*
+%{_iconsdir}/hicolor/*
 %{_datadir}/%{name}
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
@@ -114,6 +112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2010/10/16 14:42:07  qwiat
+- updated to 1.4.0
+
 Revision 1.62  2010/07/09 11:19:37  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/meld/meld-GNUmakefile.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/meld/meld-desktop.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/meld/meld-glob.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/meld/meld.spec?r1=1.62&r2=1.63&f=u

More information about the pld-cvs-commit mailing list