aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2006-02-22 15:23:33 +0000
committerdancer <dancer>2006-02-22 15:23:33 +0000
commit0986599b475c7e6022d417c0c632f5f3be80132a (patch)
tree7d1334e22b65072a00e461c22b378215b20390ee
parentf3a31e42bee44bf0471e08613fa0729486705bed (diff)
downloadpbuilder-0986599b475c7e6022d417c0c632f5f3be80132a.tar
pbuilder-0986599b475c7e6022d417c0c632f5f3be80132a.tar.gz
remove support for --nonusmirror.
-rw-r--r--ChangeLog13
-rw-r--r--debian/changelog4
-rwxr-xr-xpbuilder-checkparams4
-rw-r--r--pbuilder-modules7
-rw-r--r--pbuilder-uml-checkparams2
-rw-r--r--pbuilder-user-mode-linux.19
-rw-r--r--pbuilder.89
-rwxr-xr-xpbuilderrc1
-rw-r--r--pbuilderrc.510
9 files changed, 19 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog
index a64b31f..509a5e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2006-02-23 Junichi Uekawa <dancer@debian.org>
+ * pbuilder-modules (pbuilder-options): remove NONUSMIRRORSITE
+
+ * pbuilder.8:
+ * pbuilder-user-mode-linux.1: remove --nonusmirror
+
+ * pbuilder-uml-checkparams: remove --nonusmirror
+
+ * pbuilder-checkparams: remove --nonusmirror
+
+ * pbuilder-modules (pbuilder-options): remove reference to --nonusmirror [non-US mirror location] option.
+
+ * pbuilderrc (MIRRORSITE): remove non-US
+
* testsuite/regression/344089-initscripts-inetd-workaround-check.sh: remove, bugs are all resolved.
2006-02-12 Junichi Uekawa <dancer@debian.org>
diff --git a/debian/changelog b/debian/changelog
index c970bce..2c93fa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
pbuilder (0.149) UNRELEASED; urgency=low
- *
+ * Remove references to non-US, since it's empty in sarge. (Closes: #330108).
- -- Junichi Uekawa <dancer@debian.org> Sat, 18 Feb 2006 13:38:24 +0900
+ -- Junichi Uekawa <dancer@debian.org> Thu, 23 Feb 2006 00:21:36 +0900
pbuilder (0.148) unstable; urgency=low
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 138dc4f..34fdccb 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -63,10 +63,6 @@ while [ -n "$1" ]; do
MIRRORSITE="$2";
shift; shift;
;;
- --nonusmirror)
- NONUSMIRRORSITE="$2";
- shift; shift;
- ;;
--othermirror)
OTHERMIRROR="$2";
shift; shift;
diff --git a/pbuilder-modules b/pbuilder-modules
index 45ce903..cb2d94d 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -50,7 +50,6 @@ pbuilder-options:
--basetgz [base.tgz location]
--buildplace [location of build]
--mirror [mirror location]
- --nonusmirror [non-US mirror location]
--othermirror [other mirror location in apt deb-line format, delimited with | signs]
--http-proxy [proxy]
--distribution [distribution(potato|woody|sarge|sid|etch|experimental)]
@@ -236,12 +235,6 @@ deb $MIRRORSITE $DISTRIBUTION main
#deb-src $MIRRORSITE $DISTRIBUTION main
EOF
fi
- if [ -n "$NONUSMIRRORSITE" ]; then
- cat >> "$BUILDPLACE"/etc/apt/sources.list << EOF
-deb $NONUSMIRRORSITE $DISTRIBUTION/non-US main
-#deb-src $NONUSMIRRORSITE $DISTRIBUTION/non-US main
-EOF
- fi
if [ -n "$APTCONFDIR" ]; then
echo " -> Copy " "$APTCONFDIR"/* " to chroot"
cp -a "$APTCONFDIR/"* "$BUILDPLACE"/etc/apt
diff --git a/pbuilder-uml-checkparams b/pbuilder-uml-checkparams
index c361247..7bc532d 100644
--- a/pbuilder-uml-checkparams
+++ b/pbuilder-uml-checkparams
@@ -96,7 +96,7 @@ while [ -n "$1" ] ; do
. "$2"
shift; shift;;
#things that can be passed through with options
- --timeout|--http-proxy|--hookdir|--aptconfdir|--bindmounts|--mirror|--nonusmirror|--othermirror)
+ --timeout|--http-proxy|--hookdir|--aptconfdir|--bindmounts|--mirror|--othermirror)
UML_EXTRAOPT="${UML_EXTRAOPT} $1 $2"
shift; shift;;
--buildresult)
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index f27a368..29c0d23 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -202,11 +202,6 @@ the chroot, and specifying
will most probably fail.
.TP
-.BI "\-\-nonusmirror [" "mirror location" "]"
-The non-US mirror, specified like the
-.B "\-\-mirror"
-option
-.TP
.BI "\-\-othermirror [" "deb http://xxx/xxx/ ./ " "|" " other deb lines... " "]"
The lines which is added to the sources.list, delimited with
.B "|"
@@ -223,9 +218,7 @@ constructed sources file, so this is the place to list your
.B "local"
mirror sites; apt will then use them in preference to the ones
listed in
-.B "\-\-mirror"
-and
-.B "\-\-nonusmirror".
+.B "\-\-mirror".
These options are only valid when
.B "\-\-override\-config"
diff --git a/pbuilder.8 b/pbuilder.8
index 86b5d69..9e4455b 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -157,11 +157,6 @@ the chroot, and specifying
will most probably fail.
.TP
-.BI "\-\-nonusmirror [" "mirror location" "]"
-The non-US mirror, specified like the
-.B "\-\-mirror"
-option
-.TP
.BI "\-\-othermirror [" "deb http://xxx/xxx/ ./ " "|" " other deb lines... " "]"
The lines which is added to the sources.list, delimited with
.B "|"
@@ -178,9 +173,7 @@ constructed sources file, so this is the place to list your
.B "local"
mirror sites; apt will then use them in preference to the ones
listed in
-.B "\-\-mirror"
-and
-.B "\-\-nonusmirror".
+.B "\-\-mirror".
These options are only valid when
.B "\-\-override\-config"
diff --git a/pbuilderrc b/pbuilderrc
index 681bacc..c6116ec 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -9,7 +9,6 @@ BASETGZ=/var/cache/pbuilder/base.tgz
#export DEBIAN_BUILDARCH=athlon
BUILDPLACE=/var/cache/pbuilder/build/
MIRRORSITE=http://ftp.jp.debian.org/debian
-#NONUSMIRRORSITE="http://ftp.jp.debian.org/debian-non-US"
#OTHERMIRROR="deb http://www.home.com/updates/ ./"
#export http_proxy=http://your-proxy:8080/
USEPROC=yes
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index af105a3..ebdc8a4 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -60,12 +60,6 @@ kind of URL, because the location needs to be accessible from within
the chroot.
.TP
-.BI "NONUSMIRRORSITE=" "http://www.jp.debian.org/debian-non-US"
-Specify the mirror site which contains
-.B "non-US"
-distribution.
-
-.TP
.BI "OTHERMIRROR=" "deb http://xxx/xxx/ ./ " "[|" " other deb lines... " "]"
The lines which is added to the sources.list, delimited with
.B "|"
@@ -82,9 +76,7 @@ constructed sources file, so this is the place to list your
.B "local"
mirror sites; apt will then use them in preference to the ones
listed in
-.B "MIRRORSITE"
-and
-.B "NONUSMIRRORSITE".
+.B "MIRRORSITE".
To make changes on mirror site effective on
.B update