[Pbuilder-maint] pbuilder CVS update: pbuilder pbuilderrc.5
pbuilderrc pbuilder.8 pbuilder-user-mode-linux.1
pbuilder-uml-checkparams pbuilder-modules
pbuilder-checkparams ChangeLog
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Wed Feb 22 15:23:34 UTC 2006
User: dancer
Date: 06/02/22 15:23:34
Modified: . pbuilderrc.5 pbuilderrc pbuilder.8
pbuilder-user-mode-linux.1 pbuilder-uml-checkparams
pbuilder-modules pbuilder-checkparams ChangeLog
Log:
remove support for --nonusmirror.
Revision Changes Path
1.52 +1 -9 pbuilder/pbuilderrc.5
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5?annotate=1.52&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5?rev=1.52&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5.diff?r1=1.52&r2=1.51&cvsroot=
-----------------------------------
Index: pbuilderrc.5
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilderrc.5,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pbuilderrc.5 11 Feb 2006 13:17:04 -0000 1.51
+++ pbuilderrc.5 22 Feb 2006 15:23:34 -0000 1.52
@@ -60,12 +60,6 @@
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 @@
.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
1.39 +0 -1 pbuilder/pbuilderrc
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc?annotate=1.39&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc?rev=1.39&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.diff?r1=1.39&r2=1.38&cvsroot=
-----------------------------------
Index: pbuilderrc
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilderrc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pbuilderrc 5 Dec 2005 12:15:08 -0000 1.38
+++ pbuilderrc 22 Feb 2006 15:23:34 -0000 1.39
@@ -9,7 +9,6 @@
#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
1.50 +1 -8 pbuilder/pbuilder.8
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.8?annotate=1.50&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.8?rev=1.50&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.8.diff?r1=1.50&r2=1.49&cvsroot=
-----------------------------------
Index: pbuilder.8
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder.8,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pbuilder.8 29 Jan 2006 21:19:21 -0000 1.49
+++ pbuilder.8 22 Feb 2006 15:23:34 -0000 1.50
@@ -157,11 +157,6 @@
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 @@
.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"
1.26 +1 -8 pbuilder/pbuilder-user-mode-linux.1
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-user-mode-linux.1?annotate=1.26&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-user-mode-linux.1?rev=1.26&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-user-mode-linux.1.diff?r1=1.26&r2=1.25&cvsroot=
-----------------------------------
Index: pbuilder-user-mode-linux.1
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-user-mode-linux.1,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pbuilder-user-mode-linux.1 10 Jul 2005 13:00:56 -0000 1.25
+++ pbuilder-user-mode-linux.1 22 Feb 2006 15:23:34 -0000 1.26
@@ -202,11 +202,6 @@
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 @@
.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"
1.8 +1 -1 pbuilder/pbuilder-uml-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-uml-checkparams?annotate=1.8&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-uml-checkparams?rev=1.8&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-uml-checkparams.diff?r1=1.8&r2=1.7&cvsroot=
-----------------------------------
Index: pbuilder-uml-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-uml-checkparams,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pbuilder-uml-checkparams 21 Dec 2005 11:57:29 -0000 1.7
+++ pbuilder-uml-checkparams 22 Feb 2006 15:23:34 -0000 1.8
@@ -96,7 +96,7 @@
. "$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)
1.92 +0 -7 pbuilder/pbuilder-modules
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?annotate=1.92&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?rev=1.92&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules.diff?r1=1.92&r2=1.91&cvsroot=
-----------------------------------
Index: pbuilder-modules
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-modules,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- pbuilder-modules 12 Jan 2006 13:11:17 -0000 1.91
+++ pbuilder-modules 22 Feb 2006 15:23:34 -0000 1.92
@@ -50,7 +50,6 @@
--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-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
1.76 +0 -4 pbuilder/pbuilder-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-checkparams?annotate=1.76&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-checkparams?rev=1.76&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-checkparams.diff?r1=1.76&r2=1.75&cvsroot=
-----------------------------------
Index: pbuilder-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-checkparams,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- pbuilder-checkparams 21 Dec 2005 11:57:29 -0000 1.75
+++ pbuilder-checkparams 22 Feb 2006 15:23:34 -0000 1.76
@@ -63,10 +63,6 @@
MIRRORSITE="$2";
shift; shift;
;;
- --nonusmirror)
- NONUSMIRRORSITE="$2";
- shift; shift;
- ;;
--othermirror)
OTHERMIRROR="$2";
shift; shift;
1.369 +14 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.369&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.369&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.369&r2=1.368&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- ChangeLog 22 Feb 2006 15:14:37 -0000 1.368
+++ ChangeLog 22 Feb 2006 15:23:34 -0000 1.369
@@ -1,5 +1,18 @@
2006-02-23 Junichi Uekawa <dancer at 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 at debian.org>
More information about the Pbuilder-maint
mailing list