diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-03-25 08:56:42 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-03-25 08:56:42 +0100 |
| commit | 2f8f21c3d494328f0b4a544998fc6118b25b56c3 (patch) | |
| tree | bbeff3ce772d3b77893ce5ffa3260bdd95550644 /debian | |
| parent | c510253888191fe9537559ad2fdd982dc3fd89eb (diff) | |
merge patches from daniel to fix merge artifact and test failure
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index fbc6009a1..558b657ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low * cmdline/apt-get.cc: - do not have space between "-a" and option when cross building (closes: #703792) + * test/integration/test-apt-get-download: + - fix test now that #1098752 is fixed + * po/{ca,cs,ru}.po: + - fix merge artifact -- Christian Perrier <bubulle@debian.org> Sun, 24 Mar 2013 08:57:45 +0100 diff --git a/debian/control b/debian/control index 50b3599fc..762d2818e 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-wheezy/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-wheezy/ +Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ +Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any |