[pkg-horde] [COMMIT lionel sam--sid--0--patch-3] Merge with upstream branch

[Lionel Elie Mamane]

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

--- /dev/null
+++ {arch}/sam/sam--sid/sam--sid--0/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-3
@@ -0,0 +1,16 @@
+Revision: sam--sid--0--patch-3
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Thu Feb  2 08:38:49 CET 2006
+Standard-date: 2006-02-02 07:38:49 GMT
+Modified-files: {arch}/=tagging-method
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/sam--sid--0--patch-3
+    pkg-horde-hackers at lists.alioth.debian.org--2006/sam--upstream--0--patch-1
+Summary: Merge with upstream branch
+Keywords: 
+
+Patches applied:
+
+ * pkg-horde-hackers at lists.alioth.debian.org--2006/sam--upstream--0--patch-1
+   Make .rej files unrecognised
+


--- /dev/null
+++ {arch}/sam/sam--upstream/sam--upstream--0/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-1
@@ -0,0 +1,12 @@
+Revision: sam--upstream--0--patch-1
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Thu Feb  2 08:32:26 CET 2006
+Standard-date: 2006-02-02 07:32:26 GMT
+Modified-files: {arch}/=tagging-method
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/sam--upstream--0--patch-1
+Summary: Make .rej files unrecognised
+Keywords: 
+
+This makes tla complain if any .rej file is left. Probably unresolved
+conflicts.


--- 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: