diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-09-01 00:53:40 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-09-01 00:53:40 +0200 |
| commit | 265c3312bd1b329dc9b54c754da46621d9019c11 (patch) | |
| tree | e1c740747f84f793ee2b6ab4ffaffbc9f76cd575 /vendor | |
| parent | 28f0867d99398a23296ead313112402c51d4e876 (diff) | |
| parent | 317bb39f3cd6626c74f25d7bdf2907f1b235f553 (diff) | |
Merge tag '1.3_rc3' into ubuntu/master
apt Debian release 1.3~rc3
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/debian/apt-vendor.ent | 4 | ||||
| -rw-r--r-- | vendor/debian/sources.list.in | 2 | ||||
| -rwxr-xr-x | vendor/getinfo | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent index 8d5416ced..41484c42e 100644 --- a/vendor/debian/apt-vendor.ent +++ b/vendor/debian/apt-vendor.ent @@ -6,10 +6,10 @@ <!ENTITY keyring-master-filename ""> <!ENTITY keyring-uri ""> -<!ENTITY sourceslist-list-format "deb http://httpredir.debian.org/debian &debian-stable-codename; main contrib non-free +<!ENTITY sourceslist-list-format "deb http://deb.debian.org/debian &debian-stable-codename; main contrib non-free deb http://security.debian.org &debian-stable-codename;/updates main contrib non-free"> <!ENTITY sourceslist-sources-format "Types: deb -URIs: http://httpredir.debian.org/debian +URIs: http://deb.debian.org/debian Suites: &debian-stable-codename; Components: main contrib non-free diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in index 0fae88e5e..73a2ec9c4 100644 --- a/vendor/debian/sources.list.in +++ b/vendor/debian/sources.list.in @@ -3,5 +3,5 @@ &sourceslist-list-format; # Uncomment if you want the apt-get source function to work -#deb-src http://httpredir.debian.org/debian &debian-stable-codename; main contrib non-free +#deb-src http://deb.debian.org/debian &debian-stable-codename; main contrib non-free #deb-src http://security.debian.org &debian-stable-codename;/updates main contrib non-free diff --git a/vendor/getinfo b/vendor/getinfo index 37e0c1480..37eb74cef 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -6,7 +6,7 @@ BASEDIR="$(readlink -f "$(dirname $0)")" getcurrent() { # search for an exact match to use the correct sources.list example cd $BASEDIR - DISTROS="$(find -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2)" + DISTROS="$(find . -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2)" for DISTRO in $DISTROS; do if dpkg-vendor --is $DISTRO; then echo $DISTRO |