diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 05:26:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 05:26:04 +0000 |
| commit | a2a22b9555faa0ecc1ed4a401ca132b6f094ecc4 (patch) | |
| tree | 48866a1acefb408a9dc8ba4570cc0698a20af227 /debian | |
| parent | Merging upstream version 2.9.2. (diff) | |
| download | lynx-a2a22b9555faa0ecc1ed4a401ca132b6f094ecc4.tar.xz lynx-a2a22b9555faa0ecc1ed4a401ca132b6f094ecc4.zip | |
Merging debian version 2.9.2-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/40_out-of-tree-build.diff | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 11 |
4 files changed, 32 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index a6c299e..ac5a14e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lynx (2.9.2-1) unstable; urgency=medium + + * New upstream version. + * Add 40_out-of-tree-build.diff to allow out of tree build. + * Use out-of-tree build. + + -- Andreas Metzler <ametzler@debian.org> Sat, 01 Jun 2024 07:52:53 +0200 + lynx (2.9.1-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/patches/40_out-of-tree-build.diff b/debian/patches/40_out-of-tree-build.diff new file mode 100644 index 0000000..ac7e581 --- /dev/null +++ b/debian/patches/40_out-of-tree-build.diff @@ -0,0 +1,17 @@ +Description: Fix FTBFS with out-of-tree builds. +Author: Andreas Metzler <ametzler@debian.org> +Origin: vendor +Forwarded: no +Last-Update: 2024-04-21 + +--- lynx-2.9.1.orig/po/makefile.inn ++++ lynx-2.9.1/po/makefile.inn +@@ -118,7 +118,7 @@ all-yes: $(SOURCES) $(CATALOGS) + all-no: + + en.po : +- msginit --no-translator -l en -i $(PACKAGE).pot ++ msginit --no-translator -l en -i $(srcdir)/$(PACKAGE).pot + # cygwin's msginit 1.19.3 creates "en_US.po" rather than "en.po"... + @$(SHELL) -c 'for n in en*.po; \ + do \ diff --git a/debian/patches/series b/debian/patches/series index 75da15a..4dfe62f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ aboutlynx.patch 21_do_not_strip_-g.diff nested_tables.patch 30_build_path_in_binary.diff +40_out-of-tree-build.diff diff --git a/debian/rules b/debian/rules index 1a89d53..4e5e3ef 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND := -Wall -DNO_BUILDSTAMP +BDIR = -O--builddirectory=build SSL=ssl @@ -20,7 +21,7 @@ endif env cf_cv_SYSTEM_MAIL=/usr/sbin/sendmail \ LIBS="-lbsd" \ - dh_auto_configure --verbose -- \ + dh_auto_configure $(BDIR) --verbose -- \ --enable-8bit-toupper \ --enable-cgi-links \ --enable-cjk \ @@ -57,10 +58,10 @@ endif $(CONFTLS) override_dh_autoreconf: - dh_autoreconf autoreconf-dickey -- -f -i + dh_autoreconf $(BDIR) autoreconf-dickey -- -f -i override_dh_auto_install: - dh_auto_install --verbose -- install-full + dh_auto_install $(BDIR) --verbose -- install-full cd debian/tmp/usr/share/lynx_help && rm -vf COPYING COPYHEADER cd debian/tmp/usr/share/lynx_doc && rm -rvf CHANGES \ COPYHEADER.asc COPYING COPYING.asc samples test @@ -71,7 +72,7 @@ override_dh_auto_install: override_dh_link: rm -fv debian/lynx/usr/share/doc/lynx/changelog - dh_link + dh_link $(BDIR) %: - dh $@ + dh $@ --builddirectory=build |