tags 667326 + patch tags 667326 + pending thanks Dear maintainer,
I've prepared an NMU for polygraph (versioned as 4.3.2-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru polygraph-4.3.2/debian/changelog polygraph-4.3.2/debian/changelog --- polygraph-4.3.2/debian/changelog 2011-04-05 17:35:20.000000000 +0200 +++ polygraph-4.3.2/debian/changelog 2012-05-11 11:28:09.000000000 +0200 @@ -1,3 +1,11 @@ +polygraph (4.3.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/10-fix-ftbfs-gcc-4.7.patch: Fix ftbfs with GCC-4.7 + (Closes: #667326). + + -- Mònica Ramírez Arceda <mon...@debian.org> Fri, 11 May 2012 11:27:05 +0200 + polygraph (4.3.2-1) unstable; urgency=low * New upstream bugfix release. Changes include: diff -Nru polygraph-4.3.2/debian/patches/10-fix-ftbfs-gcc-4.7.patch polygraph-4.3.2/debian/patches/10-fix-ftbfs-gcc-4.7.patch --- polygraph-4.3.2/debian/patches/10-fix-ftbfs-gcc-4.7.patch 1970-01-01 01:00:00.000000000 +0100 +++ polygraph-4.3.2/debian/patches/10-fix-ftbfs-gcc-4.7.patch 2012-05-11 11:41:38.000000000 +0200 @@ -0,0 +1,77 @@ +Description: Fix ftbfs with GCC-4.7. +Author: Mònica Ramírez Arceda <mon...@debian.org> +Bug-Debian: http://bugs.debian.org/667326 +Last-Update: 2012-05-11 + +--- a/src/xstd/Heap.h ++++ b/src/xstd/Heap.h +@@ -23,7 +23,7 @@ + const Item &top() const { return this->theItems[1]; } + Item &at(int idx) { return this->theItems[idx+1]; } + +- void add(Item v) { append(v); floatUp(++theCnt); } ++ void add(Item v) { this->append(v); floatUp(++theCnt); } + void skip() { this->theItems[1] = this->theItems[theCnt--]; this->theCount--; sinkDown(1); } + Item shift() { const Item v = this->theItems[1]; skip(); return v; } + +--- a/src/xstd/Ring.h ++++ b/src/xstd/Ring.h +@@ -22,11 +22,11 @@ + int size() const { return Array<Item>::size(); } + bool empty() const { return this->theInOff <= this->theOutOff; } + bool full() const { return count() >= this->theCapacity; } +- const Item &top(int off = 0) const { return item((this->theOutOff+off) % this->theCapacity); } ++ const Item &top(int off = 0) const { return this->item((this->theOutOff+off) % this->theCapacity); } + +- Item &top(int off = 0) { return item((this->theOutOff+off) % this->theCapacity); } +- void enqueue(Item i) { Assert(!full()); item(this->theInOff++ % this->theCapacity) = i; check(); } +- Item dequeue() { return item(this->theOutOff++ % this->theCapacity); } ++ Item &top(int off = 0) { return this->item((this->theOutOff+off) % this->theCapacity); } ++ void enqueue(Item i) { Assert(!full()); this->item(this->theInOff++ % this->theCapacity) = i; check(); } ++ Item dequeue() { return this->item(this->theOutOff++ % this->theCapacity); } + + void reset() { this->theInOff = this->theOutOff = 0; } + inline void resize(int aCap); +--- a/src/runtime/StatPhase.cc ++++ b/src/runtime/StatPhase.cc +@@ -413,12 +413,12 @@ + break; + } + } else { +- static CompoundXactInfo &compound = *CompoundXactInfo::Create(); +- compound.exchanges = 1; +- compound.reqSize = reqSize; +- compound.repSize = repSize; +- compound.lifeTime = repTime; +- compound.record(rec.theIsolated); ++ static CompoundXactInfo &compound2 = *CompoundXactInfo::Create(); ++ compound2.exchanges = 1; ++ compound2.reqSize = reqSize; ++ compound2.repSize = repSize; ++ compound2.lifeTime = repTime; ++ compound2.record(rec.theIsolated); + } + + if (x->cookiesSent() > 0) +--- a/src/cache/CacheEntryHash.cc ++++ b/src/cache/CacheEntryHash.cc +@@ -14,7 +14,7 @@ + + CacheEntryHash::CacheEntryHash(int aCapacity): theCount(0) { + theCapacity = (aCapacity + aCapacity/3 + 7) | 1; +- theIndex = new (CacheEntry*[theCapacity]); ++ theIndex = new (CacheEntry*[this->theCapacity]); + memset(theIndex, 0, sizeof(CacheEntry*)*theCapacity); + } + +--- a/src/tools/IntIntHash.cc ++++ b/src/tools/IntIntHash.cc +@@ -13,7 +13,7 @@ + + IntIntHash::IntIntHash(int aCapacity): theHashCap(0) { + theHashCap = (aCapacity + aCapacity/3 + 7) | 1; +- theIndex = new (IntIntHashItem*[theHashCap]); ++ theIndex = new (IntIntHashItem*[this->theHashCap]); + memset(theIndex, 0, sizeof(IntIntHashItem*)*theHashCap); + } + diff -Nru polygraph-4.3.2/debian/patches/series polygraph-4.3.2/debian/patches/series --- polygraph-4.3.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ polygraph-4.3.2/debian/patches/series 2012-05-11 10:52:38.000000000 +0200 @@ -0,0 +1 @@ +10-fix-ftbfs-gcc-4.7.patch
