merge from master into developdevelop

5 files changed, 112 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 654ac41..369cfe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xsd (4.0.0-10) UNRELEASED; urgency=medium
+
+  * Declare compliance with Debian Policy 4.7.2 (No changes needed).
+  * debian/control:
+    - Change Vcs-* to new URL.
+  * debian/copyright:
+    - Add year 2025 to myself.
+    - Rewrite to make lrc happy.
+  * debian/patches/0110-xerces-c3.2.patch:
+    - Remove Bug-Field.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 19 Mar 2025 07:34:21 +0100
+
 xsd (4.0.0-9) unstable; urgency=medium
 
   * Migrate to debhelper 13:
diff --git a/debian/control b/debian/control
index 91e94ec..9074f1b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,10 @@ Build-Depends:
  libboost-regex-dev,
  libxerces-c-dev (>= 3),
  m4
-Standards-Version: 4.6.0.0
+Standards-Version: 4.7.2
 Homepage: http://codesynthesis.com
-Vcs-Git: git://jff.email/opt/git/xsd.git
-Vcs-Browser: https://jff.email/cgit/xsd.git/
+Vcs-Git: https://git.jff.email/cgit/xsd.git
+Vcs-Browser: https://git.jff.email/cgit/xsd.git
 
 Package: xsdcxx
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 8af26f2..faeae23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,31 @@ Upstream-Contact: xsd-user Maillist <xsd-users@codesynthesis.com>
 Source: https://www.codesynthesis.com/download/xsd/
 
 Files: *
-Copyright: Copyright (©) 2005-2014  CODE SYNTHESIS TOOLS CC
-License: GPL-2+ and FLOSS
+Copyright: 2005-2014  CODE SYNTHESIS TOOLS CC
+License: GPL-2
+
+Files: libcutl/*
+       libxsd-frontend/build/import/libcutl/configuration-rules.make
+       libxsd-frontend/build/import/libcutl/configure
+       libxsd-frontend/build/import/libcutl/stub.make
+       xsd/build/import/cli/cli-cxx.make
+       xsd/build/import/cli/configuration-rules.make
+       xsd/build/import/cli/configure
+       xsd/build/import/cli/LICENSE
+       xsd/build/import/cli/stub.make
+       xsd/build/import/libcutl/configuration-rules.make
+       xsd/build/import/libcutl/configure
+       xsd/build/import/libcutl/stub.make
+Copyright: 2005-2014  CODE SYNTHESIS TOOLS CC
+License: Expat
+
+Files: libcutl/m4/threads.m4
+Copyright: 2005-2014  CODE SYNTHESIS TOOLS CC
+License: GPL-2
+
+Files: build-0.3/install/install-sh
+Copyright: 1994       X Consortium
+License: X11
 
 Files: xsd/doc/custom-literals.xsd
        xsd/examples/cxx/parser/generated/library.*
@@ -83,15 +106,15 @@ Files: xsd/doc/cxx/tree/guide/cxx-tree-guide.*
        xsd/doc/cxx/parser/guide/index.xhtml
        xsd/doc/cxx/parser/guide/guide.html2ps
        xsd/doc/xsd.*
+       xsd/doc/xsd-epilogue.1
 Copyright: 2005-2014 CODE SYNTHESIS TOOLS CC
 License: GFDL-1.2
 
 Files: debian/*
 Copyright: 2008      Raphael Bossek <bossekr@debian.org>
-           2014-2020 Jörg Frings-Fürst <debian@jff.email>
+           2014-2025 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-1+
 
-
 License: GFDL-1.2
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.2
@@ -232,3 +255,66 @@ License: FLOSS
     You may choose to redistribute a copy of the Program exclusively under
     the terms of the GPL by removing the FLOSS Exception notice from that
     copy of the Program.
+
+License: X11
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+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 version
+ 2 of the License.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/lrc.config b/debian/lrc.config
new file mode 100644
index 0000000..44d7e61
--- /dev/null
+++ b/debian/lrc.config
@@ -0,0 +1,6 @@
+libcutl/LICENSE
+libxsd-frontend/build/import/libcutl/LICENSE
+xsd/build/import/libcutl/LICENSE
+xsd/FLOSSE
+xsd/libxsd/FLOSSE
+
diff --git a/debian/patches/0110-xerces-c3.2.patch b/debian/patches/0110-xerces-c3.2.patch
index b15960b..17ff21b 100644
--- a/debian/patches/0110-xerces-c3.2.patch
+++ b/debian/patches/0110-xerces-c3.2.patch
@@ -1,7 +1,6 @@
 Description: Remove tests for character ref. values unsupported by Xerces-C++ 3.2
 Author: Boris Kolpackov <boris@codesynthesis.com>
 Origin: https://git.codesynthesis.com/cgit/xsd/xsd/patch/?id=400651ba7fd2f80155348ed39fc02e2aa9892fb9
-Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881108
 Forwarded: not-needed
 Last-Update: 2017-11-08