From 9deb98db0770346f1a92186eed90735169bad108 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Tue, 6 Nov 2012 00:09:07 +0000
Subject: Fix bogus URLs, thanks Brian Potkin for the hint. Closes: #692310.

---
 build/entities/urls.ent | 15 ++++++++-------
 debian/changelog        |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index be57cf39a..9e0516ab3 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -57,13 +57,13 @@
 <!ENTITY url-debian-installer "&disturl;main/installer-&architecture;/current/">
 
 <!-- debian-installer WebSVN  -->
-<!ENTITY url-d-i-websvn "http://svn.debian.org/wsvn/d-i/">
+<!ENTITY url-d-i-websvn "http://anonscm.debian.org/viewvc/d-i/">
 
 <!-- The doc/devel/ subdirectory of debian-installer in gitweb.  -->
 <!ENTITY url-d-i-gitweb-doc-devel "http://anonscm.debian.org/gitweb/?p=d-i/debian-installer.git;a=tree;f=doc/devel">
 
 <!-- debian-installer README -->
-<!ENTITY url-d-i-readme "http://svn.debian.org/wsvn/d-i/README?op=file">
+<!ENTITY url-d-i-readme "http://anonscm.debian.org/viewvc/d-i/README?view=co">
 
 <!-- instructions on where to get Debian -->
 <!ENTITY url-debian-distrib "http://&www-debian-org;/distrib/">
@@ -132,7 +132,7 @@
 <!--
   misc
   -->
-<!ENTITY url-osd "http://opensource.org/docs/definition_plain.html">
+<!ENTITY url-osd "http://opensource.org/osd">
 <!ENTITY url-debian-wiki-software "http://&wiki-debian-org;/DebianSoftware">
 
 <!-- GPL -->
@@ -162,7 +162,7 @@
 <!ENTITY url-fhs-home "http://www.pathname.com/fhs/">
 
 <!-- LUKS -->
-<!ENTITY url-luks "http://luks.endorphin.org/">
+<!ENTITY url-luks "http://code.google.com/p/cryptsetup/">
 
 <!-- US keyboard layout -->
 <!ENTITY url-us-keymap "http://en.wikipedia.org/wiki/Keyboard_layout#United_States">
@@ -218,6 +218,7 @@
 
 <!ENTITY url-xorg "http://xorg.freedesktop.org/">
 
+<!-- Next entity is no longer used; delete when translations are updated -->
 <!ENTITY url-simtel "ftp://ftp.simtel.net/pub/simtelnet/msdos/">
 
 <!ENTITY url-brltty "http://www.mielke.cc/brltty/">
@@ -283,7 +284,7 @@
 <!-- ****************************************** powerpc links -->
 
 <!ENTITY url-powerpc-yaboot-faq
-  "http://penguinppc.org/projects/yaboot/doc/yaboot-howto.shtml/">
+  "http://&www-debian-org;/ports/powerpc/inst/yaboot-howto/">
 
 <!ENTITY url-powerpc-quik-faq
   "http://penguinppc.org/projects/quik/">
@@ -292,7 +293,7 @@
    "http://www.netbsd.org/Ports/macppc/faq.html">
 
 <!ENTITY url-mac-fdisk-tutorial
-  "http://penguinppc.org/projects/yaboot/doc/mac-fdisk-basics.shtml">
+  "www.alaska.net/~erbenson/doc/mac-fdisk-basics.txt">
 
 <!ENTITY url-powerpc-of 
    "http://debian-imac.sourceforge.net/">
@@ -301,7 +302,7 @@
    "http://hyperarchive.lcs.mit.edu/HyperArchive/Archive/cmp/suntar-223.hqx">
 
 <!ENTITY url-powerpc-creator-changer 
-   "ftp://uiarchive.uiuc.edu/mirrors/ftp/ftp.info-mac.org/info-mac/disk/creator-changer-284.hqx">
+   "http://www.gryphel.com/c/sw/sysutils/crtrchng/">
 
 <!ENTITY url-powerpc-diskcopy 
    "http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Macintosh/Utilities/Disk_Copy/Disk_Copy_6.3.3.smi.bin">
diff --git a/debian/changelog b/debian/changelog
index 58adb68f3..75f974f49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ installation-guide (2012XXXX) UNRELEASED; urgency=low
   [ Samuel Thibault ]
   * Update lowmem values.
   * Fix po detection.
+  * Fix bogus URLs, thanks Brian Potkin for the hint. Closes: #692310.
 
  -- Samuel Thibault <sthibault@debian.org>  Thu, 01 Nov 2012 09:08:18 +0100
 
-- 
cgit v1.2.3