* apt-pkg/acquire.cc:

  - increase MaxPipeDepth for the internal worker<->method
    communication to 1000 for the debtorrent backend
* make apt build with g++ 4.3
* apt-pkg/acquire.cc:
  - increase MaxPipeDepth for the internal worker<->method
    communication to 1000 for the debtorrent backend
* make apt build with g++ 4.3
* dpkg-triggers: Deal properly with new package states.

diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 86766254f69003bb75c59dcbb4c55d81342915cd..c74a310e47c29d1b21aed6703019edcfff897dcf 100644 (file)
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -29,7 +29,7 @@
 #define PKGLIB_FILELIST_H
 
 
-
+#include <cstring>
 #include <apt-pkg/mmap.h>
 
 class pkgFLCache

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index cbd67055d952a37de89027a85804764869f9a5b8..6840ae120c4c9edd0a66043a0791aad1a05f6b16 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -619,7 +619,7 @@ bool pkgAcquire::Queue::Startup()
          added other source retry to have cycle maintain a pipeline depth
          on its own. */
       if (Cnf->Pipeline == true)
-        MaxPipeDepth = 10;
+        MaxPipeDepth = 1000;
       else
         MaxPipeDepth = 1;
    }

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8c2d6cb19a8a33ae3427dbfe87d68f8f117f0ea9..db8c53c36042342bf515405d9e0a668906b064ba 100644 (file)
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -19,10 +19,12 @@
 #include <iostream>
 #include <errno.h>
 #include <stdio.h>
-#include <string>
 #include <stdarg.h>
 #include <unistd.h>
 
+#include <string>
+#include <cstring>
+
 #include "config.h"
                                                                        /*}}}*/
 

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d19a92e62cc107b44bb1e103dca047cba0dd74af..9e13b4f60d05ebd916b15d958e095b2f941325cc 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -22,6 +22,8 @@
 #include <apti18n.h>
 
 #include <cstdlib>
+#include <cstring>
+
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 93e7b25d96777d3f42501c19f30d9d2a3a5da79f..264f7fe904434d2cd2dd995311405cda3d6f9291 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <vector>
+#include <cstring>
 
 using std::min;
 using std::vector;

diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 44242371a3201a0754e7d7d3b42abd9966fd1e52..a095f8f0fbebf2ba71da0d0d3c0380c9d755e1d6 100644 (file)
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -44,6 +44,7 @@
 #include <inttypes.h>
 #include <config.h>
 #include <system.h>
+
                                                                        /*}}}*/
 
 // byteSwap - Swap bytes in a buffer                                   /*{{{*/

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 247b3fab936c28229071f2810d46956a325b5607..96c8975b46f6cc165b257f889bd1bb2f56ac5168 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -25,6 +25,7 @@
 
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 #include <stdint.h>
 

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 88e71e8e348074e5cb5cef1a09b9d69e043813eb..7f814c2d2a9b1e13c38e19e9c1d85aa2b64e6366 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -31,6 +31,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+
+#include <cstring>
                                                                        /*}}}*/
 
 // MMap::MMap - Constructor                                            /*{{{*/

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 6ce6e950a788a90d603ac693ac215113c8b43cb6..cffdddc4fe0d70a9f45e3fc5fadd3c73c7944168 100644 (file)
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <stdio.h>
+#include <cstring>
                                                                        /*}}}*/
 
 using namespace std;

diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 010ef802e642293a97e65f60df1e42a188f6bbff..8ddd889f18a22a70b2ac9015e4772fbc195ce3a1 100644 (file)
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -15,6 +15,7 @@
 #define APTPKG_SHA1_H
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 
 using std::string;

diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index c490bfa4df30cf348766f617470774013a9cdec3..1951f053bf1b15b8216dec13e4971fe45275f975 100644 (file)
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -15,6 +15,7 @@
 #define APTPKG_SHA256_H
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 
 using std::string;

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 8b4e6701ae93d5389ca21d5ea7666ac47785778f..7e1933f062f5da9f4562dbc65891a3f3a5f998a5 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -844,7 +844,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
         tv.tv_sec = 1;
         tv.tv_usec = 0;
         select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv);
-        if (select_ret == 0) 
+        if (select_ret == 0) 
            continue;
         else if (select_ret < 0 && errno == EINTR)
            continue;
@@ -853,7 +853,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
            perror("select() returned error");
            continue;
         } 
-
+        
         if(master >= 0 && FD_ISSET(master, &rfds))
            DoTerminalPty(master);
         if(master >= 0 && FD_ISSET(0, &rfds))

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index ca11fc11143e97ac2fed8324042800a839ba5aab..cf238eb4a4ea480ee0478ce4b8c951fe3ce87ce0 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -13,6 +13,7 @@
 #include <apt-pkg/error.h>
 
 #include <clocale>
+#include <cstring>
                                                                        /*}}}*/
 
 // Global list of Item supported

diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index eee19e35c265c2239bb23860883db80adf62b94c..6dd2d3ee4df348eab8e2e05c3f3d5beff22126be 100644 (file)
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -13,6 +13,7 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
 #include <cassert>
+#include <cstring>
                                                                        /*}}}*/
 
 pkgSystem *_system = 0;

diff --git a/configure.in b/configure.in
index 736706c0c5efbfa52ad7e56b07f93f9d3c038d9f..355129deaea12eeef1543f709514c29bf1bcbf1f 100644 (file)
--- 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.7.6ubuntu8")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu9")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index e34dc385b6f00b5af885dbeb4e8cdaab70b2e816..d60a61d27764297143ce4d652b43c1c22c202948 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ apt (0.7.6ubuntu9) gutsy; urgency=low
 
   * apt-pkg/deb/dpkgpm.cc:
     - fix progress reporting precent calculation (LP: #137798)
+  * apt-pkg/acquire.cc:
+    - increase MaxPipeDepth for the internal worker<->method
+      communication to 1000 for the debtorrent backend
+  * make apt build with g++ 4.3
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 10 Sep 2007 14:57:53 +0200
 
@@ -67,6 +71,7 @@ apt (0.7.6ubuntu2) gutsy; urgency=low
 
 apt (0.7.6ubuntu1) gutsy; urgency=low
 
+  [ Michael Vogt ]
   * apt-inst/contrib/extracttar.cc:
     - fix fd leak for zero size files (thanks to Bill Broadley for
       reporting this bug)
@@ -90,6 +95,13 @@ apt (0.7.6ubuntu1) gutsy; urgency=low
     - increase default mmap size
   * tests/local-repo:
     - added local repository testcase
+  * apt-pkg/acquire.cc:
+    - increase MaxPipeDepth for the internal worker<->method
+      communication to 1000 for the debtorrent backend
+  * make apt build with g++ 4.3
+
+  [ Ian Jackson ]
+  * dpkg-triggers: Deal properly with new package states.
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Aug 2007 11:55:54 +0200
 

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 59107e02bbc930aa7fd750a1141fa013f94ced66..9d248ab86f2a7f30878448a513fc486e904b1ba2 100644 (file)
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -28,6 +28,7 @@
 #include <ftw.h>
 #include <fnmatch.h>
 #include <iostream>
+#include <memory>
     
 #include "cachedb.h"
 #include "apt-ftparchive.h"

diff --git a/test/fake-status b/test/fake-status
index e1f5c1f3669079b98f70574c70c47d4e32e2e1b9..9e6366d5badf2ef8c944494699e08260c74827c4 100644 (file)
--- a/test/fake-status
+++ b/test/fake-status
@@ -4,7 +4,7 @@ Priority: optional
 Section: libs
 Installed-Size: 1376
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Architecture: amd64
+Architecture: all
 Source: glib2.0
 Version: 2.13.7-1ubuntu1
 Description: The GLib library of C routines

diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index 8131d891e38c84600abf34bf60fc3e1547c922ec..2199c598a1b1f1eb21e8e7220165806ae1cdb52c 100755 (executable)
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -15,7 +15,12 @@ apt_args = []  # ["-o","Debug::pkgAcquire::Auth=true"]
 
 
 class testAuthentication(unittest.TestCase):
-
+    """
+    test if the authentication is working, the repository
+    of the test-data can be found here:
+    bzr get http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/
+    """
+    
     # some class wide data
     apt = "apt-get"
     pkg = "libglib2.0-data"