diff options
| author | Michael Vogt <egon@bottom> | 2006-09-30 16:18:09 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-09-30 16:18:09 +0200 |
| commit | dd2fdae926c586c6e19ec7d66cc0cb18932d7036 (patch) | |
| tree | 74b5adfb68810f491c5ec53d029292bd9882b569 /debian | |
| parent | b3b73d89b698cba8e91b0e6c0807afecc6191a98 (diff) | |
| parent | 47e6f3ac05262f452eddbb59657cfc2465b5c62e (diff) | |
* merged from mainline
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6c0507e1d..88eb14871 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +apt (0.6.46.1) unstable; urgency=low + + * methods/gzip.cc: + - deal with empty files + * Applied patch from Daniel Schepler to make apt bin-NMU able. + (closes: bug#359634) + * rebuild against current g++ because of: + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289 + (closes: #390189) + * fix broken i18n in the dpkg progress reporting, thanks to + Frans Pop and Steinar Gunderson. (closes: #389261) + * Merged from Christian Perrier bzr branch: + * fi.po: Updated to 514t. Closes: #390149 + * eu.po: Updated to 514t. Closes: #389725 + * vi.po: Updated to 514t. Closes: #388555 + + -- + apt (0.6.46) unstable; urgency=low * debian/control: diff --git a/debian/rules b/debian/rules index a8bf88762..02ee734bb 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ build: PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) -APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') +APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' -e 's/\+.*$$//') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') |