Adding debian version 2.9.2-1.debian/2.9.2-1debian

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 32 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 0e1b708..1040247 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) unstable; urgency=medium
 
   * New upstream version.
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 f995c54..fde709e 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=gnu
 # uncomment the next line if you want openssl version
@@ -22,7 +23,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 \
@@ -59,10 +60,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
@@ -73,7 +74,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