diff options
| -rw-r--r-- | debian/README.Debian | 23 | ||||
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/clean | 18 | ||||
| -rw-r--r-- | debian/flex.docs | 1 | ||||
| -rw-r--r-- | debian/libfl-dev.docs | 1 | ||||
| -rw-r--r-- | debian/libfl.shared_object | 22 | ||||
| -rwxr-xr-x | debian/rules | 9 |
7 files changed, 33 insertions, 56 deletions
diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 78daa5e..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,23 +0,0 @@ - - Starting with version 2.5.31-18 of flex we have started providing - a static library compiled with position independent code, namely, - libfl_pic.a. The problem is with packages that contain shared - libraries with a flex scanner compiled in. Since flex generates code - that is not self contained, and the missing symbols live in - libfl.a. However, since linking a shared library with a object - containing non position independent code stopped working with gcc 4.1 - (apparently, it was sheer luck that it worked at all). So now we also - provide libfl_pic.a for shared library packages to link with. - - An alternative would have been to provide a full fledged - shared library, but that would have been a major break with upstream - and other distributions that also have flex, and would entail - creating new library and devel packages for flex, which is more work - that seems justified (considering that we would have to maintain the - fork, and keep track of any ABI changes, and all that). - - manoj - -arch-tag: 7421b315-d205-4e09-9a81-0fef07ba57b7 - - -- Manoj Srivastava <srivasta@debian.org>, Thu, 17 Apr 2014 01:11:31 -0700 diff --git a/debian/changelog b/debian/changelog index 95ec609..d6e43f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +flex (2.6.4-3) unstable; urgency=medium + + * Bug fix: "Debian-specific libfl.so linker script causes FTBFS", thanks + to Adrian Bunk (Closes: #890415). + * Bug fix: "Does not provide suitable libfl.a for PIEs", thanks to James + Clarke. I undertand that gcc now builds with PIE (Closes: #870769). + * Bug fix: "libfl_pic.a is not compiled with -fPIC", thanks to Balint + Reczey. We no longer provide that library. (Closes: #837658). + * Bug fix: "Type of yy_n_chars changed to yy_size_t by authors cause bug + in YY_INPUT macro where result argument is tested if < 0; thanks to + gcc's -Werror=type-limits", thanks to calculus@rezozer.net</a>; + the change has been reverted in the new upstream. (Closes: #770161). + + -- Manoj Srivastava <srivasta@debian.org> Thu, 15 Feb 2018 12:14:50 -0800 + flex (2.6.4-2) unstable; urgency=medium * Added get-orig-source target, and updated the watch file diff --git a/debian/clean b/debian/clean index c3cf3f0..4d50a7b 100644 --- a/debian/clean +++ b/debian/clean @@ -1,6 +1,7 @@ INSTALL Makefile.in aclocal.m4 +autom4te.cache/ build-aux/compile build-aux/config.guess build-aux/config.sub @@ -9,6 +10,22 @@ build-aux/install-sh build-aux/mdate-sh build-aux/texinfo.tex configure +debian/.debhelper/ +debian/autoreconf.after +debian/autoreconf.before +debian/files +debian/flex-doc.debhelper.log +debian/flex-doc.substvars +debian/flex-doc/ +debian/flex.debhelper.log +debian/flex.substvars +debian/flex/ +debian/libfl-dev.debhelper.log +debian/libfl-dev.substvars +debian/libfl-dev/ +debian/tmp/ +doc/flex.html/ +doc/flex.t2p/ doc/Makefile.in doc/flex.1 doc/flex.info @@ -20,5 +37,6 @@ examples/Makefile.in examples/fastwc/Makefile.in examples/manual/Makefile.in src/config.h.in +src/.libs/ tests/Makefile.in tools/Makefile.in diff --git a/debian/flex.docs b/debian/flex.docs index b5a2dc0..bfb28b4 100644 --- a/debian/flex.docs +++ b/debian/flex.docs @@ -5,5 +5,4 @@ NEWS ONEWS ABOUT-NLS AUTHORS -debian/README.Debian debian/NEWS.Debian diff --git a/debian/libfl-dev.docs b/debian/libfl-dev.docs index d2c16fd..8debbb5 100644 --- a/debian/libfl-dev.docs +++ b/debian/libfl-dev.docs @@ -1,3 +1,2 @@ README -debian/README.Debian debian/NEWS.Debian diff --git a/debian/libfl.shared_object b/debian/libfl.shared_object deleted file mode 100644 index c349c46..0000000 --- a/debian/libfl.shared_object +++ /dev/null @@ -1,22 +0,0 @@ -/* GNU ld script - * -*- Mode: C -*- - * libfl.so --- - * Author : Manoj Srivastava ( srivasta@golden-gryphon.com ) - * Created On : Mon Sep 11 13:25:55 2006 - * Created On Node : glaurung.internal.golden-gryphon.com - * Last Modified By : Manoj Srivastava - * Last Modified On : Tue Sep 12 03:34:30 2006 - * Last Machine Used: glaurung.internal.golden-gryphon.com - * Update Count : 2 - * Status : Unknown, Use with caution! - * HISTORY : - * Description : - * - * GNU ld script - * When shared linking is requested, map the request to the PIC static - * library, which is the closest we come to a shared library here. - * - * arch-tag: ce35efb4-3893-42c7-bdcb-56d95beba2ac - */ - -INPUT( /usr/lib/#DEB_HOST_MULTIARCH#/libfl_pic.a ) diff --git a/debian/rules b/debian/rules index 7b03f9b..6b82df1 100755 --- a/debian/rules +++ b/debian/rules @@ -50,17 +50,8 @@ override_dh_auto_configure: sed -i -e 's/^dist_doc_DATA[[:space:]]*=.*/dist_doc_DATA=/' doc/Makefile override_dh_install: - test ! -d debian/tmp/lib/$(DEB_HOST_MULTIARCH) || \ - find debian/tmp/lib/$(DEB_HOST_MULTIARCH) -type f \ - -name \*.la -exec rm {} \; dh_install rm -f debian/flex/usr/share/doc/flex/flex.pdf -ifneq (,$(filter libfl-dev, $(shell dh_listpackages))) - $(make_directory) debian/libfl-dev/usr/lib - sed -e 's,#DEB_HOST_MULTIARCH#,$(DEB_HOST_MULTIARCH),' \ - debian/libfl.shared_object > debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libfl.so - ln -s libfl.a debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libl.a -endif ifneq (,$(filter flex, $(shell dh_listpackages))) test ! -f debian/flex/usr/share/doc/flex/COPYING || rm -f debian/flex/usr/share/doc/flex/COPYING endif |