Import Debian changes 0.7.2-2

jigdo (0.7.2-2) unstable; urgency=high

  * High-urgency upload for RC bugfix.
  * Closes: #319327: jigdo_0.7.2-1: FTBFS (alpha/unstable):
    C++ prototype mismatch on 64-bit systems
    Thanks to Steve Langasek for the good work.
  * Build with gcc-3.4, not 4.0 due to problems on some arches
    (see #319327)

diff --git a/debian/changelog b/debian/changelog
index bf921d0..641c9d3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jigdo (0.7.2-2) unstable; urgency=high
+
+  * High-urgency upload for RC bugfix.
+  * Closes: #319327: jigdo_0.7.2-1: FTBFS (alpha/unstable):
+    C++ prototype mismatch on 64-bit systems
+    Thanks to Steve Langasek for the good work.
+  * Build with gcc-3.4, not 4.0 due to problems on some arches
+    (see #319327)
+
+ -- Richard Atterer <atterer@debian.org>  Thu, 21 Jul 2005 13:35:38 +0200
+
 jigdo (0.7.2-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/control b/debian/control
index 01bccb6..eee996f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: jigdo
 Section: utils
 Priority: extra
 Maintainer: Richard Atterer <atterer@debian.org>
-Build-Depends: debhelper (>= 4), zlib1g-dev, libbz2-dev, libdb4.3-dev | libdb4.2-dev | libdb4-dev, libgtk2.0-dev, libcurl3-dev | libcurl2-dev
+Build-Depends: debhelper (>= 4), zlib1g-dev, libbz2-dev, libdb4.3-dev | libdb4.2-dev | libdb4-dev, libgtk2.0-dev, libcurl3-dev | libcurl2-dev, g++-3.4
 Standards-Version: 3.5.6
 
 Package: jigdo

diff --git a/debian/rules b/debian/rules
index dc1417a..a328fbc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,8 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       ./configure --prefix=/usr --with-gui --enable-nls \
+       CC=gcc-3.4 CXX=g++-3.4 \
+           ./configure --prefix=/usr --with-gui --enable-nls \
            --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
        touch configure-stamp
 

diff --git a/src/cachefile.cc b/src/cachefile.cc
index a596519..1609c87 100644 (file)
--- a/src/cachefile.cc
+++ b/src/cachefile.cc
@@ -131,7 +131,7 @@ Status CacheFile::find(const byte*& resultData, size_t& resultSize,
 //________________________________________
 
 Status CacheFile::findName(const byte*& resultData, size_t& resultSize,
-    const string& fileName, long long int& resultFileSize,
+    const string& fileName, off_t& resultFileSize,
     time_t& resultMtime) {
   DBT key; memset(&key, 0, sizeof(DBT));
   key.data = const_cast<char*>(fileName.c_str());

diff --git a/src/cachefile.hh b/src/cachefile.hh
index e914e7e..800b0d4 100644 (file)
--- a/src/cachefile.hh
+++ b/src/cachefile.hh
@@ -94,7 +94,7 @@ public:
       only valid until the next database operation. */
   Status findName(const byte*& resultData, size_t& resultSize,
                   const string& fileName,
-                  long long int& resultFileSize, time_t& resultMtime);
+                  off_t& resultFileSize, time_t& resultMtime);
 
   /** Insert/overwrite entry for the given file (name must be
       absolute, file must have the supplied mtime and size). The data