summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-07-14 13:02:52 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2007-07-14 13:02:52 -0300
commit29925560efccf3f5801a122f6061e2cf2046c955 (patch)
treeef59a50db5c46eeff6338db285e158bfe01f2b64 /debian
parent4ac3c092c5c59476ec1ed34a93dffecdf816fae5 (diff)
parente53ee4caf5ecf882e3df2665a8e1c2a9e6da6fb0 (diff)
Merge fixes branch.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog29
-rwxr-xr-xdebian/rules2
2 files changed, 29 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 898092652..f618b84df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,33 @@
+apt (0.7.4) UNRELEASED; urgency=low
+
+ [Michael Vogt]
+ * cmdline/apt-get.cc:
+ - fix in the task-install code regexp (thanks to Adam Conrad and
+ Colin Watson)
+
+ [Otavio Salvador]
+ * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
+ * Fix compilation warnings:
+ - apt-pkg/contrib/configuration.cc: wrong argument type;
+ - apt-pkg/deb/dpkgpm.cc: wrong signess;
+ - apt-pkg-acquire-item.cc: wrong signess and orderned initializers;
+ - methods/https.cc:
+ - type conversion;
+ - unused variable;
+ - changed SetupProxy() method to void;
+ * Simplified HttpMethod::Fetch on http.cc removing Tail variable;
+ * Fix pipeline handling on http.cc (closes: #413324)
+ * Fix building to properly support binNMUs. Thanks to Daniel Schepler
+ <schepler@math.unipd.it> by the patch (closes: #359634)
+ * Fix example for Install-{Recommends,Suggests} options on
+ configure-index example file. Thanks to Peter Eisentraut
+ <peter_e@gmx.net> by the patch (closes: #432223)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Jul 2007 23:20:15 +0100
+
apt (0.7.3) unstable; urgency=low
- * fixed compile errors with g++ 7.3 (thanks to
+ * fixed compile errors with g++ 4.3 (thanks to
Daniel Burrows, closes: #429378)
* fixes in the auto-mark code (thanks to Daniel
Burrows)
diff --git a/debian/rules b/debian/rules
index 3ebecfba4..473821f16 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' -e 's/\+.*$$//')
+APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -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')