diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2020-05-20 22:12:43 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2020-05-20 22:12:43 -0700 |
| commit | 9a63bbbb56fdb3420799b1c9e46e251decf52932 (patch) | |
| tree | c4b6dfe67dd585be71a0e5ed9d64f7fb5034e7a9 | |
| parent | 588705993b596b98dabb5a582fd54a22791043f9 (diff) | |
fix(paths): correct path specificans in the rulesdebian/2.6.4-7archive/debian/2.6.4-7
Do not embed build paths in example fiol;es, and pass paths to the
configure script to standardize pathnames on ustmerge systems.
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rwxr-xr-x | debian/rules | 15 |
4 files changed, 29 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index a99d649..e9c0fcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +flex (2.6.4-7) unstable; urgency=medium + + * Ack NMUS. Thanks Ruben Undheim and Niels Thykier <niels@thykier.net> + * Bug fix: "Embeds build paths in example Makefiles", thanks to Vagrant + Cascadian (Closes: #949343). + * Bug fix: "Embeds paths to various binaries differently on usrmerge + system", thanks to Vagrant Cascadian (Closes: #949342). + + -- Manoj Srivastava <srivasta@debian.org> Wed, 20 May 2020 22:06:34 -0700 + flex (2.6.4-6.2) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index b50c08e..95246f8 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,15 @@ Source: flex -VCS-Git: https://anonscm.debian.org/git/users/srivasta/debian/flex.git -VCS-Browser: https://anonscm.debian.org/gitweb/?p=users/srivasta/debian/flex.git +VCS-Git: https://salsa.debian.org/srivasta/flex.git +VCS-Browser: https://salsa.debian.org/srivasta/flex Section: devel Homepage: https://github.com/westes/flex Priority: optional Build-Depends: bison, gettext, texinfo, help2man, file, po-debconf, - debhelper (>= 11), dh-autoreconf, dpkg-dev (>= 1.17.14), + debhelper-compat (= 12), dh-autoreconf, dpkg-dev (>= 1.17.14), flex <cross> Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended, cm-super-minimal Maintainer: Manoj Srivastava <srivasta@debian.org> -Standards-Version: 4.1.3 +Standards-Version: 4.3.0 Rules-Requires-Root: no Package: flex diff --git a/debian/rules b/debian/rules index f8ee94e..015f80a 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,8 @@ DEB_REVISION := $(strip $(shell echo $(DEB_NOEPOCH_VERSION) DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') confflags = ac_cv_lib_util_getloadavg=no +# Pass variables to ensure reproducible builds when built on usrmerge system +confflags += GREP=/bin/grep MKDIR_P="/bin/mkdir -p" SED=/bin/sed SHELL=/bin/bash ifneq ($(DEB_BUILD_MULTIARCH),$(DEB_HOST_MULTIARCH)) confflags += ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes endif @@ -90,6 +92,19 @@ ifneq (,$(filter flex-doc, $(shell dh_listpackages))) debian/flex-doc/usr/share/doc/flex-doc/ endif +override_dh_installexamples: + dh_installexamples + # Clean up embedded build paths in order to ensure reproducible builds. + sed -i -e "s,-fdebug-prefix-map=$(CURDIR)=\.,,g" \ + -e "s,-ffile-prefix-map=$(CURDIR)=\.,,g" \ + -e "s,abs_.*$(CURDIR).*,,g" \ + -e "s,$(CURDIR).*missing --run,,g" \ + -e "s,$(CURDIR),./,g" \ + $(CURDIR)/debian/flex/usr/share/doc/flex/examples/fastwc/Makefile \ + $(CURDIR)/debian/flex/usr/share/doc/flex/examples/manual/Makefile + + + override_dh_auto_build: dh_auto_build ifneq (,$(filter flex-doc, $(shell dh_listpackages))) |