lintian: r1307 - in trunk: checks debian

[djpig@debian.org]

Author: djpig
Date: 2008-05-11 23:10:15 +0200 (Sun, 11 May 2008)
New Revision: 1307

Modified:
   trunk/checks/files
   trunk/checks/files.desc
   trunk/debian/changelog
Log:
* checks/files:
  + Drop xresources-file-in-etc-without-proper-conflicts, since
    the last package that conflict applies to was released with hamm!
    Reported by Julien Cristau.  (Closes: #480574)


Modified: trunk/checks/files
===================================================================
--- trunk/checks/files	2008-05-06 20:28:19 UTC (rev 1306)
+++ trunk/checks/files	2008-05-11 21:10:15 UTC (rev 1307)
@@ -213,20 +213,6 @@
 	elsif ($file =~ m,^etc/rc\.boot/\S,) {
 	    tag "package-installs-into-etc-rc.boot", "$file";
 	}
-	# --------------- /etc/X11/Xresources/
-	elsif ($file =~ m,^etc/X11/Xresources,) {
-	    my $needs_conflicts = 1;
-	    if (open(CONFLICTS, '<', "fields/conflicts")) {
-		my $line = <CONFLICTS>;
-		if ($line =~ m/xbase \(.+?\)/) {
-		    $needs_conflicts = 0;
-		}
-		close(CONFLICTS);
-	    }
-	    if ($needs_conflicts) {
-		tag "xresources-file-in-etc-without-proper-conflicts", "$file";
-	    }
-	}
     }
     # ---------------- /usr
     elsif ($file =~ m,^usr/,) {

Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc	2008-05-06 20:28:19 UTC (rev 1306)
+++ trunk/checks/files.desc	2008-05-11 21:10:15 UTC (rev 1307)
@@ -565,15 +565,6 @@
  If the info contained is important for configuration perhaps it could be
  summarized in README.Debian, otherwise an override may be added.
 
-Tag: xresources-file-in-etc-without-proper-conflicts
-Type: error
-Ref: policy 11.8.6
-Info: Packages that install files into the /etc/X11/Xresources/ directory must
- declare a conflict with xbase (&lt;&lt; 3.3.2.3a-2); if this is not done it is
- possible for the installing package to destroy a previously-existing
- /etc/X11/Xresources file which had been customized by the system
- administrator.
-
 Tag: package-contains-hardlink
 Type: warning
 Info: The package contains a hardlink in <tt>/etc</tt> or across different

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-06 20:28:19 UTC (rev 1306)
+++ trunk/debian/changelog	2008-05-11 21:10:15 UTC (rev 1307)
@@ -7,6 +7,10 @@
       (Closes: #479088)
     + [FL] Add basic support for debhelpers new dh utility.
       (Closes: #477628)
+  * checks/files:
+    + [FL] Drop xresources-file-in-etc-without-proper-conflicts, since
+      the last package that conflict applies to was released with hamm!
+      Reported by Julien Cristau.  (Closes: #480574)
   * checks/menu-format:
     + [FL] Don't issue false positives about menu files in format menu-2.
       We don't check them for errors yet, though.  (Closes: #478578)