From: Philipp Kern <pkern@debian.org>
Date: Sat, 13 Sep 2008 14:40:02 +0000 (+0000)
Subject: Merge branch 'master' of /srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=bdc67f9ca8905fe83d7c2c8c1dd7a41bcd1801ce;hp=a6dbdaaf2281e70a1ccf28af8b673ab9db2a7574;p=dak.git

Merge branch 'master' of /srv/ftp.debian.org/git/dak

Conflicts:

	ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index f0837bda..7d3a7ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
 	oldstable-security/amd64 check; Etch, as the next oldstable,
 	already had proper amd64 support
 
+2008-09-12  Joerg Jaspert  <joerg@debian.org>
+
+	* scripts/debian/update-pseudopackages.sh: s/i/file/
+
 2008-09-11  Joerg Jaspert  <joerg@debian.org>
 
 	* config/debian/pseudo-packages.description, ...maintainers:
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index ee77eb71..de44fe5f 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -70,7 +70,7 @@ cd $configdir
 $scriptsdir/update-bugdoctxt
 $scriptsdir/update-mirrorlists
 $scriptsdir/update-mailingliststxt
-$scriptsdir/update-pseudopackages
+$scriptsdir/update-pseudopackages.sh
 
 ################################################################################
 
diff --git a/scripts/debian/update-pseudopackages.sh b/scripts/debian/update-pseudopackages.sh
index f1984dab..cabfc3a5 100755
--- a/scripts/debian/update-pseudopackages.sh
+++ b/scripts/debian/update-pseudopackages.sh
@@ -9,5 +9,5 @@ cd ${scriptdir}/masterdir
 
 echo Updating archive version of pseudo-packages
 for file in maintainers description; do
-	wget -t2 -T20 -q -N http://bugs.debian.org/pseudopackages/pseudo-packages.${file} || echo "Some error occured with $i..."
+	wget -t2 -T20 -q -N http://bugs.debian.org/pseudopackages/pseudo-packages.${file} || echo "Some error occured with $file..."
 done