diff options
| author | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-17 11:45:51 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-17 12:46:27 -0700 |
| commit | bc29909df3c662da30d80f22ded71b05988ac965 (patch) | |
| tree | e36e739c427166c1bb917b615ba0e92b4d2c8b86 /debian | |
| parent | 86d91eea2ddacdbbcff932bce2b91aeaf70ab965 (diff) | |
[master]: Move libl.a from flex to libfl-dev
install link manually for libfl-dev alone, cleaning up the rules file in the process.
Signed-off-by: Manoj Srivastava <srivasta@ieee.org>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/flex.links | 2 | ||||
| -rwxr-xr-x | debian/rules | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 4ccfe9d..0ad28e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +flex (2.5.39-3) unstable; urgency=medium + + * Move libl.a from flex to libfl-dev, for real + * install link manually for libfl-dev alone, cleaning up the rules file + in the process. + + -- Manoj Srivastava <srivasta@debian.org> Thu, 17 Apr 2014 12:45:38 -0700 + flex (2.5.39-2) unstable; urgency=low * New bug fixing release @@ -19,7 +27,6 @@ flex (2.5.39-2) unstable; urgency=low flex (2.5.39-1) unstable; urgency=medium - * New upstream release * internationalization: added support for various languages. Fix make install target to not fail when the flex++ program is already @@ -42,7 +49,6 @@ flex (2.5.39-1) unstable; urgency=medium build system in the NMU are not needed, dh does the right thing. * The new upstream release added the prototypes in re-entrant mode, so we are no longer carrying those patches. - -- Manoj Srivastava <srivasta@debian.org> Thu, 10 Apr 2014 18:06:12 -0700 flex (2.5.35-10.1) unstable; urgency=low diff --git a/debian/flex.links b/debian/flex.links index d0c4988..2f02305 100644 --- a/debian/flex.links +++ b/debian/flex.links @@ -1 +1,3 @@ usr/bin/flex usr/bin/lex +usr/share/man/man1/flex.1.gz usr/share/man/man1/flex++.1.gz +usr/share/man/man1/flex.1.gz usr/share/man/man1/lex.1.gz diff --git a/debian/rules b/debian/rules index 9ee7e16..9034cf5 100755 --- a/debian/rules +++ b/debian/rules @@ -36,15 +36,13 @@ override_dh_install: find debian/tmp/lib/$(DEB_HOST_MULTIARCH) -type f \ -name \*.la -exec rm {} \; dh_install +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 - dh_link usr/lib/$(DEB_HOST_MULTIARCH)/libfl.a usr/lib/$(DEB_HOST_MULTIARCH)/libl.a - test ! -e debian/flex/usr/lib/$(DEB_HOST_MULTIARCH)/libf.a || \ - mv debian/flex/usr/lib/$(DEB_HOST_MULTIARCH)/libf.a \ - debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ - test ! -d debian/flex/usr/lib/$(DEB_HOST_MULTIARCH) || \ - rmdir debian/flex/usr/lib/$(DEB_HOST_MULTIARCH) || true + ln -s libfl.a debian/libfl-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libl.a +endif + dh_link override_dh_installdocs: @@ -70,7 +68,7 @@ override_dh_auto_build: bash -n debian/flex.postinst bash -n debian/flex.prerm -override_dh_installman: +verride_dh_installman: dh_installman dh_link usr/share/man/man1/flex.1 usr/share/man/man1/flex++.1 dh_link usr/share/man/man1/flex.1 usr/share/man/man1/lex.1 |