From 921fc67c4879e3bad500f9cbe7e63c74442827e6 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Wed, 21 Feb 2018 15:29:20 -0800 Subject: [master]: A bug fixing release Rolled backt he POSIX_X_SOURCE feature check changes. Closes: #890608 Closes: #890714 Closes: #890743 Closes: #890703 Signed-off-by: Manoj Srivastava --- debian/changelog | 15 ++ debian/compat | 2 +- debian/control | 7 +- debian/copyright | 516 +++++++++++++++++++++++++++++++++++++++++++++++++- debian/flex-doc.docs | 2 +- debian/flex.docs | 9 +- debian/libfl-dev.docs | 2 +- debian/libfl2.docs | 2 +- debian/rules | 9 +- src/flex.skl | 8 - 10 files changed, 546 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23ae296..c677692 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +flex (2.6.4-6) unstable; urgency=medium + + * Rolled back the feature test POSIX_C_SOURCE changes. + * Bug fix: "libfl-dev lost libl.a symlink", thanks to Bas Couwenberg + (Closes: #890608). Made sure the link actually did make it to the + .deb + * Bug fix: "Incomplete debian/copyright?", thanks to Chris Lamb (Closes: + #890714). Updated copyright using automation tools + * Bug fix: "missing dependency on libfl2", thanks to Sven Joachim + (Closes: #890743). Updated contreol + * Bug fix: "all amd64 binaries since 2.6.4-1 built with stale skel.c + file", thanks to James Cowgill (Closes: #890703). + + -- Manoj Srivastava Wed, 21 Feb 2018 15:25:10 -0800 + flex (2.6.4-5) unstable; urgency=medium * Added a new libfl2 package. diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 649de5e..53e18ff 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Section: devel Homepage: https://github.com/westes/flex Priority: optional Build-Depends: bison, gettext, texinfo, help2man, file, po-debconf, - debhelper (>= 10), dh-autoreconf, dpkg-dev (>= 1.17.14), + debhelper (>= 11), dh-autoreconf, dpkg-dev (>= 1.17.14), flex Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended, cm-super-minimal Maintainer: Manoj Srivastava @@ -14,8 +14,7 @@ Standards-Version: 4.1.3 Package: flex Architecture: any Pre-Depends: debconf | debconf-2.0 -Depends: ${shlibs:Depends}, m4, - dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Depends: ${shlibs:Depends}, m4, ${misc:Depends} Recommends: gcc | c-compiler, libfl-dev Suggests: bison, build-essential, flex-doc Multi-Arch: foreign @@ -69,7 +68,7 @@ Package: libfl-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, flex (= ${binary:Version}) +Depends: ${misc:Depends}, flex (= ${binary:Version}), libfl2 (= ${binary:Version}) Replaces: flex (<< 2.5.39), flex-old (<= 2.5.4a-10) Breaks: flex (<< 2.5.39), flex-old (<= 2.5.4a-10) Description: static library for flex (a fast lexical analyzer generator) diff --git a/debian/copyright b/debian/copyright index 8f58e3b..0925f09 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: flex Upstream-Contact: flex-help@lists.sourceforge.net Source: git://git.code.sf.net/p/flex/flex @@ -7,7 +7,7 @@ Comment: This is the Debian prepackaged version of flex, the fast lexical Robert Leslie . It is currently maintained by Manoj Srivastava , who took over from Santiago Vila , and it is built from - sources obtained from: http://flex.sourceforge.net/ + sources obtained from: https://github.com/westes/flex Files: * Copyright: 2001-2008 The Flex Project. @@ -53,9 +53,517 @@ License: FLEX for them, you are not even bound by the above copyright. Files: debian/* -Copyright: 2003-2009, 2014-2016 Manoj Srivastava +Copyright: 2003-2009, 2014-2016, Manoj Srivastava License: GPL-3+ +Files: m4/* +Copyright: 1994-2015, Free Software Foundation, Inc. +License: FLEX + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: m4/ax_prog_cc_for_build.m4 +Copyright: 2008, Paolo Bonzini +License: FSFAP + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: m4/libtool.m4 +Copyright: 1996-2001, 2003-2015, Free Software Foundation, Inc. +License: GPL + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: m4/ltoptions.m4 + m4/ltsugar.m4 + m4/lt~obsolete.m4 +Copyright: 2004, 2005, 2007-2009, 2011-2015, Free Software +License: FLEX + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: m4/nls.m4 +Copyright: 1995-2003, 2005, 2006, 2008-2010, Free Software Foundation +License: FLEX + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: po/Makefile.in.in +Copyright: 1995-1997, 2000-2007, 2009, 2010, Ulrich Drepper +License: GPL + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: po/Makevars +Copyright: for their translations to this person +License: FLEX + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: src/* +Copyright: 1990, 1993, The Regents of the University of California. +License: FLEX + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: src/Makefile.am + src/filter.c + src/flexint.h + src/libfl.pc.in + src/libmain.c + src/libyywrap.c + src/mkskel.sh + src/regex.c + src/scan.c + src/skel.c + src/version.h +Copyright: 2001-2008 The Flex Project. + 1990, 1993, 1997 The Regents of the University of California. + All rights reserved. +License: FLEX + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: src/gettext.h +Copyright: 1995-1998, 2000-2002, Free Software Foundation, Inc. +License: LGPL-2+ + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: src/parse.c + src/parse.h +Copyright: 1984, 1989, 1990, 2000-2015, Free Software Foundation, Inc. +License: GPL-3+ + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + +Files: tools/git2cl +Copyright: 2007, Luis Mondesi + 2007, 2008, Simon Josefsson +License: GPL-2+ + Flex carries the copyright used for BSD software, slightly modified + because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, + which operates under a contract with the Department of Energy: + . + This code is derived from software contributed to Berkeley by + Vern Paxson. + . + The United States Government has rights in this work pursuant + to contract no. DE-AC03-76SF00098 between the United States + Department of Energy and the University of California. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. + . + This basically says "do whatever you please with this software except + remove this notice or take advantage of the University's (or the flex + authors') name". + . + Note that the "flex.skl" scanner skeleton carries no copyright notice. + You are free to do whatever you please with scanners generated using flex; + for them, you are not even bound by the above copyright. + License: GPL-3+ 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 @@ -68,7 +576,7 @@ License: GPL-3+ 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, see . + along with this program. If not, see . . On Debian systems, the complete text of the GNU General Public License can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/flex-doc.docs b/debian/flex-doc.docs index 8bd1921..9f1cde0 100644 --- a/debian/flex-doc.docs +++ b/debian/flex-doc.docs @@ -1,3 +1,3 @@ -README +README.md doc/flex.html/ doc/flex.pdf diff --git a/debian/flex.docs b/debian/flex.docs index bfb28b4..1f1b949 100644 --- a/debian/flex.docs +++ b/debian/flex.docs @@ -1,8 +1,7 @@ -README -TODO -THANKS -NEWS -ONEWS ABOUT-NLS AUTHORS +NEWS +ONEWS +README.md +THANKS debian/NEWS.Debian diff --git a/debian/libfl-dev.docs b/debian/libfl-dev.docs index 8debbb5..50fba66 100644 --- a/debian/libfl-dev.docs +++ b/debian/libfl-dev.docs @@ -1,2 +1,2 @@ -README +README.md debian/NEWS.Debian diff --git a/debian/libfl2.docs b/debian/libfl2.docs index 8debbb5..50fba66 100644 --- a/debian/libfl2.docs +++ b/debian/libfl2.docs @@ -1,2 +1,2 @@ -README +README.md debian/NEWS.Debian diff --git a/debian/rules b/debian/rules index fb2b6d6..e676497 100755 --- a/debian/rules +++ b/debian/rules @@ -67,6 +67,9 @@ override_dh_install: test ! -d debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH) || \ find debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH) \ -name libfl.so.\* -exec rm {} \; + test ! -f debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libfl.a || \ + ln -s libfl.a \ + debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libl.a rm -f debian/flex/usr/share/doc/flex/flex.pdf test ! -f debian/flex/usr/share/doc/flex/COPYING || \ rm -f debian/flex/usr/share/doc/flex/COPYING @@ -77,8 +80,12 @@ override_dh_install: override_dh_installdocs: dh_installdocs ifneq (,$(filter flex-doc, $(shell dh_listpackages))) - mv debian/flex-doc/usr/share/doc/flex-doc/flex.html \ + mv debian/flex-doc/usr/share/doc/flex/flex.html/ \ debian/flex-doc/usr/share/doc/flex-doc/html + mv debian/flex-doc/usr/share/doc/flex/flex.pdf \ + debian/flex-doc/usr/share/doc/flex-doc/ + mv debian/flex-doc/usr/share/doc/flex/README.md \ + debian/flex-doc/usr/share/doc/flex-doc/ endif override_dh_auto_build: diff --git a/src/flex.skl b/src/flex.skl index aae5560..ba194a2 100644 --- a/src/flex.skl +++ b/src/flex.skl @@ -218,14 +218,6 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]], /* begin standard C headers. */ %if-c-only -m4_ifdef( [[M4_YY_ALWAYS_INTERACTIVE]], , -[[m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]], , -[[#ifndef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 200809 /* for fileno() */ -#ifndef _POSIX_SOURCE -#define _POSIX_SOURCE 1 -#endif -#endif]])]]) #include #include #include -- cgit v1.2.3