diff options
author | Michael Vogt <mvo@debian.org> | 2013-08-17 10:07:20 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-08-17 10:07:20 +0200 |
commit | 1afd369d00f2f9272462ffc6c6e24f293a81459e (patch) | |
tree | c29c1671aceaf9055b6c89d1befab91fe375c32a /debian/rules | |
parent | 43ffe2d15bfff049d1ffe10c7696c008495f5912 (diff) | |
parent | b44c98f9d80ac59f6602e16e6aedd3a8f9f9485a (diff) |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
cmdline/apt-get.cc
debian/changelog
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index fc44d5a68..06ccdac31 100755 --- a/debian/rules +++ b/debian/rules @@ -115,7 +115,7 @@ clean: [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ - debian/libapt-pkg-dev.install + debian/libapt-pkg-dev.install debian/apt.install test ! -L buildlib/config.guess || rm -f buildlib/config.guess test ! -L buildlib/config.sub || rm -f buildlib/config.sub @@ -174,7 +174,7 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build-binary build-manpages +apt: build-binary build-manpages debian/apt.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ |