[Pkg-shadow-commits] r3474 - debian/trunk/debian

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-08-17 17:36:54 +0000 (Wed, 17 Aug 2011)
New Revision: 3474

Removed:
   debian/trunk/debian/man.insert
   debian/trunk/debian/man.insert.sed
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/rules
Log:
  * debian/rules, debian/man.insert, debian/man.insert.sed: Bug #507673 has
    been closed. It is no more needed to patch the generated manpages. This
    also fix failures to build twice is a row. Closes: #636047


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2011-08-15 14:40:42 UTC (rev 3473)
+++ debian/trunk/debian/changelog	2011-08-17 17:36:54 UTC (rev 3474)
@@ -1,7 +1,8 @@
 shadow (1:4.1.5-1) UNRELEASED; urgency=low
 
+  * The "Charolais" release.
+
   [ Nicolas FRANCOIS (Nekral) ]
-  * The "Charolais" release.
   * New upstream release:
     - userdel: Check the existence of the user's mail spool before trying to
       remove it. If it does not exist, a warning is issued, but no failure.
@@ -65,12 +66,15 @@
   * debian/securetty.linux: Add serial Console for MIPS Swarm.
     (http://lists.debian.org/debian-release/2011/02/msg00320.html)
   * debian/securetty.linux: Fixed typo: ttyama -> ttyAMA. Closes: #544184
+  * debian/rules, debian/man.insert, debian/man.insert.sed: Bug #507673 has
+    been closed. It is no more needed to patch the generated manpages. This
+    also fix failures to build twice is a row. Closes: #636047
 
   [ Christian Perrier ]
   * Use "linux-any" instead of a negated list of architectures in
     Build-Depends. Closes: #634465
 
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri, 24 Jun 2011 23:43:56 +0200
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri, 29 Jul 2011 15:29:02 +0200
 
 shadow (1:4.1.4.2+svn3283-3) unstable; urgency=high
 

Deleted: debian/trunk/debian/man.insert
===================================================================
--- debian/trunk/debian/man.insert	2011-08-15 14:40:42 UTC (rev 3473)
+++ debian/trunk/debian/man.insert	2011-08-17 17:36:54 UTC (rev 3474)
@@ -1,3 +0,0 @@
-.\" http://bugs.debian.org/507673
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '

Deleted: debian/trunk/debian/man.insert.sed
===================================================================
--- debian/trunk/debian/man.insert.sed	2011-08-15 14:40:42 UTC (rev 3473)
+++ debian/trunk/debian/man.insert.sed	2011-08-17 17:36:54 UTC (rev 3474)
@@ -1,2 +0,0 @@
-/^\.TH/{r debian/man.insert
-}

Modified: debian/trunk/debian/rules
===================================================================
--- debian/trunk/debian/rules	2011-08-15 14:40:42 UTC (rev 3473)
+++ debian/trunk/debian/rules	2011-08-17 17:36:54 UTC (rev 3474)
@@ -40,10 +40,6 @@
 endif
 export CFLAGS
 
-common-build-arch::
-	# Waiting for http://bugs.debian.org/507673
-	sed -i -f debian/man.insert.sed man/*.[0-9] man/*/*.[0-9]
-
 # Add extras to the install process:
 binary-install/login::
 	dh_installpam -p login