[lintian] 01/02: Update locations of Contents-<arch> files; they are now namespaced by distribution (eg. "main").
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 6b282f88def69fe1c4ccdd7f8ea6b0e2d2e5f7d5
Author: Chris Lamb <lamby@debian.org>
Date: Wed Sep 20 08:53:14 2017 +0100
Update locations of Contents-<arch> files; they are now namespaced by distribution (eg. "main").
---
debian/changelog | 2 ++
private/refresh-debhelper-data | 2 +-
private/refresh-fonts-data | 2 +-
private/refresh-insserv-data | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 661fbb5..2e55e24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -179,6 +179,8 @@ lintian (2.5.53) UNRELEASED; urgency=medium
* private/refresh-*:
+ [CL] Use deb.debian.org as the default mirror.
+ + [CL] Update locations of Contents-<arch> files; they are now namespaced
+ by distribution (eg. "main").
-- Niels Thykier <niels@thykier.net> Sun, 23 Jul 2017 10:16:35 +0000
diff --git a/private/refresh-debhelper-data b/private/refresh-debhelper-data
index 62823d0..8cc1515 100755
--- a/private/refresh-debhelper-data
+++ b/private/refresh-debhelper-data
@@ -33,7 +33,7 @@ If the Contents file is not specified, the script will download the following
files from a mirror (which should be specified via the DEB_MIRROR env var,
which defaults to http://deb.debian.org/debian and is used directly
without any kind of parsing so one can play with it):
-* Contents-i386.gz, main/binary-i386/Packages.gz
+* main/Contents-i386.gz, main/binary-i386/Packages.gz
* Binary packages found at Contents shipping dh_ commands
Any special parameter can be passed to wget via WGET_ARGS, if needed.
diff --git a/private/refresh-fonts-data b/private/refresh-fonts-data
index d4cedba..381c4d7 100755
--- a/private/refresh-fonts-data
+++ b/private/refresh-fonts-data
@@ -76,7 +76,7 @@ cat > "$workdir/fonts" <<EOF
EOF
if [ -z "$contents" ] ; then
- wget dists/sid/Contents-i386.gz
+ wget dists/sid/main/Contents-i386.gz
contents="$workdir/Contents-i386.gz"
fi
zcat "$contents" \
diff --git a/private/refresh-insserv-data b/private/refresh-insserv-data
index fa72b59..3b15818 100755
--- a/private/refresh-insserv-data
+++ b/private/refresh-insserv-data
@@ -29,7 +29,7 @@ The script downloads the following files from a mirror (which should be
specified via the DEB_MIRROR env var, which defaults to
http://deb.debian.org/debian and is used directly without any
kind of parsing so one can play with it):
-* Contents-i386.gz, main/binary-i386/Packages.gz
+* main/Contents-i386.gz, main/binary-i386/Packages.gz
* Binary packages found at Contents shipping insserv.conf.d files
Any special parameter can be passed to wget via WGET_ARGS, if needed.
@@ -71,7 +71,7 @@ wget() {
mkdir -p "$lintian_data/init.d"
cd "$workdir"
-wget dists/sid/Contents-i386.gz
+wget dists/sid/main/Contents-i386.gz
zgrep -E "$regex" Contents-i386.gz > entries
cat entries \
| perl -p -w -E 's#'"$perl_regex"'#$1#g;' \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: