diff -Nru chemtool-1.6.14/debian/changelog chemtool-1.6.14/debian/changelog --- chemtool-1.6.14/debian/changelog 2013-08-13 21:39:19.000000000 +0000 +++ chemtool-1.6.14/debian/changelog 2018-01-16 20:58:41.000000000 +0000 @@ -1,3 +1,28 @@ +chemtool (1.6.14-2) unstable; urgency=low + + * debian/chemtool.desktop: Removed. + * debian/chemtool.menu: Ditto. + * debian/chemtool_icon.xpm: Ditto. + * debian/chemtool.install: Adjusted. Removed .menu related entries. + * debian/compat: Raised to level 11. + * debian/control: Sorted. + (Build-Depends): Raised to debhelper version 11 and removed autotools-dev. + (Standards-Version): Bumped to 4.1.3. + (Vcs-Browser): Use secure URI. + (Depends, Description): Replaced transfig by fig2dev (closes: #866149). + * debian/copyright: Rewritten in format version 1.0. + * debian/patches/748031_signedness.patch: Added. + - Fix conflicting function definitions (closes: #748031). + * debian/patches/866703_cross.patch: Added (thanks to Helmut Grohne). + - Use standard autoconf macro for pkg-config detection (closes: #866703). + * debian/patches/desktop.patch: Added. + - Fix the .desktop file and merge contents from debian/chemtool.desktop. + * debian/patches/series: Adjusted. + * debian/rules: Removed obsolete autotools_dev dh add-on. + * debian/upstream: Renamed to debian/upstream/metadata. + + -- Daniel Leidert Tue, 16 Jan 2018 21:58:41 +0100 + chemtool (1.6.14-1) unstable; urgency=low * New upstream release. @@ -129,9 +154,9 @@ [ LI Daobing ] * debian/chemtool.desktop: fix warning for desktop-file-validate. - * debian/watch: added. + * debian/watch: added. * change standards version from 3.6.1 to 3.7.2 - * add me to uploader + * add me to uploader -- LI Daobing Sat, 24 Mar 2007 03:04:57 +0800 @@ -186,7 +211,7 @@ chemtool (1.6.4-1) unstable; urgency=low * New upstream release. - * (05_fix_manpage.patch): Dropped, applied upstream. + * (05_fix_manpage.patch): Dropped, applied upstream. -- Michael Banck Sat, 8 Jan 2005 02:29:22 +0100 @@ -224,7 +249,7 @@ * New upstream release. * (02_check_fonts): Dropped, applied upstream. * Makefile.in (CFLAGS): Factor out CPPLAGS from CFLAGS. - (03_seperate_CFLAGS) + (03_seperate_CFLAGS) -- Michael Banck Tue, 4 May 2004 14:04:01 +0200 @@ -237,7 +262,7 @@ chemtool (1.6-2) unstable; urgency=low - * Added Build-Depends on cdbs; closes: #201885 + * Added Build-Depends on cdbs; closes: #201885 * Bumped Standards-Version to 3.6.0 -- Michael Banck Fri, 18 Jul 2003 15:35:46 +0200 @@ -303,7 +328,7 @@ chemtool (1.5+1.6alpha17-1) unstable; urgency=low * New upstream development release - * inout.c: Fixed {fig|eps|tex}-export for italic and bold fonts + * inout.c: Fixed {fig|eps|tex}-export for italic and bold fonts always being Helvetica -- Michael Banck Thu, 28 Nov 2002 17:52:57 +0100 @@ -325,7 +350,7 @@ * New maintainer email address * Removed emacs-variables from debian/changelog * Bumped Standards-Version: to 3.5.6.1 - * Added versioned Build-Depends: for debhelper to satisfy linda + * Added versioned Build-Depends: for debhelper to satisfy linda -- Michael Banck Sat, 21 Sep 2002 17:04:42 +0200 @@ -348,7 +373,7 @@ * debian/contro: Corrected spelling mistake; closes: #124495 * inout.c: Fixed xbm-export; closes: #122175 * draw.c: Fixed rounding error in Add_ring() - * draw.c: Fixed 360 degrees rollover-bug in Put_protate() + * draw.c: Fixed 360 degrees rollover-bug in Put_protate() -- Michael Banck Fri, 21 Dec 2001 02:04:29 +0100 @@ -362,7 +387,7 @@ chemtool (1.3.1-3) unstable; urgency=low * Backported a fallback to fixed-font if helvetica isn't - available; closes: #110716 + available; closes: #110716 -- Michael Banck Thu, 6 Sep 2001 19:11:23 +0200 @@ -382,7 +407,7 @@ chemtool (1.3-2) unstable; urgency=low - * Moved section from math to science to fix override disparity. + * Moved section from math to science to fix override disparity. * Corrected typo in copyright file. * Removed call of deprecated dh_testversion in rules. diff -Nru chemtool-1.6.14/debian/chemtool.desktop chemtool-1.6.14/debian/chemtool.desktop --- chemtool-1.6.14/debian/chemtool.desktop 2009-06-14 11:02:32.000000000 +0000 +++ chemtool-1.6.14/debian/chemtool.desktop 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Chemtool -GenericName=Chemistry Structure Editor -Comment=Draw and make calculations on chemical structures -Type=Application -Exec=chemtool -Icon=chemtool -Terminal= false -MimeType=application/x-chemtool; -Categories=Science;Chemistry;Education; diff -Nru chemtool-1.6.14/debian/chemtool_icon.xpm chemtool-1.6.14/debian/chemtool_icon.xpm --- chemtool-1.6.14/debian/chemtool_icon.xpm 2008-02-22 03:47:52.000000000 +0000 +++ chemtool-1.6.14/debian/chemtool_icon.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,202 +0,0 @@ -/* XPM */ -static char *chemtool[] = { -/* columns rows colors chars-per-pixel */ -"32 32 164 2", -" c black", -". c #03CB03CB03CB", -"X c #05E905E905E9", -"o c #069E069E069E", -"O c #081B081B081B", -"+ c #13F713F713F7", -"@ c #148614861486", -"# c #153215321532", -"$ c #166C166C166C", -"% c #193619361936", -"& c gray10", -"* c #1C721C721C72", -"= c #1F581F581F58", -"- c #2D4A2D4A2D4A", -"; c #37FF37FF37FF", -": c #38D838D838D8", -"> c #3AE53AE53AE5", -", c #3C1F3C1F3C1F", -"< c #3C3C3C3C3C3C", -"1 c #450C450C450C", -"2 c #484848484848", -"3 c #4DA34DA34DA3", -"4 c #52D352D352D3", -"5 c #53D853D853D8", -"6 c #553855385538", -"7 c #555555555555", -"8 c #597659765976", -"9 c #5D075D075D07", -"0 c #5E7B5E7B5E7B", -"q c #4C4C6F6F7F7F", -"w c #626262626262", -"e c #650F650F650F", -"r c #67B667B667B6", -"t c #68B068B068B0", -"y c #6B886B886B88", -"u c #701A701A701A", -"i c #71D571D571D5", -"p c #731D731D731D", -"a c #769376937693", -"s c #795C795C795C", -"d c #79B279B279B2", -"f c #7C997C997C99", -"g c #7FF17FF17FF1", -"h c #57AD802A9393", -"j c #7FD58B8B90E6", -"k c #684B9321A7C4", -"l c #68689321A7C4", -"z c #6DC3955CA7E0", -"x c #7B429595A1DA", -"c c #7E1CA84ABC09", -"v c #7E7EA852BC11", -"b c #80D680D680D6", -"n c #821082108210", -"m c #848484848484", -"M c #86A386A386A3", -"N c #89A689A689A6", -"B c gray55", -"V c #8DFA8DFA8DFA", -"C c #8EDA8EDA8EDA", -"Z c #8FE58FE58FE5", -"A c #83A0911F9797", -"S c #92CB92CB92CB", -"D c #91E795CE9797", -"F c #94F894F894F8", -"G c #95B295B295B2", -"H c #970897089708", -"J c #983998399839", -"K c #99BC99BC99BC", -"L c #9AF59AF59AF5", -"P c #9C2A9C2A9C2A", -"I c #9E1E9E1E9E1E", -"U c #A006A006A006", -"Y c #81BA9EF4ACC9", -"T c #8E099AB7A0D9", -"R c #94CD9EBBA36A", -"E c #9AD3A067A2DB", -"W c #82D8A0BDAF3D", -"Q c #8585A487B37A", -"! c #8832A852B7B7", -"~ c #8F39AA38B6EF", -"^ c #9E9EA819AC73", -"/ c #9F30A852ACAC", -"( c #A10CA10CA10C", -") c #A1A9A1A9A1A9", -"_ c #A2C3A2C3A2C3", -"` c #A3F9A432A44E", -"' c #A520A520A520", -"] c #A6DFA6DFA6DF", -"[ c #A852A852A852", -"{ c gray66", -"} c #A9E2A9E2A9E2", -"| c #AAD8AAD8AAD8", -" . c #ABC8ABC8ABC8", -".. c #AD90AD90AD90", -"X. c #ADD8ADD8ADD8", -"o. c #AF76AF76AF76", -"O. c #AFAFAFAFAFAF", -"+. c #B15BB15BB15B", -"@. c #B1EAB1EAB1EA", -"#. c #B34FB34FB34F", -"$. c #B3FBB3FBB3FB", -"%. c #B652B652B652", -"&. c #B762B762B762", -"*. c #B9E4B9E4B9E4", -"=. c #BD04BD04BD04", -"-. c #BE93BE93BE93", -";. c #BEEBBEEBBEEB", -":. c #C0A3C0A3C0A3", -">. c #A689BAD7C4E1", -",. c #B7F0BF86C2DF", -"<. c #C16BC16BC16B", -"1. c #C233C233C233", -"2. c #C2DFC2DFC2DF", -"3. c #C56FC56FC56F", -"4. c #C6A9C6A9C6A9", -"5. c #C780C780C780", -"6. c #C84AC84AC84A", -"7. c #C8C8C8C8C8C8", -"8. c #CB20CB20CB20", -"9. c #CC93CC93CC93", -"0. c #CD1BCD1BCD1B", -"q. c #CF79CF79CF79", -"w. c #CFECCFECCFEC", -"e. c #D1B4D1B4D1B4", -"r. c #D260D260D260", -"t. c #D470D470D470", -"y. c #D75BD75BD75B", -"u. c #DA76DA76DA76", -"i. c #DBBEDBBEDBBE", -"p. c #DC3CDC3CDC3C", -"a. c #DD15DD15DD15", -"s. c #DE24DE24DE24", -"d. c #DF50DF50DF50", -"f. c #E08BE08BE08B", -"g. c gray88", -"h. c #E237E237E237", -"j. c #E341E341E341", -"k. c #E439E439E439", -"l. c #E586E586E586", -"z. c #E674E674E674", -"x. c #E7CAE7CAE7CA", -"c. c #E820E820E820", -"v. c #EA3FEA3FEA3F", -"b. c #EB15EB15EB15", -"n. c #EC24EC24EC24", -"m. c #ED42ED42ED42", -"M. c #EF2EEF2EEF2E", -"N. c #F045F045F045", -"B. c #F162F162F162", -"V. c #F239F239F239", -"C. c #F3BAF3BAF3BA", -"Z. c #F498F498F498", -"A. c #F56DF56DF56D", -"S. c #F63DF63DF63D", -"D. c #F74CF74CF74C", -"F. c #F869F869F869", -"G. c #F97EF97EF97E", -"H. c #FA5AFA5AFA5A", -"J. c #FB94FB94FB94", -"K. c #FC93FC93FC93", -"L. c #FD83FD83FD83", -"P. c #FEA3FEA3FEA3", -"I. c #FF7FFF7FFF7F", -"U. c gray100", -/* pixels */ -"D j T T ^ ^ ^ ^ ^ ^ ^ / / / / / / / / / ^ ^ / / / T A A L j ` s.", -"j q k k c c c c c c c c c c c c v v v v c c c c c k q h l q ,.s.", -"E ~ W W ! ! Y Y x ! x ! x ! x ! x ! Y Y Y Y Y Y x W ! W Q >.t.5.", -"P ' [ [ [ [ [ [ [ [ [ ' [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ ' :.", -"U k.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U._ f.", -"U k.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U._ f.", -"U s.U.U.U.U.U.U.U.U.U.U.U.U.U.A.g.u.U.k.y.9.9.9.8.8.u.H.U.U._ s.", -"P s.U.U.U.U.U.U.U.U.U.U.U.U.n.%.i P U.a u.=.+.+. .[ U n.U.U._ g.", -"P s.U.U.U.U.U.U.U.U.U.H.n.8.V t P n.H.4 : s.U.H.U.n._ k.U.U._ s.", -"H s.U.U.U.U.U.U.U.U.H.s.' P H V g.U.U.5 . ; U.U.U.n.' k.U.U._ g.", -"P s.U.U.U.U.U.U.H.g. .P <.9.H t.U.U.U.4 . . ; g.U.N._ k.U.U._ s.", -"P s.U.U.U.U.U.U.t.U .u.g._ =.A.U.U.U.4 . . . : U.N._ k.U.U._ g.", -"P s.U.U.U.U.U.H.+.*.H.A.[ .A.U.U.U.U.5 . . % 5 V N._ k.U.U.U s.", -"P s.U.U.U.U.U.U.+.5.H.u.P g.U.U.U.U.U.5 : : 5 U.U.N._ k.U.U._ g.", -"P g.U.U.U.U.U.H.%.8.H.=.=.H.U.U.U.U.U.V U.U.. [ U.N._ k.U.U._ s.", -"P s.U.U.U.U.U.U.+.8.H.=.<.H.U.U.U.U.U.U.U.U.i : U.n._ k.U.U._ g.", -"P g.U.U.U.U.U.H.+.8.U.=.<.H.U.U.U.U.U.U.U.U.5.4 A.%.V n.U.U._ s.", -"P g.U.U.U.U.U.H.+.5.H.=.<.H.U.U.U.U.U.U.U.U.H.s.H 3 ' A.U.U._ g.", -"P s.U.U.U.U.U.U.%.8.H.<.5.H.U.U.U.U.U.U.A.g. .b : t n.U.U.U._ s.", -"P s.U.U.U.U.U.H.+.5.H.=.<.H.U.U.U.U.U.N.<.P P 0 : %.U.U.U.U._ g.", -"P s.U.U.U.U.U.U. .+.u.' [ s.s.s.s.s.5._ _ <.t % V N.U.U.U.U._ s.", -"H s.U.U.U.U.U.n.V V _ d d U _ _ _ _ _ =.s.V @ : s.U.U.U.U.U._ s.", -"P u.U.U.U.U.N.+. .k.t.i 1 w e e w e e y 4 @ = ' U.U.U.U.U.U._ g.", -"P s.U.U.U.U.8.P s.9.0 @ o o O O o O O O o o e k.U.U.U.U.U.U._ s.", -"H s.U.U.U.s.H *.V - o + 1 y b b b b b b m H s.U.U.U.U.U.U.U.U s.", -"H s.U.U.k._ V e % @ 4 H u.N.N.A.A.A.A.A.A.A.U.U.U.U.U.U.U.U._ s.", -"P s.U.A.U 0 : , f =.n.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U._ g.", -"H s.U.9.4 7 S 8.n.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U._ s.", -"P s.U.g.5.k.H.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U._ s.", -"H u.U.U.H.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U._ g.", -"[ .%.*.%.*.%.%.%.*.%.*.%.%.%.*.%.*.%.%.%.*.%.*.%.%.*.%.%.%.U s.", -"n.g.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.g.A." -}; diff -Nru chemtool-1.6.14/debian/chemtool.install chemtool-1.6.14/debian/chemtool.install --- chemtool-1.6.14/debian/chemtool.install 2011-11-26 17:23:22.000000000 +0000 +++ chemtool-1.6.14/debian/chemtool.install 2018-01-16 20:58:34.000000000 +0000 @@ -1,4 +1,2 @@ chemtool.xpm usr/share/pixmaps - -debian/chemtool_icon.xpm usr/share/pixmaps -debian/chemtool.desktop usr/share/applications +chemtool.desktop usr/share/applications diff -Nru chemtool-1.6.14/debian/chemtool.menu chemtool-1.6.14/debian/chemtool.menu --- chemtool-1.6.14/debian/chemtool.menu 2011-11-26 17:23:22.000000000 +0000 +++ chemtool-1.6.14/debian/chemtool.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -?package(chemtool):needs="X11" section="Applications/Science/Chemistry" \ - title="chemtool" icon="/usr/share/pixmaps/chemtool_icon.xpm" \ - hints="Chemical Structure Editor" command="/usr/bin/chemtool" diff -Nru chemtool-1.6.14/debian/compat chemtool-1.6.14/debian/compat --- chemtool-1.6.14/debian/compat 2011-11-26 17:23:22.000000000 +0000 +++ chemtool-1.6.14/debian/compat 2018-01-16 20:58:34.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru chemtool-1.6.14/debian/control chemtool-1.6.14/debian/control --- chemtool-1.6.14/debian/control 2013-08-13 21:39:05.000000000 +0000 +++ chemtool-1.6.14/debian/control 2018-01-16 20:58:34.000000000 +0000 @@ -4,17 +4,15 @@ Maintainer: Debichem Team Uploaders: Michael Banck , Daniel Leidert -Build-Depends: autotools-dev (>> 20100122.1~), - debhelper (>> 7.0.50~), - libgtk2.0-dev -Standards-Version: 3.9.4 +Build-Depends: debhelper (>> 11~), libgtk2.0-dev +Standards-Version: 4.1.3 Homepage: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/ -Vcs-Browser: http://anonscm.debian.org/viewvc/debichem/unstable/chemtool/ +Vcs-Browser: https://anonscm.debian.org/viewvc/debichem/unstable/chemtool/ Vcs-Svn: svn://anonscm.debian.org/debichem/unstable/chemtool/ Package: chemtool Architecture: any -Depends: transfig, ${misc:Depends}, ${shlibs:Depends} +Depends: fig2dev, ${misc:Depends}, ${shlibs:Depends} Recommends: openbabel Suggests: fig2sxd, xfig Description: chemical structures drawing program @@ -24,7 +22,7 @@ . Drawings can be exported to MOL and PDB format, SVG or XFig format for further annotation, as a PiCTeX drawing, as a bitmap or as Postscript - files (several of these through XFig's companion program transfig). + files (several of these through XFig's companion program fig2dev). . The package also contains a helper program, cht, to calculate sum formula and (exact) molecular weight from a chemtool drawing file. Cht diff -Nru chemtool-1.6.14/debian/copyright chemtool-1.6.14/debian/copyright --- chemtool-1.6.14/debian/copyright 2008-02-22 03:47:52.000000000 +0000 +++ chemtool-1.6.14/debian/copyright 2018-01-16 20:58:34.000000000 +0000 @@ -1,46 +1,62 @@ -This package was debianized by Dr. Guenter Bechly on -Sat, 3 Mar 2001 16:07:38 +0100. The Current Debian maintainer is -Michael Banck . - -It was downloaded from: - - http://ruby.chemie.uni-freiburg.de/~martin/chemtool/ - -Upstream Authors: - - Thomas Volk , - Martin Kroeker , - Radek Liboska and other. - -Copyright for chemtool: - - Copyright (C) 1999 Thomas Volk - Copyright (C) 1999-2007 Dr. Martin Kroeker - -Copyright for cht: - - Copyright (C) Radek Liboska - -Copyright for gtkmenu.h: - - Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - -Copyright for undo.c, undo.h: - - Copyright (C) 1999 Matt Kimball - -Copyright for gtkfilesel.c, gtkfilesel.h: - - Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - -License: GPL - - You are free to distribute this software under the terms of - the GNU General Public Licence. - - On Debian systems, the complete text of the GNU General Public - Licence can be found in /usr/share/common-licenses/GPL file. - -For several build related files in the source, the Free Software Foundation -owns a copyright and offers these files under the terms of the GNU General -Pulic License or an all permissive license. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Chemtool +Upstream-Contact: Martin Kroeker +Source: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/ + +Files: * +Copyright: 1999 Thomas Volk + 1999-2007,2010,2011,2013 Dr. Martin Kroeker + 2001 Radek Liboska (partial) +License: GPL-2+ + +Files: gettext.h intl/* +Copyright: 1995-2004 Free Software Foundation, Inc. +License: LGPL-2+ + +Files: gtkmenu.c gtkmenu.h gtkfilesel.c gtkfilesel.h +Copyright: 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald +License: LGPL-2+ + +Files: undo.c undo.h +Copyright: 1999 Matt Kimball +License: GPL-2+ + +Files: debian/* +Copyright: 2001 Guenter Bechly + 2001-2006 Michael Banck + 2007-2017 The debichem team +License: GPL-2+ + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Comment: On Debian systems, the GNU Lesser General Public License (LGPL) + version 2 is available as the file `/usr/share/common-licenses/LGPL-2'. + +License: GPL-2+ + This program 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 2 of the License, or + (at your option) any later version. + . + This program 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 program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +Comment: On Debian systems, the GNU General Public License (GPL) version 2 + is available as the file `/usr/share/common-licenses/GPL-2'. diff -Nru chemtool-1.6.14/debian/patches/748031_signedness.patch chemtool-1.6.14/debian/patches/748031_signedness.patch --- chemtool-1.6.14/debian/patches/748031_signedness.patch 1970-01-01 00:00:00.000000000 +0000 +++ chemtool-1.6.14/debian/patches/748031_signedness.patch 2018-01-16 20:58:34.000000000 +0000 @@ -0,0 +1,50 @@ +Author: Daniel Leidert +Description: Fix conflicting definitions. +Bug-Debian: https://bugs.debian.org/748031 + +--- a/undo.c ++++ b/undo.c +@@ -311,7 +311,7 @@ + UNDO_SUCCESS; + } + +-unsigned ++unsigned int + undo_get_undo_count (void) + { + if (undo_session == NULL) +@@ -320,7 +320,7 @@ + return undo_history_undo_count (undo_session->history); + } + +-unsigned ++unsigned int + undo_get_redo_count (void) + { + if (undo_session == NULL) +--- a/ct.h ++++ b/ct.h +@@ -235,8 +235,8 @@ + extern void pdbrotate(int,int,int); + + #ifdef LIBUNDO +-extern int undo_get_undo_count(); +-extern int undo_get_redo_count(); ++extern unsigned int undo_get_undo_count(); ++extern unsigned int undo_get_redo_count(); + extern int undo_undo(); + extern int undo_undo(); + extern int undo_redo(); +--- a/undo.h ++++ b/undo.h +@@ -49,8 +49,8 @@ + int undo_undo(void); + int undo_redo(void); + +-unsigned undo_get_undo_count(void); +-unsigned undo_get_redo_count(void); ++unsigned int undo_get_undo_count(void); ++unsigned int undo_get_redo_count(void); + + /* Error codes */ + #define UNDO_NOERROR 0 /* No error */ diff -Nru chemtool-1.6.14/debian/patches/866703_cross.patch chemtool-1.6.14/debian/patches/866703_cross.patch --- chemtool-1.6.14/debian/patches/866703_cross.patch 1970-01-01 00:00:00.000000000 +0000 +++ chemtool-1.6.14/debian/patches/866703_cross.patch 2018-01-16 20:58:34.000000000 +0000 @@ -0,0 +1,21 @@ +Author: Helmut Grohne +Acked-by: Daniel Leidert +Description: Consider $ac_tool_prefix for pkg-config to fix FTCBFS. +Bug-Debian: https://bugs.debian.org/866703 + +--- a/configure.ac ++++ b/configure.ac +@@ -28,11 +28,11 @@ + AC_ARG_ENABLE(enable_gtk1, + [ --enable-gtk1 Use GTK+-1.x even if GTK+-2.x is available [no]],enable_gtk1=no) + +-AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++PKG_PROG_PKG_CONFIG + + AC_MSG_CHECKING([for GTK version and compile options ]) + +-if test x$PKG_CONFIG = xno -o x$enable_gtk1 = xyes ; then ++if test x$PKG_CONFIG = x -o x$enable_gtk1 = xyes ; then + AM_PATH_GTK(1.0.2, , exit 1) + else + if $PKG_CONFIG gtk+-2.0 --cflags ; then diff -Nru chemtool-1.6.14/debian/patches/desktop.patch chemtool-1.6.14/debian/patches/desktop.patch --- chemtool-1.6.14/debian/patches/desktop.patch 1970-01-01 00:00:00.000000000 +0000 +++ chemtool-1.6.14/debian/patches/desktop.patch 2018-01-16 20:58:34.000000000 +0000 @@ -0,0 +1,23 @@ +Author: Daniel Leidert +Description: Update .desktop file with + Merge file with values of debian/chemtool.desktop. + +--- a/chemtool.desktop ++++ b/chemtool.desktop +@@ -1,12 +1,12 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=Chemtool + Comment=The molecules drawing program (2D) + Comment[cs]=Kreslení chemických vzorců + Comment[de]=Moleküleditor +-Exec=chemtool +-Icon=chemtool.png ++Exec=chemtool %f ++Icon=chemtool + Terminal=false + Type=Application + MimeType=application/x-chemtool +-Categories=Application;Chemistry ++Categories=Science;Chemistry;Education; ++Keywords=formula;structural formula;chemistry;chemical editor;chemical formula;science; diff -Nru chemtool-1.6.14/debian/patches/series chemtool-1.6.14/debian/patches/series --- chemtool-1.6.14/debian/patches/series 2011-12-29 18:17:46.000000000 +0000 +++ chemtool-1.6.14/debian/patches/series 2018-01-16 20:58:34.000000000 +0000 @@ -0,0 +1,3 @@ +748031_signedness.patch +866703_cross.patch +desktop.patch diff -Nru chemtool-1.6.14/debian/rules chemtool-1.6.14/debian/rules --- chemtool-1.6.14/debian/rules 2013-08-13 21:39:05.000000000 +0000 +++ chemtool-1.6.14/debian/rules 2018-01-16 20:58:34.000000000 +0000 @@ -9,7 +9,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed %: - dh $@ --with autotools_dev --parallel + dh $@ --parallel override_dh_auto_configure: dh_auto_configure -- --without-gnomedir --without-kdedir File /tmp/tmpkOGChC/s97vOuXM9O/chemtool-1.6.14/debian/upstream is a regular file while file /tmp/tmpkOGChC/W_vb80b0oi/chemtool-1.6.14/debian/upstream is a directory