diff -Nru xdrawchem-2.0/debian/changelog xdrawchem-2.0/debian/changelog --- xdrawchem-2.0/debian/changelog 2016-02-18 12:55:24.000000000 +0000 +++ xdrawchem-2.0/debian/changelog 2016-06-30 12:24:41.000000000 +0000 @@ -1,3 +1,11 @@ +xdrawchem (2.0-5) unstable; urgency=medium + + * prepared for GCC6: patched xdrawchem/molecule_obmol.cpp, + checked the compilation with QT_CXX = g++-6. Closes: #811675 + * upgraded Standards-Version to 3.9.8 + + -- Georges Khaznadar Thu, 30 Jun 2016 12:26:08 +0200 + xdrawchem (2.0-4) unstable; urgency=medium * added a very simple desktop file. Closes: #708578 @@ -339,6 +347,4 @@ -- Warren Stramiello Wed, 9 May 2001 16:02:28 -0400 -Local variables: -mode: debian-changelog -End: + diff -Nru xdrawchem-2.0/debian/control xdrawchem-2.0/debian/control --- xdrawchem-2.0/debian/control 2014-10-05 16:33:02.000000000 +0000 +++ xdrawchem-2.0/debian/control 2016-06-30 12:17:15.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), quilt, bash (>= 4.0), pkg-config, libqt4-dev, kdelibs5-dev, libopenbabel-dev (>= 2.0.0) -Standards-Version: 3.9.5 +Standards-Version: 3.9.8 Package: xdrawchem Architecture: any diff -Nru xdrawchem-2.0/debian/patches/gcc6.patch xdrawchem-2.0/debian/patches/gcc6.patch --- xdrawchem-2.0/debian/patches/gcc6.patch 1970-01-01 00:00:00.000000000 +0000 +++ xdrawchem-2.0/debian/patches/gcc6.patch 2016-06-30 12:15:13.000000000 +0000 @@ -0,0 +1,22 @@ +Index: xdrawchem-2.0/xdrawchem/molecule_obmol.cpp +=================================================================== +--- xdrawchem-2.0.orig/xdrawchem/molecule_obmol.cpp ++++ xdrawchem-2.0/xdrawchem/molecule_obmol.cpp +@@ -219,7 +219,7 @@ OBMol *Molecule::convertToOBMol() + atom.SetType( type ); + + if ( !obmol->AddAtom( atom ) ) +- return ( false ); ++ return ( NULL ); + atom.Clear(); + } + +@@ -236,7 +236,7 @@ OBMol *Molecule::convertToOBMol() + if ( bst == STEREO_DOWN ) + flag |= OB_HASH_BOND; + if ( !obmol->AddBond( start, end, order, flag ) ) +- return ( false ); ++ return ( NULL ); + } + + obmol->EndModify(); diff -Nru xdrawchem-2.0/debian/patches/series xdrawchem-2.0/debian/patches/series --- xdrawchem-2.0/debian/patches/series 2016-02-18 12:54:03.000000000 +0000 +++ xdrawchem-2.0/debian/patches/series 2016-06-30 11:57:40.000000000 +0000 @@ -4,3 +4,4 @@ hardening.patch desktop.patch nl-po.patch +gcc6.patch diff -Nru xdrawchem-2.0/debian/rules xdrawchem-2.0/debian/rules --- xdrawchem-2.0/debian/rules 2016-02-18 13:50:17.000000000 +0000 +++ xdrawchem-2.0/debian/rules 2016-06-30 11:55:15.000000000 +0000 @@ -12,12 +12,6 @@ %: dh $@ -#override_dh_auto_configure: -# ./configure --prefix=/usr - - - - override_dh_auto_clean: dh_auto_clean rm -f config.mak