[siscone] 02/02: Merge siscone/2.0.6-1.1 NMU

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Fri Dec 30 09:39:33 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository siscone.

commit dff718fe4618acc92ecc8bd17242a4d5b982d02b
Merge: 946afdf d3488e0
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Dec 30 09:33:36 2016 +0000

    Merge siscone/2.0.6-1.1 NMU

 debian/changelog                                         |  9 +++++++++
 debian/control                                           | 16 ++++++++++------
 ...pherical0.install => libsiscone-spherical0v5.install} |  0
 debian/{libsiscone0.install => libsiscone0v5.install}    |  0
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 2ec7d96,dcd56af..9f48fd8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,12 +1,34 @@@
 +siscone (2.0.6-2) unstable; urgency=medium
 +
 +  * Team upload
 +
 +  [ Ghislain Antony Vaillant ]
 +  * Make build reproducible
 +    - New patch Remove-datetime-from-footer.html.patch
 +    Thanks to Maria Valentina Marin for the patch (Closes: #790034)
 +  * Fix arch-indep only build.
 +    Thanks to Santiago Vila for the fix (Closes: #806198)
 +  * cme fix dpkg-control:
 +    - Drop DM-Upload-Allowed field
 +    - Bump standards version to 3.9.8
 +    - Use secure VCS URI
 +    - Wrap and sort
 +  * cme fix dpkg-copyright:
 +    - Use HTTPS URI for Format field
 +    - Remove new line at end of file
 +  * Upgrade packaging to debhelper 10
 +
 + -- Ghislain Antony Vaillant <ghisvail at gmail.com>  Fri, 30 Dec 2016 00:02:51 +0000
 +
+ siscone (2.0.6-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+ 
+   [ Iain Lane ]
+   * Rename library packages for g++5 ABI transition. (Closes: #791283)
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Mon, 19 Oct 2015 22:24:38 +0200
+ 
  siscone (2.0.6-1) unstable; urgency=low
  
    * Upload to sid.
diff --cc debian/control
index 48d7361,356b01d..c4f5533
--- a/debian/control
+++ b/debian/control
@@@ -1,41 -1,35 +1,43 @@@
  Source: siscone
 -Section: science
 -Priority: optional
  Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
  Uploaders: Lifeng Sun <lifongsun at gmail.com>
 -DM-Upload-Allowed: yes
 -Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf
 -Build-Depends-Indep: doxygen-latex, graphviz, texlive-fonts-recommended, ghostscript
 -Standards-Version: 3.9.3
 +Section: science
 +Priority: optional
 +Build-Depends: debhelper (>= 10),
 +               dh-autoreconf
 +Build-Depends-Indep: doxygen-latex,
 +                     graphviz,
 +                     texlive-fonts-recommended,
 +                     ghostscript
 +Standards-Version: 3.9.8
 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/siscone.git
 +Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/siscone.git
  Homepage: http://projects.hepforge.org/siscone/
 -Vcs-Git: git://git.debian.org/git/debian-science/packages/siscone.git
 -Vcs-Browser: http://git.debian.org/?p=debian-science/packages/siscone.git
  
- Package: libsiscone0
+ Package: libsiscone0v5
 -Section: libs
  Architecture: any
  Multi-Arch: same
 -Pre-Depends: ${misc:Pre-Depends}
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 +Section: libs
 +Depends: ${shlibs:Depends},
 +         ${misc:Depends}
- Suggests: libsiscone-spherical0 (= ${binary:Version})
+ Suggests: libsiscone-spherical0v5 (= ${binary:Version})
 +Pre-Depends: ${misc:Pre-Depends}
+ Conflicts: libsiscone0
+ Replaces: libsiscone0
  Description: Seedless Infrared Safe Cone jet finder
   SISCone implements a seedless infrared (IR) safe cone jet algorithm, it takes
   N^2*ln(N) time to find jets among N particles, comparing to N*2^N time of
   other algorithms.
  
  Package: libsiscone-dev
 -Section: libdevel
  Architecture: any
 -Depends: libsiscone0v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 -Suggests: siscone-examples (= ${source:Version}), siscone-doc-html (= ${source:Version}), siscone-doc-pdf (= ${source:Version})
 +Section: libdevel
- Depends: libsiscone0 (= ${binary:Version}),
++Depends: libsiscone0v5 (= ${binary:Version}),
 +         ${shlibs:Depends},
 +         ${misc:Depends}
 +Suggests: siscone-examples (= ${source:Version}),
 +          siscone-doc-html (= ${source:Version}),
 +          siscone-doc-pdf (= ${source:Version})
  Description: Seedless Infrared Safe Cone jet finder - development files
   SISCone implements a seedless infrared (IR) safe cone jet algorithm, it takes
   N^2*ln(N) time to find jets among N particles, comparing to N*2^N time of
@@@ -43,14 -37,14 +45,16 @@@
   .
   This package provides development files of SISCone.
  
- Package: libsiscone-spherical0
+ Package: libsiscone-spherical0v5
 -Section: libs
  Architecture: any
  Multi-Arch: same
 +Section: libs
- Depends: libsiscone0 (= ${binary:Version}),
++Depends: libsiscone0v5 (= ${binary:Version}),
 +         ${shlibs:Depends},
 +         ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
 -Depends: libsiscone0v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+ Conflicts: libsiscone-spherical0
+ Replaces: libsiscone-spherical0
  Description: Spherical version of SISCone
   SISCone implements a seedless infrared (IR) safe cone jet algorithm, it takes
   N^2*ln(N) time to find jets among N particles, comparing to N*2^N time of
@@@ -59,15 -53,10 +63,15 @@@
   The spherical version of SISCone is designed for use in e+e- collisions.
  
  Package: libsiscone-spherical-dev
 -Section: libdevel
  Architecture: any
 -Depends: libsiscone-spherical0v5 (= ${binary:Version}), libsiscone-dev (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 -Suggests: siscone-examples (= ${source:Version}), siscone-doc-html (= ${source:Version}), siscone-doc-pdf (= ${source:Version})
 +Section: libdevel
- Depends: libsiscone-spherical0 (= ${binary:Version}),
++Depends: libsiscone-spherical0v5 (= ${binary:Version}),
 +         libsiscone-dev (= ${binary:Version}),
 +         ${shlibs:Depends},
 +         ${misc:Depends}
 +Suggests: siscone-examples (= ${source:Version}),
 +          siscone-doc-html (= ${source:Version}),
 +          siscone-doc-pdf (= ${source:Version})
  Description: Spherical version of SISCone - development files
   SISCone implements a seedless infrared (IR) safe cone jet algorithm, it takes
   N^2*ln(N) time to find jets among N particles, comparing to N*2^N time of

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/siscone.git



More information about the debian-science-commits mailing list