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

Conflicts:

	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f0837bda54b74365eeeb9802e3788349ac9e74ba..7d3a7ddf26f8f08debe599f510315d9446ac6bdc 100644 (file)
--- 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 ee77eb7180706fb5c7fc2e8f1276e5629117749f..de44fe5f05ac7e98e4a1e30a9c1bc6be19a68a05 100755 (executable)
--- 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 f1984dab7dac78bebb01f94b4feaff9b83f24bf5..cabfc3a51e21fe83db46dce5118de946c735c7cb 100755 (executable)
--- 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