r18453 - in /packages/unstable/meld/debian: changelog patches/makefile.diff

[ross at users.alioth.debian.org]

Author: ross
Date: Wed Feb 18 20:08:40 2009
New Revision: 18453

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18453
Log:
New upstream meld release

Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/patches/makefile.diff

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=18453&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog (original)
+++ packages/unstable/meld/debian/changelog Wed Feb 18 20:08:40 2009
@@ -1,3 +1,10 @@
+meld (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh makefile.patch
+
+ -- Ross Burton <ross at debian.org>  Wed, 18 Feb 2009 17:42:15 +0000
+
 meld (1.1.5.1-2) unstable; urgency=low
 
   * Really change python-gnome2-extras to -desktop (Closes: #444350)

Modified: packages/unstable/meld/debian/patches/makefile.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/makefile.diff?rev=18453&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/makefile.diff (original)
+++ packages/unstable/meld/debian/patches/makefile.diff Wed Feb 18 20:08:40 2009
@@ -1,13 +1,13 @@
---- GNUmakefile	2005-01-25 14:29:10.000000000 +0000
-+++ GNUmakefile.new	2005-01-25 14:30:05.000000000 +0000
-@@ -51,8 +51,8 @@
+Index: meld-1.2.1/GNUmakefile
+===================================================================
+--- meld-1.2.1.orig/GNUmakefile	2009-02-18 20:05:08.000000000 +0000
++++ meld-1.2.1/GNUmakefile	2009-02-18 20:05:12.000000000 +0000
+@@ -57,8 +57,6 @@
  		$(DESTDIR)$(sharedir)/application-registry/meld.applications
  	install -m 644 meld.desktop \
  		$(DESTDIR)$(sharedir)/applications
--	$(PYTHON) -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")'
--	$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")'
-+	#$(PYTHON) -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")'
-+	#$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")'
+-	$(PYTHON)    -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
+-	$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
  	install -m 644 \
  		glade2/*.glade \
  		$(DESTDIR)$(sharedir_)/glade2