diff -Nru gelemental-1.2.0/debian/changelog gelemental-1.2.0/debian/changelog --- gelemental-1.2.0/debian/changelog 2015-08-07 18:16:00.000000000 +0000 +++ gelemental-1.2.0/debian/changelog 2016-07-22 06:07:54.000000000 +0000 @@ -1,31 +1,24 @@ -gelemental (1.2.0-9ubuntu2) wily; urgency=medium +gelemental (1.2.0-10fakesync1) yakkety-proposed; urgency=medium - * No-change rebuild against libatkmm-1.6-1v5 + * Fake sync due to mismatching orig tarball. - -- Steve Langasek Fri, 07 Aug 2015 18:16:00 +0000 + -- Logan Rosen Fri, 22 Jul 2016 02:07:54 -0400 -gelemental (1.2.0-9ubuntu1) trusty; urgency=medium +gelemental (1.2.0-10) unstable; urgency=low - [ Jackson Doak ] - * Merge from debian. Remaining changes: - - Add binary -dbg packages with debugging symbols: - - debian/control: - + add gelemental-dbg stanza - + add libelemental0-dbg stanza - - debian/rules: - + split dh_strip calls in binary-arch target - + add appropriate --dbg-package flags to dh_strip calls - * Drop lp1051992_elements_update.patch, fixed in debian - * Use autoreconf instead of autotools-dev to fix ppc64el ftbfs - - Build-dep on dh-auttoreconf, intltool - - add --with autoreconf to rules - - [ Michael Terry ] - * Drop -dbg packages that Ubuntu added. We have automatically - created -dbgsym packages, so we don't need to carry a delta for this. - * debian/control: drop build-depend on autotools-dev, not needed now + * debian/patches/ftbfs_gcc6_812040.patch: Added (Closes: #812040). + - Fix FTBFS with GCC 6. + * debian/control,rules: Switch from autotools-dev to dh-autoreconf, + add build dependency on intltool (Closes: #755721). + * debian/compat,control,*.install: Bump to debhelper compat level 9. + * debian/*.menu,*.xpm: Remove gelemental menu file, see #741573. + * debian/copyright: Machine readable, update copyright years. + * debian/control: + - Use secure URI for Vcs-Browser. + - Add myself to Uploaders. + - Bump Standards-Version to 3.9.8, no further changes. - -- Jackson Doak Thu, 02 Jan 2014 08:44:34 +1100 + -- Graham Inggs Thu, 21 Jul 2016 15:33:06 +0200 gelemental (1.2.0-9) unstable; urgency=low @@ -39,28 +32,6 @@ -- Daniel Leidert Tue, 06 Aug 2013 13:47:57 +0200 -gelemental (1.2.0-8ubuntu2) raring; urgency=low - - * Updated Flerovium and Livermorium elements. Thx Etienne Beaule. - * Fixed typo in Francium. Thx Benjamin Kerensa. - (LP: #1051992) - - -- Charlie Smotherman Tue, 06 Nov 2012 08:29:11 -0500 - -gelemental (1.2.0-8ubuntu1) quantal; urgency=low - - * Merge from Debian testing. Remaining changes: - - debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch - - Add binary -dbg packages with debugging symbols: - - debian/control: - + add gelemental-dbg stanza - + add libelemental0-dbg stanza - - debian/rules: - + split dh_strip calls in binary-arch target - + add appropriate --dbg-package flags to dh_strip calls - - -- Angel Abad Thu, 17 May 2012 18:36:01 +0200 - gelemental (1.2.0-8) unstable; urgency=low * debian/control (Standards-Version): Bumped to 3.9.3. @@ -74,20 +45,6 @@ -- Daniel Leidert (dale) Wed, 02 May 2012 22:45:00 +0200 -gelemental (1.2.0-7ubuntu1) precise; urgency=low - - * Merge from Debian testing. Remaining changes: - - debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch - - Add binary -dbg packages with debugging symbols: - - debian/control: - + add gelemental-dbg stanza - + add libelemental0-dbg stanza - - debian/rules: - + split dh_strip calls in binary-arch target - + add appropriate --dbg-package flags to dh_strip calls - - -- Angel Abad Mon, 12 Dec 2011 13:11:42 +0100 - gelemental (1.2.0-7) unstable; urgency=low * debian/control (Standards-Version): Bumped to 3.9.2. @@ -124,20 +81,6 @@ -- Daniel Leidert (dale) Sat, 26 Nov 2011 22:08:47 +0100 -gelemental (1.2.0-6ubuntu1) natty; urgency=low - - * Merge from debian unstable. Remaining changes: - - debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch - - Add binary -dbg packages with debugging symbols: - - debian/control: - + add gelemental-dbg stanza - + add libelemental0-dbg stanza - - debian/rules: - + split dh_strip calls in binary-arch target - + add appropriate --dbg-package flags to dh_strip calls - - -- Angel Abad Tue, 15 Feb 2011 13:57:39 +0100 - gelemental (1.2.0-6) unstable; urgency=low * debian/compat: Increased to compatiblity level 7. @@ -160,20 +103,6 @@ -- Daniel Leidert (dale) Sun, 13 Feb 2011 06:07:22 +0100 -gelemental (1.2.0-5ubuntu1) natty; urgency=low - - * Merge from debian unstable (LP: #662355). Remaining changes: - - debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch - - Add binary -dbg packages with debugging symbols: - - debian/control: - + add gelemental-dbg stanza - + add libelemental0-dbg stanza - - debian/rules: - + split dh_strip calls in binary-arch target - + add appropriate --dbg-package flags to dh_strip calls - - -- Angel Abad Mon, 27 Sep 2010 00:51:48 +0100 - gelemental (1.2.0-5) unstable; urgency=low * debian/control: Add ${misc:Depends} to Depends lines. @@ -183,22 +112,6 @@ -- Michael Banck Wed, 22 Sep 2010 20:52:48 +0200 -gelemental (1.2.0-4ubuntu1) maverick; urgency=low - - * Merge from debian testing (LP: #585487). Remaining changes: - - debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch - - Add binary -dbg packages with debugging symbols: - - debian/control: - + add gelemental-dbg stanza - + add libelemental0-dbg stanza - - debian/rules: - + split dh_strip calls in binary-arch target - + add appropriate --dbg-package flags to dh_strip calls - * debian/control: Add ${misc:Depends} to all binary stanza Depends fields - to placate Lintian 'debhelper-but-no-misc-depends' - - -- David Futcher Thu, 27 May 2010 17:33:03 +0100 - gelemental (1.2.0-4) unstable; urgency=low * debian/control (Standards-Version): Bumped to 3.8.3. @@ -217,38 +130,6 @@ -- Daniel Leidert (dale) Mon, 21 Dec 2009 01:12:55 +0100 -gelemental (1.2.0-3ubuntu3) lucid; urgency=low - - * debian/patches/add_new_wave_theme.dpatch: Added (LP: #486798). - - add the New Wave theme to the list of themes that have issues - with button colours. - * debian/patches/00list: updated IAW the patch. - - -- Cesare Tirabassi Mon, 23 Nov 2009 11:53:26 +0100 - -gelemental (1.2.0-3ubuntu2) karmic; urgency=low - - * debian/patches/fix_gtkmm_2.18.dpatch: Added (LP: #441453). - - can_focus() has been deprecated for gtkmm >= 2.18 in favour of a - new get_can_focus() method. - * debian/patches/00list, debian/control: updated IAW the patch. - - -- Cesare Tirabassi Sat, 03 Oct 2009 20:54:17 +0200 - -gelemental (1.2.0-3ubuntu1) intrepid; urgency=low - - * Add binary packages with debugging symbols: - - debian/control: - + add gelemental-dbg stanza - + add libelemental0-dbg stanza - - debian/rules: - + split dh_strip calls in binary-arch target - + add appropriate --dbg-package flags to dh_strip calls - * Modify Maintainer value to match the DebianMaintainerField - specification. - - -- Cesare Tirabassi Tue, 03 Jun 2008 20:56:04 +0200 - gelemental (1.2.0-3) unstable; urgency=low * debian/control (Build-Depends): Added missing graphviz (doxygen). diff -Nru gelemental-1.2.0/debian/compat gelemental-1.2.0/debian/compat --- gelemental-1.2.0/debian/compat 2014-01-14 16:32:23.000000000 +0000 +++ gelemental-1.2.0/debian/compat 2016-07-21 12:11:00.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru gelemental-1.2.0/debian/control gelemental-1.2.0/debian/control --- gelemental-1.2.0/debian/control 2014-01-14 16:56:16.000000000 +0000 +++ gelemental-1.2.0/debian/control 2016-07-22 06:07:54.000000000 +0000 @@ -4,8 +4,9 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debichem Team Uploaders: Daniel Leidert , + Graham Inggs , Michael Banck -Build-Depends: debhelper (>> 7.0.50~), +Build-Depends: debhelper (>= 9), dh-autoreconf, doxygen, gettext, @@ -14,9 +15,9 @@ libgtkmm-2.4-dev (>> 2.18.0), libxml-parser-perl, pkg-config (>> 0.9.0) -Standards-Version: 3.9.4 +Standards-Version: 3.9.8 Homepage: http://web.archive.org/web/20080209213045/http://www.kdau.com/projects/gelemental/ -Vcs-Browser: http://anonscm.debian.org/viewvc/debichem/unstable/gelemental/ +Vcs-Browser: https://anonscm.debian.org/viewvc/debichem/unstable/gelemental/ Vcs-Svn: svn://anonscm.debian.org/debichem/unstable/gelemental/ Package: gelemental diff -Nru gelemental-1.2.0/debian/copyright gelemental-1.2.0/debian/copyright --- gelemental-1.2.0/debian/copyright 2014-01-14 16:32:23.000000000 +0000 +++ gelemental-1.2.0/debian/copyright 2016-07-21 13:32:00.000000000 +0000 @@ -1,72 +1,56 @@ -This package was debianized by Cesare Tirabassi on -Tue, 02 Oct 2007 13:32:34 +0200. It is currently maintained by the -Debichem Team . - -It was downloaded from: - - http://www.kdau.com/projects/gelemental/ - -Upstream Authors: Kevin Daughtridge - Jonas Frantz - Kyle R. Burton - -See also AUTHORS and TRANSLATORS for additional credits. - - -Copyright (C) 2006-2007 Kevin Daughtridge - (C) 2002-2004 Ole Laursen - (C) 2003 Jonas Frantz - -License: GPLv3 or later - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: gElemental +Upstream-Contact: Kevin Daughtridge +Source: http://www.kdau.com/projects/gelemental/ + +Files: * +Copyright: 2006-2007 Kevin Daughtridge + 2002-2004 Ole Laursen + 2003 Jonas Frantz +License: GPL-3.0+ + +Files: libelemental/data.cc +Copyright: 2006 The Blue Obelisk Project (http://www.blueobelisk.org/) +License: Expat + +Files: debian/* +Copyright: 2007 Cesare Tirabassi + 2008-2016 The Debichem Team +License: GPL-3.0+ + +License: GPL-3.0+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . On Debian systems, the complete text of the GNU General Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. -============================================================================== - -For the data set (embedded in libelemental/data.cc): - -Copyright (C) 2006 The Blue Obelisk Project (http://www.blueobelisk.org/) - -License: MIT - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -============================================================================== - -The Debian packaging is - - Copyright (C) 2007 Cesare Tirabassi - Copyright (C) 2008-2011 The Debichem Team - -and is licensed under the GPL, see above. +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. diff -Nru gelemental-1.2.0/debian/gelemental.install gelemental-1.2.0/debian/gelemental.install --- gelemental-1.2.0/debian/gelemental.install 2014-01-14 16:32:23.000000000 +0000 +++ gelemental-1.2.0/debian/gelemental.install 2016-07-21 13:32:00.000000000 +0000 @@ -1,6 +1,4 @@ usr/bin/gelemental -usr/share/locale -usr/share/icons usr/share/applications - -../../debian/gelemental.xpm usr/share/pixmaps/ +usr/share/icons +usr/share/locale diff -Nru gelemental-1.2.0/debian/gelemental.menu gelemental-1.2.0/debian/gelemental.menu --- gelemental-1.2.0/debian/gelemental.menu 2014-01-14 16:32:23.000000000 +0000 +++ gelemental-1.2.0/debian/gelemental.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -?package(gelemental):\ - needs="X11" \ - section="Applications/Science/Chemistry" \ - title="gElemental" \ - command="gelemental" \ - icon="/usr/share/pixmaps/gelemental.xpm" diff -Nru gelemental-1.2.0/debian/gelemental.xpm gelemental-1.2.0/debian/gelemental.xpm --- gelemental-1.2.0/debian/gelemental.xpm 2014-01-14 16:32:23.000000000 +0000 +++ gelemental-1.2.0/debian/gelemental.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/* XPM */ -static char * gelemental_xpm[] = { -"32 32 33 1", -" c None", -". c #633A6B", -"+ c #4A4E59", -"@ c #6E4778", -"# c #70527F", -"$ c #615D6E", -"% c #AB5A09", -"& c #7F618A", -"* c #C06C19", -"= c #8D7398", -"- c #B47232", -"; c #867692", -"> c #7E7A8E", -", c #8F796A", -"' c #A07955", -") c #CB7B2A", -"! c #9F8AAB", -"~ c #C18B55", -"{ c #92939C", -"] c #9093A4", -"^ c #D8893B", -"/ c #989395", -"( c #D18B48", -"_ c #C89C76", -": c #D29B66", -"< c #B3A096", -"[ c #AE9FB9", -"} c #A4A5B3", -"| c #BFA28A", -"1 c #B4B6C7", -"2 c #E1B48B", -"3 c #DDC3AD", -"4 c #CBD3E2", -" {]]]]] ", -" ]{} }}]] ", -" ]}}}]}}{ ", -" ] 1 ]]]]]]] ", -" ] 1 ]]]} }}}{] ", -" ] 1 } }}}1} ", -" ] 1 ] } ", -" ] 1 ] } ", -" ]1 1 ] } ", -" ]1 4 1 ] } ", -" ]13|~<1 } } ", -" ]_23(^3 } 1 ", -" <232^^3] } 41 1 ", -" |232^^2< ]!1[==1 ", -" /_23(^^(<{ ];!1!&&[] ", -" |(22^^-,|| ]=[1=&#!} ", -" /:^:(^)^()3{ ;=[1&##&1 ", -" |^)^)))))-,< ];=[[###$>] ", -" ]_)))))))),_| >&=!=##&;![ ", -" ]_))))*)))))3]!#&=##@@@#[] ", -" /:*********'/]&@@#@@@@@#>] ", -" ]_********-|/!@@@@@@@@@;=[ ", -" |*********~]=@@@@@@@@@@@!] ", -" <_*****%%%&.............!] ", -" >!=&..........&[] ", -" >$$>>;;;;;>;>>> ", -" +++++++ ", -" ", -" "}; diff -Nru gelemental-1.2.0/debian/libelemental0.install gelemental-1.2.0/debian/libelemental0.install --- gelemental-1.2.0/debian/libelemental0.install 2014-01-14 16:32:23.000000000 +0000 +++ gelemental-1.2.0/debian/libelemental0.install 2016-07-21 13:32:00.000000000 +0000 @@ -1 +1 @@ -usr/lib/*.so.* +usr/lib/*/*.so.* diff -Nru gelemental-1.2.0/debian/libelemental-dev.install gelemental-1.2.0/debian/libelemental-dev.install --- gelemental-1.2.0/debian/libelemental-dev.install 2014-01-14 16:32:23.000000000 +0000 +++ gelemental-1.2.0/debian/libelemental-dev.install 2016-07-21 13:32:00.000000000 +0000 @@ -1,4 +1,4 @@ -usr/lib/libelemental.a -usr/lib/libelemental.so -usr/lib/pkgconfig/libelemental.pc usr/include/libelemental +usr/lib/*/libelemental.a +usr/lib/*/libelemental.so +usr/lib/*/pkgconfig/libelemental.pc diff -Nru gelemental-1.2.0/debian/patches/ftbfs_gcc6_812040.patch gelemental-1.2.0/debian/patches/ftbfs_gcc6_812040.patch --- gelemental-1.2.0/debian/patches/ftbfs_gcc6_812040.patch 1970-01-01 00:00:00.000000000 +0000 +++ gelemental-1.2.0/debian/patches/ftbfs_gcc6_812040.patch 2016-07-21 11:29:00.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix operands to ?: have different types with GCC 6 + This fixes a FTBFS with the following error: + dialogs.cc:258:14: error: operands to ?: have different types + 'Elemental::PropertyBase*' and 'bool' + return iter ? iter->get_value (cols.property) : false; +Bug-Debian: https://bugs.debian.org/812040 +Author: Graham Inggs +Last-Update: 2016-07-21 +--- a/src/dialogs.cc ++++ b/src/dialogs.cc +@@ -255,7 +255,7 @@ + const Gtk::TreePath& tpath, bool) + { + Gtk::TreeIter iter = store->get_iter (tpath); +- return iter ? iter->get_value (cols.property) : false; ++ return iter ? (bool)(iter->get_value (cols.property)) : false; + } + + diff -Nru gelemental-1.2.0/debian/patches/series gelemental-1.2.0/debian/patches/series --- gelemental-1.2.0/debian/patches/series 2014-01-14 16:43:53.000000000 +0000 +++ gelemental-1.2.0/debian/patches/series 2016-07-21 11:18:00.000000000 +0000 @@ -10,3 +10,4 @@ 604618_scrollable_properties_dialog.patch lp673285_link_in_about.patch 579183_adjust_size_middle_button.patch +ftbfs_gcc6_812040.patch