[Pkg-doc-linux-devel] r184 - in trunk/doc-linux/debian: . copyrights/free copyrights/placeholder

[Frank Lichtenheld]

Author: djpig
Date: 2005-09-01 13:20:16 +0000 (Thu, 01 Sep 2005)
New Revision: 184

Added:
   trunk/doc-linux/debian/copyrights/placeholder/RedirectToGuide
Modified:
   trunk/doc-linux/debian/copyrights/free/LDPL-2.0
   trunk/doc-linux/debian/copyrights/placeholder/Redirect
   trunk/doc-linux/debian/doc-linux.changelog
   trunk/doc-linux/debian/redirect.patch
   trunk/doc-linux/debian/split-package
Log:
Clean up packaging handling of placeholders a bit:
 * Also install HOWTOs with status "placeholder" into the free package
 * Move all redirect pages for guides from LDPL-2.0 to
   placeholders/RedirectToGuide
 * Add Laptop-HOWTO redirect page to redirect.patch


Modified: trunk/doc-linux/debian/copyrights/free/LDPL-2.0
===================================================================
--- trunk/doc-linux/debian/copyrights/free/LDPL-2.0	2005-09-01 12:57:19 UTC (rev 183)
+++ trunk/doc-linux/debian/copyrights/free/LDPL-2.0	2005-09-01 13:20:16 UTC (rev 184)
@@ -3,7 +3,6 @@
 HOWTO: ADSM-Backup
 HOWTO: AI-Alife-HOWTO
 HOWTO: Accessibility-Dev-HOWTO
-HOWTO: Adv-Bash-Scr-HOWTO
 HOWTO: Alpha-HOWTO
 HOWTO: Apache+SSL+PHP+fp
 HOWTO: Apache-WebDAV-LDAP-HOWTO
@@ -25,7 +24,6 @@
 HOWTO: Compaq-Remote-Insight-Board-HOWTO
 HOWTO: Compaq-T1500-HOWTO
 HOWTO: Compressed-TCP
-HOWTO: Consultants-HOWTO
 HOWTO: DPT-Hardware-RAID-HOWTO
 HOWTO: Danish-HOWTO
 HOWTO: Debian-Binary-Package-Building-HOWTO
@@ -36,7 +34,6 @@
 HOWTO: Ethernet-Bridge-netfilter-HOWTO
 HOWTO: Fax-Server
 HOWTO: Glibc2-HOWTO
-HOWTO: HOWTO-HOWTO
 HOWTO: Hard-Disk-Upgrade
 HOWTO: Hebrew-HOWTO
 HOWTO: IP-Alias
@@ -55,7 +52,6 @@
 HOWTO: Linux+NT-Loader
 HOWTO: Linux+Solaris
 HOWTO: Linux+Win95
-HOWTO: Linux-From-Scratch-HOWTO
 HOWTO: Linux-Init-HOWTO
 HOWTO: LinuxGL-QuakeWorld-mini-HOWTO
 HOWTO: Linuxdoc-Reference

Modified: trunk/doc-linux/debian/copyrights/placeholder/Redirect
===================================================================
--- trunk/doc-linux/debian/copyrights/placeholder/Redirect	2005-09-01 12:57:19 UTC (rev 183)
+++ trunk/doc-linux/debian/copyrights/placeholder/Redirect	2005-09-01 13:20:16 UTC (rev 184)
@@ -1,6 +1,5 @@
 HOWTO: DPT-Hardware-RAID
 HOWTO: Net-HOWTO
-HOWTO: Laptop-HOWTO
 
 These HOWTOs have been renamed and the files under their old
 name are only redirects

