diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-06 14:19:02 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-06 14:19:02 +0100 |
| commit | bc435af429f427c6a5db971c3d4cc7f15a2fe55d (patch) | |
| tree | bffced0651ae359229ac6b33a6f49a1b72faefe3 | |
| parent | 44633bd7cac1ce68d4e475285a0f45b7a8952a7f (diff) | |
| parent | 7d15eeef6e61d9a02efcad2dc704f22df4276d9b (diff) | |
Merge branch 'debian/sid' into ubuntu/master
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | vendor/debian/makefile | 2 | ||||
| -rw-r--r-- | vendor/ubuntu/makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 90f2b40f7..b97bc268e 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -528,7 +528,7 @@ terminal window when packages are installed, upgraded or removed. For a machine parsable version of this data see README.progress-reporting in the apt doc directory. - <literal>DpkgPM::Progress</literal>.</para></listitem> + Configuration Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</literal>.</para></listitem> </varlistentry> diff --git a/vendor/debian/makefile b/vendor/debian/makefile index dd35a70f0..42c86e1c4 100644 --- a/vendor/debian/makefile +++ b/vendor/debian/makefile @@ -5,7 +5,7 @@ SUBDIR=vendor/debian # Bring in the default rules include ../../buildlib/defaults.mak -doc: sources.list +doc binary: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index ea67e6e63..88061bde2 100644 --- a/vendor/ubuntu/makefile +++ b/vendor/ubuntu/makefile @@ -5,7 +5,7 @@ SUBDIR=vendor/ubuntu # Bring in the default rules include ../../buildlib/defaults.mak -doc: sources.list +doc binary: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ |