r12289 - in /desktop/unstable/intltool/debian: changelog patches/61_ignore-missing-in-distcheck-build-dir.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Aug  8 06:52:31 2007
New Revision: 12289

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12289
Log:
* New patch, 61_ignore-missing-in-distcheck-build-dir, ignore _build dir
  (result of distcheck) when looking for missing files in srcdir; GNOME
  #464474; from SVN r691; closes: #436447.

Added:
    desktop/unstable/intltool/debian/patches/61_ignore-missing-in-distcheck-build-dir.patch
Modified:
    desktop/unstable/intltool/debian/changelog

Modified: desktop/unstable/intltool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/changelog?rev=12289&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/changelog (original)
+++ desktop/unstable/intltool/debian/changelog Wed Aug  8 06:52:31 2007
@@ -1,4 +1,4 @@
-intltool (0.36.0-2) UNRELEASED; urgency=low
+intltool (0.36.0-2) unstable; urgency=low
 
   * Wrap build-deps and deps.
   * Bump debhelper compatibility level to 5 (from 3).
@@ -8,8 +8,11 @@
   * New patch, 60_fix-configure-path, fixes warnings during distcheck when
     srcdir != builddir and the configure source is named configure.ac; from
     SVN r690; GNOME #464474; Debian #436447.
-
- -- Loic Minier <lool at dooz.org>  Wed, 08 Aug 2007 08:44:31 +0200
+  * New patch, 61_ignore-missing-in-distcheck-build-dir, ignore _build dir
+    (result of distcheck) when looking for missing files in srcdir; GNOME
+    #464474; from SVN r691; closes: #436447.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 08 Aug 2007 08:48:05 +0200
 
 intltool (0.36.0-1) unstable; urgency=low
 

Added: desktop/unstable/intltool/debian/patches/61_ignore-missing-in-distcheck-build-dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/patches/61_ignore-missing-in-distcheck-build-dir.patch?rev=12289&op=file
==============================================================================
--- desktop/unstable/intltool/debian/patches/61_ignore-missing-in-distcheck-build-dir.patch (added)
+++ desktop/unstable/intltool/debian/patches/61_ignore-missing-in-distcheck-build-dir.patch Wed Aug  8 06:52:31 2007
@@ -1,0 +1,21 @@
+GNOME #464474; Debian #436447; from SVN r691; ignore _build dir (result of
+distcheck) when looking for missing files in srcdir.
+
+2007-08-07  Rodney Dawes  <dobey.pwns at gmail.com>
+
+        * intltool-update.in.in (FindLeftoutFiles):
+        Strip _build/ from the path name, to ignore some files during distcheck
+
+        Fixes #464474
+
+diff -Nur intltool-0.36.0/intltool-update.in.in intltool-0.36.0.new/intltool-update.in.in
+--- intltool-0.36.0/intltool-update.in.in	2007-08-08 08:45:42.000000000 +0200
++++ intltool-0.36.0.new/intltool-update.in.in	2007-08-08 08:46:12.000000000 +0200
+@@ -517,6 +517,7 @@
+         $srcdir =~ s#^../##;
+         $dummy =~ s#^$srcdir/../##;
+         $dummy =~ s#^$srcdir/##;
++        $dummy =~ s#_build/##;
+ 	if (!exists($in2{$dummy}))
+ 	{
+ 	    push @result, $dummy