Added: trunk/doc-linux/debian/copyrights/placeholder/RedirectToGuide
===================================================================
--- trunk/doc-linux/debian/copyrights/placeholder/RedirectToGuide	2005-09-01 12:57:19 UTC (rev 183)
+++ trunk/doc-linux/debian/copyrights/placeholder/RedirectToGuide	2005-09-01 13:20:16 UTC (rev 184)
@@ -0,0 +1,7 @@
+HOWTO: Adv-Bash-Scr-HOWTO
+HOWTO: Consultants-HOWTO
+HOWTO: HOWTO-HOWTO
+HOWTO: Laptop-HOWTO
+HOWTO: Linux-From-Scratch-HOWTO
+
+These HOWTOs were replaced by guides and only redirect to them now

Modified: trunk/doc-linux/debian/doc-linux.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux.changelog	2005-09-01 12:57:19 UTC (rev 183)
+++ trunk/doc-linux/debian/doc-linux.changelog	2005-09-01 13:20:16 UTC (rev 184)
@@ -16,6 +16,7 @@
   * Upstream fixed the link in the HOWTO-HOWTO placeholder
     (Closes: #316163)
   * Fix URL to subversion repository in debian/copyright
+  * Clean up packaging handling of placeholders a bit
 
  -- Frank Lichtenheld <djpig at debian.org>  Wed, 31 Aug 2005 20:51:46 +0200
 

Modified: trunk/doc-linux/debian/redirect.patch
===================================================================
--- trunk/doc-linux/debian/redirect.patch	2005-09-01 12:57:19 UTC (rev 183)
+++ trunk/doc-linux/debian/redirect.patch	2005-09-01 13:20:16 UTC (rev 184)
@@ -43,3 +43,14 @@
  </P>
  </BODY>
  </HTML>
+--- Laptop-HOWTO.html
++++ Laptop-HOWTO.html
+@@ -14,7 +14,7 @@
+ <h1>Linux Laptop HOWTO</h1>
+
+ <p>This document has been replaced by the
+-<a href="../LDP/Mobile-Guide/html/index.html">Linux on the Road
++<a href="http://www.tldp.org/LDP/Mobile-Guide/html/index.html">Linux on the Road
+ (Linux Mobile Guide)</a> at the request of the author.
+ </p>
+

Modified: trunk/doc-linux/debian/split-package
===================================================================
--- trunk/doc-linux/debian/split-package	2005-09-01 12:57:19 UTC (rev 183)
+++ trunk/doc-linux/debian/split-package	2005-09-01 13:20:16 UTC (rev 184)
@@ -19,7 +19,7 @@
 
 my $type = 'HOWTO';
 
-my (%free, %nonfree, %other);
+my (%status);
 
 for my $status (qw(free non-free undistributable removed placeholder)) {
     opendir COPYRIGHTS, "debian/copyrights/$status"
@@ -32,12 +32,10 @@
 	    chomp;
 	    last if /^$/;
 	    next unless s/^\Q$type\E: //o;
-	    if ($status eq 'free') {
-		$free{$_} = 1;
-	    } elsif ($status eq 'non-free') {
-		$nonfree{$_} = 1;
-	    } else {
-		$other{$_} = 1;
+	    $status{$status}{$_}++;
+	    $status{all}{$_}++;
+	    if ($status{all}{$_} > 1) {
+		warn "Duplicate copyright information for $_!\n";
 	    }
 	}
 	close COPYRIGHT;
@@ -94,14 +92,13 @@
 	$canon = 'Windows-Newsreaders-under-Linux-HOWTO';
     }
 
-    if ($free{$canon}) {
+
+    if ($status{free}{$canon}
+	|| $status{placeholder}{$canon}) {
 	move "$dir/$file", "free/$file";
-	if ($nonfree{$canon}) {
-	    warn "Duplicate copyright information for $file ($canon)!\n";
-	}
-    } elsif ($nonfree{$canon}) {
+    } elsif ($status{nonfree}{$canon}) {
 	move "$dir/$file", "non-free/$file";
-    } elsif (!$other{$canon}) {
+    } elsif (!$status{all}{$canon}) {
 	warn "No copyright information for $file ($canon)!\n";
     }
 }