13 files changed, 114 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index 0b00512..0589f86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+flexml (1.9.6-6) unstable; urgency=medium
+
+  * Team upload
+
+  [ Jelmer Vernooĳ ]
+  * Migrate repository from alioth to salsa.
+
+  [ Andreas Tille ]
+  * Secure URI in watch file
+  * d/copyright: DEP5
+  * Standards-Version: 4.7.2 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Remove trailing whitespace in debian/changelog (routine-update)
+  * Remove trailing whitespace in debian/copyright (routine-update)
+  * debian/docs: Removed since installed by upstream Makefile anyway
+  * Permit failure of blhc in Salsa CI
+
+  [ Arnaud Giersch ]
+  * Fix spurious semicolon in generated file
+    Closes: #981730
+
+  [ Lucas Nussbaum ]
+  * Fix FTBFS with GNUMAKEFLAGS=--shuffle=reverse
+    Closes: #1104757, #1105348
+
+ -- Andreas Tille <tille@debian.org>  Sat, 26 Jul 2025 16:06:21 +0200
+
 flexml (1.9.6-5) unstable; urgency=medium
 
   * Do not produce code with sprintf (security vulnerability).
@@ -32,7 +59,7 @@ flexml (1.9.6-2) unstable; urgency=medium
 flexml (1.9.6-1) unstable; urgency=low
 
   * New upstream release:
-    Don't install any file under /usr/share/doc/flexml/flexml/* 
+    Don't install any file under /usr/share/doc/flexml/flexml/*
     Thanks lintian for noticing, and sorry for the short lived v1.9.5.
 
  -- Martin Quinson <mquinson@debian.org>  Tue, 29 Jan 2013 16:12:03 +0100
@@ -75,7 +102,7 @@ flexml (1.9.2-1) unstable; urgency=low
   * New upstream release:
     - Declare *_isset variables properly, even when they are in a header
       [Thx Arnaud Giersch for the BR and patch] Closes: #647605)
-  * debian/control: 
+  * debian/control:
     - add VCS fields, and improve short description
     - update Standard-Version to 3.9.2 (no change needed)
 
@@ -305,7 +332,7 @@ flexml (1.1-1) unstable; urgency=low
 flexml (1-6.1) unstable; urgency=low
 
   * Non-maintainer upload
-  * Change the build-dep to flex-old 
+  * Change the build-dep to flex-old
 
  -- Pierre Machard <pmachard@debian.org>  Wed, 25 Jun 2003 10:25:24 +0200
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index fee6c66..4d9d126 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: flexml
 Section: devel
 Priority: optional
 Maintainer: Martin Quinson <mquinson@debian.org>
-Build-Depends: libwww-perl, debhelper (>= 9),  liburi-perl,
+Build-Depends: libwww-perl, debhelper-compat (= 13),  liburi-perl,
  libdate-calc-perl, flex
-Standards-Version: 3.9.8
+Standards-Version: 4.7.2
 Homepage: http://flexml.sourceforge.net/
-Vcs-Git: git://anonscm.debian.org/collab-maint/flexml.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/flexml.git
+Vcs-Git: https://salsa.debian.org/debian/flexml.git
+Vcs-Browser: https://salsa.debian.org/debian/flexml
 
 Package: flexml
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 4924725..aac4601 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,25 @@
-This package is developed for Debian GNU/Linux on Debian GNU/Linux by
-Kristoffer Rose <krisrose@debian.org> and others.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: flexml
+Source: https://sourceforge.net/projects/flexml/files/flexml/
 
-It is available from <http://flexml.sourceforge.net/>
+Files: *
+Copyright: 1999-2013 Kristoffer Rose <krisrose@debian.org>
+License: GPL-2+
 
