[pkg-horde] [COMMIT lionel horde--sid--3--patch-5] make *.rej files unrecognised

[Lionel Elie Mamane]

A  {arch}/horde/horde--upstream/horde--upstream--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-2
A  {arch}/horde/horde--sid/horde--sid--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-5
M  debian/control
M  {arch}/=tagging-method

--- /dev/null
+++ {arch}/horde/horde--upstream/horde--upstream--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-2
@@ -0,0 +1,12 @@
+Revision: horde--upstream--3--patch-2
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Tue Dec 20 12:56:34 CET 2005
+Standard-date: 2005-12-20 11:56:34 GMT
+Modified-files: {arch}/=tagging-method
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--patch-2
+Summary: make *.rej files unrecognised
+Keywords: 
+
+This instructs tla to loudly complain if a .rej file is present. It
+probably means that there is an unhandled conflict left.


--- /dev/null
+++ {arch}/horde/horde--sid/horde--sid--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-5
@@ -0,0 +1,18 @@
+Revision: horde--sid--3--patch-5
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Wed Dec 21 22:49:22 CET 2005
+Standard-date: 2005-12-21 21:49:22 GMT
+Modified-files: debian/control {arch}/=tagging-method
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-5
+    pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--patch-2
+Summary: make *.rej files unrecognised
+Keywords: 
+
+
+
+Patches applied:
+
+ * pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--patch-2
+   make *.rej files unrecognised
+


--- orig/debian/control
+++ mod/debian/control
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Horde Maintainers <pkg-horde-hackers at lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal at debian.org>, Jose Carlos Medeiros <debian at psabs.com.br>, Lionel Elie Mamane <lionel at mamane.lu>
+Uploaders: Ola Lundqvist <opal at debian.org>, Jose Carlos Medeiros <debian at psabs.com.br>, Lionel Elie Mamane <lmamane at debian.org>
 Build-Depends-Indep: debhelper (>= 4.1.16)
 Standards-Version: 3.6.2
 


--- orig/{arch}/=tagging-method
+++ mod/{arch}/=tagging-method
@@ -147,13 +147,13 @@
 # traversal does not descend into backup directories:
 #
 
-backup ^.*(~|\.~[0-9]+~|\.bak|\.swp|\.orig|\.rej|\.original|\.modified|\.reject)$
+backup ^.*(~|\.~[0-9]+~|\.bak|\.swp|\.orig|\.original|\.modified|\.reject)$
 
 # If you want to force certain filenames to be treated as errors when present,
 # you can add them to the regexp for deliberately unrecognized files.  Traversal
 # does not descend into unrecognized directories.
 
-unrecognized ^(.*\.(o|a|so|core|so(\.[[:digit:]]+)*)|core)$
+unrecognized ^(.*\.(rej|o|a|so|core|so(\.[[:digit:]]+)*)|core)$
 
 # Files which match the following pattern are treated as source files.
 # Traversal _does_ descend into source directories: