summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildlib/archtable1
-rw-r--r--configure.in2
-rw-r--r--debian/changelog21
-rwxr-xr-xdebian/rules2
-rw-r--r--methods/ftp.cc3
-rw-r--r--po/apt-all.pot52
6 files changed, 52 insertions, 29 deletions
diff --git a/buildlib/archtable b/buildlib/archtable
index c0592db55..b01743c02 100644
--- a/buildlib/archtable
+++ b/buildlib/archtable
@@ -14,6 +14,7 @@ m68k m68k
arm.* arm
powerpc powerpc
ppc powerpc
+powerpc64 ppc64
mipsel mipsel
mipseb mips
mips mips
diff --git a/configure.in b/configure.in
index b46decc11..da10634a3 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.27ubuntu4")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.30")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 421914b36..ae7bee192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+apt (0.6.30) unstable; urgency=low
+
+ * Add ppc64 to buildlib/archtable
+
+ -- Michael Vogt <mvo@debian.org> Tue, 11 Jan 2005 12:30:27 +0100
+
+apt (0.6.29) hoary; urgency=low
+
+ * Merge apt--mvo--0 (0.6.27ubuntu4)
+
+
+ -- Matt Zimmerman <mdz@canonical.com> Tue, 28 Dec 2004 17:18:02 -0800
+
+apt (0.6.28) hoary; urgency=low
+
+ * Merge apt--mvo--0
+ * Rebuild source to get rid of arch metadata and temporary files in
+ 0.6.27ubuntu3
+
+ -- Matt Zimmerman <mdz@canonical.com> Thu, 23 Dec 2004 18:53:16 -0800
+
apt (0.6.27ubuntu4) hoary; urgency=low
* remove old sig-file in partial/ before starting to fetch a new sig-file
diff --git a/debian/rules b/debian/rules
index b756b3b32..71d6d549e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ endif
# Default rule
build:
-DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
+DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEBUILD_DPKG_BUILDPACKAGE_OPTS)
APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
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')
diff --git a/methods/ftp.cc b/methods/ftp.cc
index fafa10534..00d3476c8 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1098,7 +1098,8 @@ int main(int argc,const char *argv[])
char S[300];
snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
putenv(S);
- putenv("no_proxy=");
+ //mvo: why should we unset no_proxy here?
+ //putenv("no_proxy=");
// Run the http method
string Path = flNotFile(argv[0]) + "http";
diff --git a/po/apt-all.pot b/po/apt-all.pot
index dfafb2c4f..2acd6ae34 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-23 12:36+0100\n"
+"POT-Creation-Date: 2005-01-11 12:39+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1561,7 +1561,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:951 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1584,7 +1584,7 @@ msgstr ""
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1107
msgid "Unable to invoke "
msgstr ""
@@ -1655,76 +1655,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:490
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:498
+#: methods/http.cc:533
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:552 methods/http.cc:559
msgid "The http server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:553
+#: methods/http.cc:588
msgid "The http server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:568
+#: methods/http.cc:603
msgid "The http server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:570
+#: methods/http.cc:605
msgid "This http server has broken range support"
msgstr ""
-#: methods/http.cc:594
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:737
+#: methods/http.cc:772
msgid "Select failed"
msgstr ""
-#: methods/http.cc:742
+#: methods/http.cc:777
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:765
+#: methods/http.cc:800
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:828
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:818
+#: methods/http.cc:853
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:867
msgid "Error reading from server Remote end closed connection"
msgstr ""
-#: methods/http.cc:834
+#: methods/http.cc:869
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1065
+#: methods/http.cc:1100
msgid "Bad header Data"
msgstr ""
-#: methods/http.cc:1082
+#: methods/http.cc:1117
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1173
+#: methods/http.cc:1208
msgid "Internal error"
msgstr ""
@@ -2259,31 +2259,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:897
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:711
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:764
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:800
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:887
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr ""