diff options
| author | dancer <dancer> | 2004-09-12 22:45:00 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2004-09-12 22:45:00 +0000 |
| commit | f83b50584406bd84a38551b96d0977295e96711e (patch) | |
| tree | 571b5d59a6a5fcbf81a23d413970dca0add29a65 | |
| parent | c1f772afee09ff84fe0384c683b8ada314231c28 (diff) | |
| download | pbuilder-f83b50584406bd84a38551b96d0977295e96711e.tar pbuilder-f83b50584406bd84a38551b96d0977295e96711e.tar.gz | |
gah.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | pbuilder-modules | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2004-09-13 Junichi Uekawa <dancer@debian.org> + + * pbuilder-modules (pbuilder-options): remove non-free and contrib from non-us. + 2004-08-12 Junichi Uekawa <dancer@debian.org> * pbuildd/remote-buildd.sh: files from 'compiler' distributed pbuilder setup diff --git a/debian/changelog b/debian/changelog index c1aa523..e89a7bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pbuilder (0.115) unstable; urgency=low + + * remove non-free and non-us from contrib. (closes: #271329) + + -- Junichi Uekawa <dancer@debian.org> Mon, 13 Sep 2004 07:41:30 +0900 + pbuilder (0.114) unstable; urgency=low * pbuildd.sh: Apply patches from Roland Stigge (closes: #263987, #264182, #264182) diff --git a/pbuilder-modules b/pbuilder-modules index 81cbbd2..bd6b190 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -230,8 +230,8 @@ EOF fi if [ -n "$NONUSMIRRORSITE" ]; then cat >> "$BUILDPLACE"/etc/apt/sources.list << EOF -deb $NONUSMIRRORSITE $DISTRIBUTION/non-US main contrib non-free -#deb-src $NONUSMIRRORSITE $DISTRIBUTION/non-US main contrib non-free +deb $NONUSMIRRORSITE $DISTRIBUTION/non-US main +#deb-src $NONUSMIRRORSITE $DISTRIBUTION/non-US main EOF fi if [ -n "$APTCONFDIR" ]; then |