[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#693654: unblock: doc-linux-fr/2012.11-1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package doc-linux-fr

It fixes an important bug (#691570 that is blocking mirror removal), and
updates the (translated) documentation.

The attached diff skips the HOWTO/ update, and the two debian/ files
that were simply converted to UTF-8. The debian/rules changes are
related to the “refresh” target, only used to update the documentation
from upstream.

unblock doc-linux-fr/2012.11-1

Thanks in advance, regards.

David

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.5-trunk-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru --exclude HOWTO --exclude copyright --exclude make-dhelp doc-linux-fr-2005.08/debian/changelog doc-linux-fr-2012.11/debian/changelog
--- doc-linux-fr-2005.08/debian/changelog	2005-08-24 13:28:36.000000000 -0400
+++ doc-linux-fr-2012.11/debian/changelog	2012-11-18 19:52:54.000000000 -0400
@@ -1,3 +1,107 @@
+doc-linux-fr (2012.11-1) unstable; urgency=low
+
+  * November 2012 Release
+
+  Added:
+   AI-Alife-HOWTO
+   Anon-ftp (HTML only)
+   Athlon-Powersaving-HOWTO
+   BackspaceDelete (HTML only)
+   Boot+Root+Raid+LILO
+   Busmouse-HOWTO (HTML only)
+   Cluster-HOWTO
+   Colour-ls (HTML only)
+   Commercial-HOWTO (HTML only)
+   DHCPcd (HTML only)
+   DHCPd (HTML only)
+   Diald (HTML only)
+   Dial-On-Demand (HTML only)
+   DocBook-Demystification-HOWTO
+   DVD-Playback-HOWTO
+   Dynamic-IP-Hacks (HTML only)
+   Ecology-HOWTO
+   EVMSUG (HTML only)
+   Firewall-HOWTO (HTML only)
+   Firewall-Piercing
+   FTP
+   g4u
+   Glibc-Install-HOWTO
+   Install-Strategies (HTML only)
+   IRC
+   IR-HOWTO (HTML only)
+   KernelAnalysis-HOWTO
+   Keyboard-HOWTO (HTML only)
+   Large-Disk (HTML only)
+   Large-IDE (HTML only)
+   lartc
+   Linux+FreeBDS-mini-HOWTO (HTML only)
+   Linux-From-Scratch-HOWTO (HTML only)
+   Linux+Solaris (HTML only)
+   Linux+WinNT
+   Liste-des-HOWTO (HTML only)
+   Mail-HOWTO (HTML only)
+   Masquerading-Simple-HOWTO
+   MIDI-HOWTO
+   MIDI+SB (HTML only)
+   MindTerm-SSH-HOWTO
+   Multiboot-with-GRUB
+   NET4-HOWTO (HTML only)
+   Network-boot-HOWTO (HTML only)
+   Offline-Mailing-HOWTO (HTML only)
+   PA-RISC-Linux-Boot-HOWTO
+   Postgres (HTML only)
+   PostgreSQL-HOWTO (HTML only)
+   PPP-over-ISDN (HTML only)
+   PPP-over-minicom (HTML only)
+   Proxy-ARP (HTML only)
+   Saving-Space
+   SCSI-HOWTO (HTML only)
+   Slip+ProxyARP (HTML only)
+   SquashFS-HOWTO
+   TCP-Keepalive-HOWTO
+   User-Authentication-HOWTO
+   VB6-to-Tcl
+   Virtual-wu-ftpd (HTML only)
+   VoIP-HOWTO
+   Wacom-USB-mini-HOWTO
+   Webcam-HOWTO
+   Win95+Win3x+Linux (HTML only)
+   Win95+Win+Linux (HTML only)
+   Win+BSD+Linux-Install-HOWTO (HTML only)
+   Windows-LAN-Server-HOWTO (HTML only)
+   Windows-Modem-Sharing (HTML only)
+   Wireless-Sync-HOWTO
+   Xinerama-HOWTO
+   X-Terminal (HTML only)
+
+  Renamed (HTML only):
+   Home-Network-mini-HOWTO as Home-Network
+   HOWTO-HOWTO as Howto-HOWTO
+
+  Updated:
+   Almost everything (including UTF-8 conversion of HTML files early 2007)
+
+  * Adopt the package. Closes: #637643
+  * debian/rules: Use lftp instead of mirror in refresh target, update URLs.
+  * HOWTO/.mirror: Remove spurious file.
+  * debian/doc-base.fcol-faq: Fix syntax, and use English description.
+  * debian/doc-linux-fr-{html,text}.README.Debian: Fix typo.
+  * debian/{copyright.make-dhelp}: Convert to UTF-8.
+
+ -- David Prévot <taffit@debian.org>  Sun, 18 Nov 2012 18:27:13 -0400
+
+doc-linux-fr (2005.08-2) unstable; urgency=low
+
+  * QA upload.
+
+  [ Ivo De Decker ]
+  * Remove build-depends on mirror. Closes: 691570 
+
+  [ gregor herrmann ]
+  * Set Maintainer to Debian QA Group <packages@qa.debian.org> (cf. #637643).
+
+ -- Ivo De Decker <ivo.dedecker@ugent.be>  Sun, 18 Nov 2012 16:15:09 +0100
+
 doc-linux-fr (2005.08-1) unstable; urgency=low
 
   * August release
diff -Nru --exclude HOWTO --exclude copyright --exclude make-dhelp doc-linux-fr-2005.08/debian/control doc-linux-fr-2012.11/debian/control
--- doc-linux-fr-2005.08/debian/control	2005-08-24 13:25:37.000000000 -0400
+++ doc-linux-fr-2012.11/debian/control	2012-11-18 19:52:54.000000000 -0400
@@ -1,9 +1,9 @@
 Source: doc-linux-fr
 Section: doc
 Priority: optional
-Maintainer: Pierre Machard <pmachard@debian.org>
+Maintainer: David Prévot <taffit@debian.org>
 Standards-Version: 3.6.2
-Build-Depends-Indep: tidy, debhelper (>> 3.0.0), mirror
+Build-Depends-Indep: tidy, debhelper (>> 3.0.0)
 
 Package: doc-linux-fr-html
 Priority: optional
diff -Nru --exclude HOWTO --exclude copyright --exclude make-dhelp doc-linux-fr-2005.08/debian/doc-base.fcol-faq doc-linux-fr-2012.11/debian/doc-base.fcol-faq
--- doc-linux-fr-2005.08/debian/doc-base.fcol-faq	2005-08-09 03:07:37.000000000 -0400
+++ doc-linux-fr-2012.11/debian/doc-base.fcol-faq	2012-11-18 19:52:54.000000000 -0400
@@ -1,8 +1,8 @@
 Document: fcol-faq
 Title: FAQ fr.comp.os.linux.*
 Author: <faq-fcol@linux-france.org>
-Abstract:  Ce document est avant tout destiné à compléter les moyens classiques d'accès à l'information et aux documents 
-Section: FAQ
+Abstract: This document is primarily aimed to complete the usual access ways to information and documents
+Section: Help/FAQ
 
 Format: HTML
 Index: /usr/share/doc/LANG/fr/linux/fcol-faq/fcol-faq.html
diff -Nru --exclude HOWTO --exclude copyright --exclude make-dhelp doc-linux-fr-2005.08/debian/doc-linux-fr-html.README.Debian doc-linux-fr-2012.11/debian/doc-linux-fr-html.README.Debian
--- doc-linux-fr-2005.08/debian/doc-linux-fr-html.README.Debian	2005-08-09 03:07:37.000000000 -0400
+++ doc-linux-fr-2012.11/debian/doc-linux-fr-html.README.Debian	2012-11-18 19:52:54.000000000 -0400
@@ -1,7 +1,7 @@
 doc-linux-fr-html for Debian
 -----------------------------
 
-This packages mimics the doc-linux-html package maintained by 
+This package mimics the doc-linux-html package maintained by 
 Collin Watson <cjwatson@debian.org>
 
 This package contains the HTML versions of French translations of:
diff -Nru --exclude HOWTO --exclude copyright --exclude make-dhelp doc-linux-fr-2005.08/debian/doc-linux-fr-text.README.Debian doc-linux-fr-2012.11/debian/doc-linux-fr-text.README.Debian
--- doc-linux-fr-2005.08/debian/doc-linux-fr-text.README.Debian	2005-08-09 03:07:37.000000000 -0400
+++ doc-linux-fr-2012.11/debian/doc-linux-fr-text.README.Debian	2012-11-18 19:52:54.000000000 -0400
@@ -1,7 +1,7 @@
 doc-linux-html for Debian
 -------------------------
 
-This packages mimics the doc-linux-html package maintained by 
+This package mimics the doc-linux-html package maintained by 
 Collin Watson <cjwatson@debian.org>
 
 This package contains the text versions of the Linux HOWTO documents from
diff -Nru --exclude HOWTO --exclude copyright --exclude make-dhelp doc-linux-fr-2005.08/debian/rules doc-linux-fr-2012.11/debian/rules
--- doc-linux-fr-2005.08/debian/rules	2005-08-09 05:02:54.000000000 -0400
+++ doc-linux-fr-2012.11/debian/rules	2012-11-18 19:52:54.000000000 -0400
@@ -50,13 +50,13 @@
 	cp HOWTO/Linux-html-HOWTOs.tar.gz HOWTO/Linux-html-HOWTOs.old.tar.gz
 	
 	#refresh 
-	mirror -p doc-linux-fr-html -d debian/Mirror
+	lftp -c 'mirror -nev ftp://ftp.traduc.org/pub/traduc.org/doc-vf/HOWTO/lecture/HOWTO HOWTO/HTML'
 	#fetch index
 	wget -O HOWTO/index.html \
-		"http://www.traduc.org/docs/HOWTO/nouvel_index.php?global.1";
+		"http://guidespratiques.traduc.org/nouvel_index.php?howto.1";
 		
 	# Pack the Howtos
-	$(TGZ) --exclude \.mirror -C HOWTO/HTML -cf HOWTO/Linux-html-HOWTOs.tar.gz .
+	$(TGZ) --exclude CVS -C HOWTO/HTML -cf HOWTO/Linux-html-HOWTOs.tar.gz .
 
 refresh-howto-text:
 	dh_testdir
@@ -73,7 +73,7 @@
 	cd HOWTO/text ; gunzip * ; cd ../../;
 	
 	# Refresh
-	mirror -dd -p doc-linux-fr-text -d debian/Mirror
+	lftp -c 'mirror -nev --exclude-glob ".*\.tar.*" ftp://ftp.traduc.org/pub/traduc.org/doc-vf/HOWTO/telechargement/text/ HOWTO/text'
 	
 	# Pack the text Howtos
 	cd  HOWTO/text ; gzip -9 *; cd ../../;

Reply to: