diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-12 08:36:58 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-12 08:36:58 +0200 |
| commit | cfc7f735774ba30dbee1897248f8dfedf0229a4c (patch) | |
| tree | b4e0ac29a6b398045a803e890f5cdabcca189d6a /vendor/tanglu | |
| parent | a0187f0f82a184b850b05b62e5a59b6a2055a506 (diff) | |
| parent | 7701680af12a2c1a65121533c6ebcd635c013c25 (diff) | |
Merge tag '1.0.1ubuntu2' into ubuntu/trusty
Conflicts:
configure.ac
debian/changelog
debian/control
test/integration/framework
Diffstat (limited to 'vendor/tanglu')
| -rw-r--r-- | vendor/tanglu/apt-vendor.ent | 1 | ||||
| -rw-r--r-- | vendor/tanglu/makefile | 16 | ||||
| -rw-r--r-- | vendor/tanglu/sources.list.in | 8 |
3 files changed, 5 insertions, 20 deletions
diff --git a/vendor/tanglu/apt-vendor.ent b/vendor/tanglu/apt-vendor.ent index 4b70a5f82..d2442209c 100644 --- a/vendor/tanglu/apt-vendor.ent +++ b/vendor/tanglu/apt-vendor.ent @@ -5,3 +5,4 @@ <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/tanglu-archive-removed-keys.gpg</filename>"> <!ENTITY keyring-master-filename ""> <!ENTITY keyring-uri ""> +<!ENTITY current-codename "bartholomea"> diff --git a/vendor/tanglu/makefile b/vendor/tanglu/makefile deleted file mode 100644 index 9fe680bc6..000000000 --- a/vendor/tanglu/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=vendor/tanglu - -# Bring in the default rules -include ../../buildlib/defaults.mak - -doc binary manpages: sources.list - -sources.list: sources.list.in ../../doc/apt-verbatim.ent - sed -e 's#&tanglu-codename;#$(shell ../getinfo tanglu-codename)#g' $< > $@ - -clean: clean/sources.list - -clean/sources.list: - rm -f sources.list diff --git a/vendor/tanglu/sources.list.in b/vendor/tanglu/sources.list.in index dfa219046..ce95e70c2 100644 --- a/vendor/tanglu/sources.list.in +++ b/vendor/tanglu/sources.list.in @@ -1,7 +1,7 @@ # See sources.list(5) manpage for more information -deb http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free -#deb-src http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free +deb http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free +#deb-src http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free -#deb http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free -#deb-src http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free +#deb http://archive.tanglu.org/tanglu ¤t-codename;-updates main contrib non-free +#deb-src http://archive.tanglu.org/tanglu ¤t-codename;-updates main contrib non-free |