The following commit has been merged in the master branch:
commit bcd5c89ab1621264e09e525826b2132490f35e07
Author: Raphaël Hertzog <hert...@debian.org>
Date:   Sat Sep 3 14:34:31 2011 +0200

    dpkg-source(1): add example of extend-diff-ignore's usage
    
    Suggested-by: Christoph Berg <m...@debian.org>
    Closes: #640198

diff --git a/debian/changelog b/debian/changelog
index 4a0fee4..06d7dbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -100,6 +100,8 @@ dpkg (1.16.1) UNRELEASED; urgency=low
     native formats in case of unexpected interruption. Closes: #631494
   * Fix simplification logic of union dependencies. Closes: #637564
   * Fix dpkg's handling of a hardlink pointing to a conffile. Closes: #638291
+  * Add example of extend-diff-ignore's usage in dpkg-source(1).
+    Closes: #640198
 
   [ Guillem Jover ]
   * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index d649b0d..7d90bc5 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -695,6 +695,8 @@ Here's an example of such a file:
   compression\-level = 9
   # use debian/patches/debian\-changes as automatic patch
   single\-debian\-patch
+  # ignore changes on config.{sub,guess}
+  extend-diff-ignore = "(^|/)(config\.sub|config\.guess)$"
 .P
 Note: \fBformat\fR options are not accepted in this file, you should
 use \fBdebian/source/format\fR instead.

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to