r11416 - in /packages/unstable/meld/debian: changelog patches/plurals.patch patches/scrollkeeper.diff rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Jun  9 18:37:14 2007
New Revision: 11416

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11416
Log:
* New upstream release.
  - Drop patch "plurals"; doesn't apply anymore and it seems to build fine
    without now.
  - Drop patch "scrollkeeper" and add a rule to drop installed scrollkeeper
    files; partially applied upstream and I don't understand what the
    reminder of the patch was meant to fix.

Removed:
    packages/unstable/meld/debian/patches/plurals.patch
    packages/unstable/meld/debian/patches/scrollkeeper.diff
Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/rules

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=11416&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog (original)
+++ packages/unstable/meld/debian/changelog Sat Jun  9 18:37:14 2007
@@ -1,4 +1,4 @@
-meld (1.1.4-2) UNRELEASED; urgency=low
+meld (1.1.5-1) unstable; urgency=low
 
   * Add Debian GNOME Maintainers to Uploaders; build-dep on gnome-pkg-tools.
   * Cleanups.
@@ -13,8 +13,14 @@
   * Add a get-orig-source target to retrieve the upstream source.
   * Add ${misc:Depends}.
   * Set Python compatibility version to 2; add XS and XB-Python-Version.
-
- -- Loic Minier <lool at dooz.org>  Sat, 09 Jun 2007 20:13:02 +0200
+  * New upstream release.
+    - Drop patch "plurals"; doesn't apply anymore and it seems to build fine
+      without now.
+    - Drop patch "scrollkeeper" and add a rule to drop installed scrollkeeper
+      files; partially applied upstream and I don't understand what the
+      reminder of the patch was meant to fix.
+
+ -- Loic Minier <lool at dooz.org>  Sat, 09 Jun 2007 20:35:36 +0200
 
 meld (1.1.4-1) unstable; urgency=low
 

Modified: packages/unstable/meld/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/rules?rev=11416&op=diff
==============================================================================
--- packages/unstable/meld/debian/rules (original)
+++ packages/unstable/meld/debian/rules Sat Jun  9 18:37:14 2007
@@ -18,3 +18,5 @@
 
 binary-post-install/meld::
 	rm -rf debian/$(cdbs_curpkg)/usr/share/application-registry
+	# scrollkeeper stuff
+	rm -rf debian/$(cdbs_curpkg)/usr/var