-Copyright: (C) 1999-2010 Kristoffer Rose <krisrose@debian.org>
-License: GNU GPL-2+ (see /usr/share/common-licenses/GPL-2).
+Files: debian/*
+Copyright: 1999-2003 Kristoffer Rose <krisrose@debian.org>
+           2005-2016 Martin Quinson <mquinson@debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ (see /usr/share/common-licenses/GPL-2).
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e69de29..0000000
--- a/debian/dirs
+++ /dev/null
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 10ce222..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README
-NOTES
-TODO
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index a857020..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-flexml.1
diff --git a/debian/patches/fix_spurious_semicolon.patch b/debian/patches/fix_spurious_semicolon.patch
new file mode 100644
index 0000000..ec8a7cf
--- /dev/null
+++ b/debian/patches/fix_spurious_semicolon.patch
@@ -0,0 +1,22 @@
+From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
+Date: 2021-02-03
+Bug-Debian: https://bugs.debian.org/981730
+Description: Fix spurious semicolon in generated file
+ Sometimes a semicolon is spuriously doubled in the generated C file.
+ For example:
+   LEAVE; STag_surfxml_trace();pushbuffer(surfxml_pcdata_ix); BUFFERSET(surfxml_pcdata_ix);; ENTER(IN_trace);
+
+ This patch should fix that.
+
+
+--- a/flexml.pl
++++ b/flexml.pl
+@@ -1489,7 +1489,7 @@ if ($scanner or $standalone) {
+ 	}
+ 	print "  LEAVE; STag_${tagprefix}$myctag();"
+ 	    . (%inmixed ? ' pushbuffer('."${tagprefix}".'pcdata_ix);' : '')
+-	    . ($mixed{$tag} ? 'pushbuffer('."${tagprefix}".'pcdata_ix); BUFFERSET('."${tagprefix}".'pcdata_ix);' : "${tagprefix}".'pcdata_ix = 0'). ";"
++	    . ($mixed{$tag} ? 'pushbuffer('."${tagprefix}".'pcdata_ix); BUFFERSET('."${tagprefix}".'pcdata_ix)' : "${tagprefix}".'pcdata_ix = 0'). ";"
+ 	    . " ENTER($startstate{$tag});\n";
+ 	print " }\n";
+ 	#
diff --git a/debian/patches/makefile_enable_parallel.patch b/debian/patches/makefile_enable_parallel.patch
new file mode 100644
index 0000000..d310256
--- /dev/null
+++ b/debian/patches/makefile_enable_parallel.patch
@@ -0,0 +1,17 @@
+From: Lucas Nussbaum <lucas@debian.org>
+Last-Update: 2025-05-05
+Bug-Debian: https://bugs.debian.org/1104757
+            https://bugs.debian.org/1105348
+Subject: Fix FTBFS with GNUMAKEFLAGS=--shuffle=reverse
+
+--- a/Makefile
++++ b/Makefile
+@@ -106,7 +106,7 @@ endif
+ flexml-act.l:		flexml-act.dtd skel
+ 	$(PERL) ./flexml.pl $(FLEXDEBUG) -Lv -ractions -s skel $<
+ 
+-flexml-act.c:		flexml-act.l
++flexml-act.h flexml-act.c:		flexml-act.l
+ 	$(FLEX) -B -s -v -oflexml-act.c flexml-act.l
+ 
+ flexml-act.o:		flexml-act.c flexml-act.h
diff --git a/debian/patches/series b/debian/patches/series
index d740a8a..88106ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ sort-parts
 privacy_breach
 FTBFS-pedantic
 no-sprintf
+fix_spurious_semicolon.patch
+makefile_enable_parallel.patch
diff --git a/debian/rules b/debian/rules
index 657234c..279ef70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,3 +5,9 @@
 
 %:
 	dh $@
+
+override_dh_installexamples:
+	# Upstream Makefile installs a couple of examples without write permissions.
+	# Just make dh_installexamples work
+	chmod u+w debian/flexml/usr/share/doc/flexml/examples/*
+	dh_installexamples
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..74cb133
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,8 @@
+# See https://salsa.debian.org/salsa-ci-team/pipeline/#basic-use
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+# Permit failure of blhc
+blhc:
+  allow_failure: true
diff --git a/debian/watch b/debian/watch
index 2cbd198..c8fba1f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-http://sf.net/flexml/flexml-(.+)\.tar\.gz
+version=4
+https://sf.net/flexml/flexml-(.+)\.tar\.gz