Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package simgrid The new version fixes the RC bug #755047 -- really this time, sorry. The debdiff is attached. Also, it'd be cool if you could cancel the autorm against that package. Thanks for your hard work, Mt unblock simgrid/3.11.1-9 -- System Information: Debian Release: jessie/sid APT prefers testing-updates APT policy: (500, 'testing-updates'), (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16-2-amd64 (SMP w/4 CPU cores) -- Arguing with an engineer is a lot like wrestling in the mud with a pig. After a couple of hours, you realize the pig likes it.
diff -Nru simgrid-3.11.1/debian/changelog simgrid-3.11.1/debian/changelog --- simgrid-3.11.1/debian/changelog 2014-07-05 00:20:44.000000000 +0200 +++ simgrid-3.11.1/debian/changelog 2014-12-13 22:16:07.000000000 +0100 @@ -1,3 +1,25 @@ +simgrid (3.11.1-9) unstable; urgency=medium + + * add some dependencies to really fix #755047: + - libsimgrid-dev breaks libsimgrid3.10 and libsimgrid3.11 (<<3.11.1-8) + - libsimgrid3.11 breaks+replaces libsimgrid3.10 + - This should hint apt about how to solve my mess :-( + + -- Martin Quinson <mquin...@debian.org> Sat, 13 Dec 2014 22:15:36 +0100 + +simgrid (3.11.1-8) unstable; urgency=medium + + * d/c: update VCS to not use any deprecated URLs + * d/c: improve short descriptions + * d/c: libsimgrid-java suggests java-virtual-machine, captain obvious. + * Install tesh and graphicator tools as part of the libsimgrid-dev, + not as part of libsimgrid3.11 to allow the co-installation of + several library versions (Closes: #755047). + * d/p/fix-bashism.diff: fix a bashism that mainly appears on Mac OSX + (Closes: #772329). + + -- Martin Quinson <mquin...@debian.org> Tue, 09 Dec 2014 01:47:57 +0100 + simgrid (3.11.1-7) unstable; urgency=medium * Disable LTO on all non-AMD architectures to circumvent a seemingly diff -Nru simgrid-3.11.1/debian/control simgrid-3.11.1/debian/control --- simgrid-3.11.1/debian/control 2014-07-05 00:20:44.000000000 +0200 +++ simgrid-3.11.1/debian/control 2014-12-13 22:16:07.000000000 +0100 @@ -11,12 +11,14 @@ transfig, ghostscript, texlive-font-utils Standards-Version: 3.9.5 Homepage: http://simgrid.gforge.inria.fr/ -Vcs-Git: git://git.debian.org/git/collab-maint/simgrid.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/simgrid.git +Vcs-Git: git://anonscm.debian.org/collab-maint/simgrid.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgrid.git Package: libsimgrid3.11 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libsimgrid3.10 +Replaces: libsimgrid3.10 Recommends: lua5.1 Conflicts: simgrid (<< 3.11) Description: Toolkit for scalable simulation of distributed applications @@ -34,7 +36,7 @@ Section: doc Depends: ${misc:Depends} Conflicts: simgrid (<< 3.11) -Description: Toolkit for scalable simulation of distributed applications +Description: Documentation for the SimGrid Toolkit SimGrid is a toolkit that provides core functionalities for the simulation of distributed applications in heterogeneous distributed environments. SimGrid can be used as a Grid simulator, a P2P simulator, a Cloud simulator, a MPI @@ -50,7 +52,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libsimgrid3.11 (>= ${source:Version}) Recommends: simgrid-doc (>= ${source:Version}) Conflicts: simgrid (<< 3.11) -Description: Toolkit for scalable simulation of distributed applications +Suggests: java-virtual-machine +Description: Java bindings for the SimGrid Toolkit SimGrid is a toolkit that provides core functionalities for the simulation of distributed applications in heterogeneous distributed environments. SimGrid can be used as a Grid simulator, a P2P simulator, a Cloud simulator, a MPI @@ -71,10 +74,11 @@ libsimgrid3.11 (= ${binary:Version}), libf2c2-dev, Recommends: f2c, gcc, make, simgrid-doc (>= ${source:Version}) +Breaks: libsimgrid3.10, libsimgrid3.11 (<<3.11.1-8) Conflicts: simgrid Replaces: simgrid Provides: simgrid -Description: Toolkit for scalable simulation of distributed applications +Description: Development files for the SimGrid Toolkit SimGrid is a toolkit that provides core functionalities for the simulation of distributed applications in heterogeneous distributed environments. SimGrid can be used as a Grid simulator, a P2P simulator, a Cloud simulator, a MPI diff -Nru simgrid-3.11.1/debian/libsimgrid3.11.install simgrid-3.11.1/debian/libsimgrid3.11.install --- simgrid-3.11.1/debian/libsimgrid3.11.install 2014-07-05 00:20:44.000000000 +0200 +++ simgrid-3.11.1/debian/libsimgrid3.11.install 2014-12-13 22:16:07.000000000 +0100 @@ -1,6 +1 @@ usr/lib/libsimgrid.so.3.11 - -usr/bin/tesh -usr/share/man/man1/tesh.1 - -usr/bin/simgrid-graphicator diff -Nru simgrid-3.11.1/debian/libsimgrid-dev.install simgrid-3.11.1/debian/libsimgrid-dev.install --- simgrid-3.11.1/debian/libsimgrid-dev.install 2014-07-05 00:20:44.000000000 +0200 +++ simgrid-3.11.1/debian/libsimgrid-dev.install 2014-12-13 22:16:07.000000000 +0100 @@ -26,3 +26,8 @@ usr/lib/libsimgrid-java.so usr/lib/libsimgrid.so + +usr/bin/tesh +usr/share/man/man1/tesh.1 + +usr/bin/simgrid-graphicator diff -Nru simgrid-3.11.1/debian/patches/fix-bashism.diff simgrid-3.11.1/debian/patches/fix-bashism.diff --- simgrid-3.11.1/debian/patches/fix-bashism.diff 1970-01-01 01:00:00.000000000 +0100 +++ simgrid-3.11.1/debian/patches/fix-bashism.diff 2014-12-13 22:16:07.000000000 +0100 @@ -0,0 +1,31 @@ +commit d2e08004d48f0cef99d943d253e2f1dd0b8470b0 +Author: degomme <degomme@localhost.localdomain> +Date: Mon Dec 8 23:37:07 2014 +0100 + + bashism -- (fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772329 ) + +--- + src/smpi/smpirun.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +Index: b/src/smpi/smpirun.in +=================================================================== +--- a/src/smpi/smpirun.in ++++ b/src/smpi/smpirun.in +@@ -331,11 +331,11 @@ HAVE_SEQ="`which seq 2>/dev/null`" + if [ -n "${HAVE_SEQ}" ]; then + SEQ=`${HAVE_SEQ} 0 $((${NUMPROCS}-1))` + else +- cnt=0 +- while (( $cnt < ${NUMPROCS} )) ; do +- SEQ="$SEQ $cnt" +- cnt=$((cnt + 1)); +- done ++ cnt=0 ++ while [ $cnt -lt ${NUMPROCS} ] ; do ++ SEQ="$SEQ $cnt" ++ cnt=$((cnt + 1)); ++ done + fi + + ##---- generate <process> tags------------------------------ diff -Nru simgrid-3.11.1/debian/patches/series simgrid-3.11.1/debian/patches/series --- simgrid-3.11.1/debian/patches/series 2014-07-05 00:20:44.000000000 +0200 +++ simgrid-3.11.1/debian/patches/series 2014-12-13 22:16:07.000000000 +0100 @@ -4,3 +4,4 @@ fix-java-multiple-definitions.diff no-static.diff lto-gcc-4.9.diff +fix-bashism.diff
signature.asc
Description: Digital signature
