diff options
author | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
commit | 44633bd7cac1ce68d4e475285a0f45b7a8952a7f (patch) | |
tree | 3e3af83bb955b9f49f38239d490b5173bb0b9ac4 /vendor/ubuntu/makefile | |
parent | b10b0c4aac5d0648125d4203eea6900032efb7ba (diff) | |
parent | 7014e1482942d00b66eb30061b0cf5d2a7b3ebf3 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
cmdline/apt-key.in
debian/control
doc/apt-key.8.xml
doc/makefile
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
Diffstat (limited to 'vendor/ubuntu/makefile')
-rw-r--r-- | vendor/ubuntu/makefile | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile new file mode 100644 index 000000000..ea67e6e63 --- /dev/null +++ b/vendor/ubuntu/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/ubuntu + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ |