Control: tags 727930 + patch Control: tags 727930 + pending Control: tags 811808 + patch Control: tags 811808 + pending
Dear maintainer,
I've prepared an NMU for ns2 (versioned as 2.35+dfsg-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for ns2-2.35+dfsg ns2-2.35+dfsg
changelog | 18 +++++++++++++++++
compat | 2 -
control | 7 ++++--
patches/0007-fix-build-with-gcc6.patch | 34 +++++++++++++++++++++++++++++++++
patches/series | 1
rules | 7 +++++-
6 files changed, 65 insertions(+), 4 deletions(-)
diff -Nru ns2-2.35+dfsg/debian/changelog ns2-2.35+dfsg/debian/changelog
--- ns2-2.35+dfsg/debian/changelog 2014-11-09 13:26:27.000000000 +0000
+++ ns2-2.35+dfsg/debian/changelog 2016-10-23 18:44:37.000000000 +0000
@@ -1,3 +1,21 @@
+ns2 (2.35+dfsg-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump debhelper compat level to 10:
+ + don't automatically run dh_autoreconf, as it currently makes the package
+ FTBFS.
+ + dh_update_autotools_dev run is assured. Closes: #727930
+ + the install target is not parallel-safe, don't run it parallelized.
+ * Drop pointless build-dependency on quilt.
+ * Add patch fixing build with GCC 6. Closes: #811808
+ * Apply hints from the multiarch hinters adding M-A:foreign to -doc and
+ -example and M-A:same to -dbg.
+ * Add libperl4-corelibs-perl to build-dependencies, so the tests have an
+ actual chance to do some good (testsuite results still being ignored).
+ * Respect DEB_BUILD_OPTIONS=nocheck.
+
+ -- Mattia Rizzolo <mat...@debian.org> Sun, 23 Oct 2016 18:44:37 +0000
+
ns2 (2.35+dfsg-2) unstable; urgency=medium
* Team upload.
diff -Nru ns2-2.35+dfsg/debian/compat ns2-2.35+dfsg/debian/compat
--- ns2-2.35+dfsg/debian/compat 2014-11-09 10:52:56.000000000 +0000
+++ ns2-2.35+dfsg/debian/compat 2016-10-23 17:08:14.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru ns2-2.35+dfsg/debian/control ns2-2.35+dfsg/debian/control
--- ns2-2.35+dfsg/debian/control 2014-11-09 13:18:41.000000000 +0000
+++ ns2-2.35+dfsg/debian/control 2016-10-23 17:40:16.000000000 +0000
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Network Simulators Team <pkg-netsim-de...@lists.alioth.debian.org>
Uploaders: YunQiang Su <wzss...@gmail.com>
-Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~), cmake,
+Build-Depends: debhelper (>= 10), cmake,
tcl-dev, tk-dev, libxext-dev, libxt-dev, libpcap0.8-dev,
- libotcl1-dev, tclcl, libtclcl1-dev (>=1.20-6~), perl (>=5.003)
+ libotcl1-dev, tclcl, libtclcl1-dev (>=1.20-6~), perl (>=5.003), libperl4-corelibs-perl
Standards-Version: 3.9.3
Vcs-git: git://git.debian.org/git/pkg-netsim/ns2.git
Vcs-Browser: http://git.debian.org/?p=pkg-netsim/ns2.git
@@ -32,6 +32,7 @@
Package: ns2-dbg
Architecture: any
+Multi-Arch: same
Priority: extra
Section: debug
Depends: ns2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -54,6 +55,7 @@
Package: ns2-doc
Architecture: all
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Section: doc
Description: docs of ns2
@@ -75,6 +77,7 @@
Package: ns2-examples
Architecture: all
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: ns2
Description: examples of ns2
diff -Nru ns2-2.35+dfsg/debian/patches/0007-fix-build-with-gcc6.patch ns2-2.35+dfsg/debian/patches/0007-fix-build-with-gcc6.patch
--- ns2-2.35+dfsg/debian/patches/0007-fix-build-with-gcc6.patch 1970-01-01 00:00:00.000000000 +0000
+++ ns2-2.35+dfsg/debian/patches/0007-fix-build-with-gcc6.patch 2016-10-23 17:35:05.000000000 +0000
@@ -0,0 +1,34 @@
+Description: Fix build with gcc-6
+Author: Mattia Rizzolo <mat...@debian.org>
+Bug-Debian: https://bugs.debian.org/811808
+Last-Update: 2016-10-23
+
+--- a/mdart/mdart_adp.cc
++++ b/mdart/mdart_adp.cc
+@@ -105,7 +105,7 @@
+ #ifdef DEBUG_ADP
+ fprintf(stdout, "%.9f\tADP::sendDarq(%d)\t\t\tin node %d\twith address %s\n", CURRENT_TIME, reqId, mdart_->id_, bitString(mdart_->address_));
+ #endif
+- nsaddr_t dstAdd_ = hash(reqId);
++ nsaddr_t dstAdd_ = ::hash(reqId);
+ #ifdef DEBUG_ADP
+ fprintf(stdout, "\tsending darq for node %s\n", bitString(dstAdd_));
+ #endif
+@@ -393,7 +393,7 @@
+ fprintf(stdout, "%.9f\tMDART::sendDaup()\t\t\t\tin node %d\twith address %s\n", CURRENT_TIME, mdart_->id_, bitString(mdart_->address_));
+ // printDHT();
+ #endif
+- nsaddr_t dstAdd_ = hash(mdart_->id_);
++ nsaddr_t dstAdd_ = ::hash(mdart_->id_);
+ #ifdef DEBUG_ADP
+ fprintf(stdout, "\tsending daup for node %s\n", bitString(dstAdd_));
+ mdart_->routingTable_->print();
+--- a/bitmap/play.xbm
++++ b/bitmap/play.xbm
+@@ -1,5 +1,5 @@
+ #define play_width 15
+ #define play_height 12
+-static char play_bits[] = {
++static unsigned char play_bits[] = {
+ 0x00, 0x00, 0x0c, 0x00, 0x3c, 0x00, 0xfc, 0x00, 0xfc, 0x03, 0xfc, 0x0f,
+ 0xfc, 0x0f, 0xfc, 0x03, 0xfc, 0x00, 0x3c, 0x00, 0x0c, 0x00, 0x00, 0x00};
diff -Nru ns2-2.35+dfsg/debian/patches/series ns2-2.35+dfsg/debian/patches/series
--- ns2-2.35+dfsg/debian/patches/series 2014-11-09 10:52:56.000000000 +0000
+++ ns2-2.35+dfsg/debian/patches/series 2016-10-23 17:10:33.000000000 +0000
@@ -4,3 +4,4 @@
0004-correct-paths-in-examples.patch
0005-fix-for-multiarch-tcltk.patch
0006-hack-for-tcl8.6.patch
+0007-fix-build-with-gcc6.patch
diff -Nru ns2-2.35+dfsg/debian/rules ns2-2.35+dfsg/debian/rules
--- ns2-2.35+dfsg/debian/rules 2014-11-09 10:52:56.000000000 +0000
+++ ns2-2.35+dfsg/debian/rules 2016-10-23 18:37:16.000000000 +0000
@@ -7,7 +7,7 @@
CXXFLAGS += $(CPPFLAGS)
%:
- dh $@
+ dh $@ --without autoreconf
override_dh_auto_configure:
dh_auto_configure -- --x-libraries=/usr/lib/$(DEB_HOST_MULTIARCH)
@@ -16,8 +16,13 @@
dh_strip --dbg-package=ns2-dbg
override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
#it takes too long time.
-dh_auto_test
+endif
+
+override_dh_auto_install:
+ dh_auto_install --no-parallel
override_dh_installchangelogs:
dh_installchangelogs CHANGES.html
signature.asc
Description: PGP signature
