6 files changed, 27 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 0859c37..8308bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libxerces2-java (2.12.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+  * Standards-Version updated to 4.6.0.1
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 03 May 2022 14:45:03 +0200
+
 libxerces2-java (2.12.1-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index bfcedd0..718be11 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  libxml-commons-external-java (>= 1.4.01-2),
  libxml-commons-resolver1.1-java,
  maven-repo-helper
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0.1
 Vcs-Git: https://salsa.debian.org/java-team/libxerces2-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libxerces2-java
 Homepage: http://xerces.apache.org/xerces2-j/
diff --git a/debian/patches/01_xjavac_taskdef.patch b/debian/patches/01_xjavac_taskdef.patch
index e9a4326..f9cd2a5 100644
--- a/debian/patches/01_xjavac_taskdef.patch
+++ b/debian/patches/01_xjavac_taskdef.patch
@@ -1,5 +1,3 @@
-Index: b/build.xml
-===================================================================
 --- a/build.xml
 +++ b/build.xml
 @@ -39,7 +39,7 @@
@@ -11,7 +9,7 @@ Index: b/build.xml
      <classpath>
        <pathelement location="${tools.dir}/bin/xjavac.jar"/>
      </classpath>
-@@ -291,7 +291,7 @@
+@@ -294,7 +294,7 @@
             source="${javac.source}"
             target="${javac.target}"
             classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
@@ -20,7 +18,7 @@ Index: b/build.xml
             debuglevel="${debuglevel}"
             deprecation="${deprecation}"
             optimize="${optimize}"
-@@ -359,7 +359,7 @@
+@@ -362,7 +362,7 @@
             source="${javac.source}"
             target="${javac.target}"
             classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
@@ -29,7 +27,7 @@ Index: b/build.xml
             debuglevel="${debuglevel}"
             includeAntRuntime="false"
             includeJavaRuntime="true"/>
-@@ -379,7 +379,7 @@
+@@ -382,7 +382,7 @@
             source="${javac.source}"
             target="${javac.target}"
             classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
diff --git a/debian/patches/02_build_dont_unzip.patch b/debian/patches/02_build_dont_unzip.patch
index a378502..7579a3d 100644
--- a/debian/patches/02_build_dont_unzip.patch
+++ b/debian/patches/02_build_dont_unzip.patch
@@ -1,6 +1,6 @@
 --- a/build.xml
 +++ b/build.xml
-@@ -247,7 +247,7 @@
+@@ -250,7 +250,7 @@
      <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
        tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
  
@@ -9,7 +9,7 @@
      <unzip src="${src.apis.zip}" dest="${build.src}">
          <patternset
              includes="org/xml/sax/** 
-@@ -270,6 +270,7 @@
+@@ -273,6 +273,7 @@
                  org/w3c/dom/xpath/**"
          />
      </unzip>
@@ -17,7 +17,7 @@
      
      <!-- substitute tokens as needed -->
      <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
-@@ -1239,7 +1240,7 @@
+@@ -1242,7 +1243,7 @@
      <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
               token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
   
@@ -26,7 +26,7 @@
      <unzip src="${src.apis.zip}" dest="${build.src}">
          <patternset
              includes="org/xml/sax/** 
-@@ -1262,7 +1263,7 @@
+@@ -1265,7 +1266,7 @@
                  org/w3c/dom/xpath/**"
          />
      </unzip>
diff --git a/debian/patches/03_bootclasspath.patch b/debian/patches/03_bootclasspath.patch
index 958f282..9a113da 100644
--- a/debian/patches/03_bootclasspath.patch
+++ b/debian/patches/03_bootclasspath.patch
@@ -1,6 +1,6 @@
 --- a/build.xml
 +++ b/build.xml
-@@ -291,13 +291,14 @@
+@@ -294,13 +294,14 @@
             destdir="${build.dest}"
             source="${javac.source}"
             target="${javac.target}"
@@ -17,7 +17,7 @@
             excludes="org/xml/sax/** 
                  javax/xml/**
                  org/w3c/dom/*
-@@ -359,7 +360,7 @@
+@@ -362,7 +363,7 @@
             destdir="${build.dest}"
             source="${javac.source}"
             target="${javac.target}"
@@ -26,7 +26,7 @@
             debug="${debug}" nowarn="true"
             debuglevel="${debuglevel}"
             includeAntRuntime="false"
-@@ -1308,7 +1309,7 @@
+@@ -1311,7 +1312,7 @@
             destdir="${build.dest}"
             source="${javac.source}"
             target="${javac.target}"
diff --git a/debian/patches/java10.patch b/debian/patches/java10.patch
index 174e2f8..d55d265 100644
--- a/debian/patches/java10.patch
+++ b/debian/patches/java10.patch
@@ -13,7 +13,7 @@ Forwarded: no
 
 --- a/build.xml
 +++ b/build.xml
-@@ -298,7 +298,6 @@
+@@ -301,7 +301,6 @@
             optimize="${optimize}"
             includeAntRuntime="false"
             includeJavaRuntime="true"
@@ -21,7 +21,7 @@ Forwarded: no
             excludes="org/xml/sax/** 
                  javax/xml/**
                  org/w3c/dom/*
-@@ -754,35 +753,35 @@
+@@ -757,35 +756,35 @@
      <java fork="yes"
            classname="sax.Counter"
            failOnError="yes">
@@ -62,7 +62,7 @@ Forwarded: no
          <arg value="-dom"/>
          <arg value="-threads"/>
          <arg value="20"/>
-@@ -794,7 +793,7 @@
+@@ -797,7 +796,7 @@
      <java fork="yes"
            classname="thread.Test"
            failOnError="yes">
@@ -71,7 +71,7 @@ Forwarded: no
          <arg value="-threads"/>
          <arg value="20"/>
          <arg value="-time"/>
-@@ -835,19 +834,19 @@
+@@ -838,19 +837,19 @@
      <java fork="yes"
            classname="dom.DTest"
            failOnError="yes">
@@ -94,7 +94,7 @@ Forwarded: no
          <arg value="all"/>
      </java>
  
-@@ -855,13 +854,13 @@
+@@ -858,13 +857,13 @@
      <java fork="yes"
            classname="dom.ids.Test"
            failOnError="yes">
@@ -110,7 +110,7 @@ Forwarded: no
          <arg value="${data.dir}/personal-schema.xml"/>
          <arg value="out.xml"/>
      </java>
-@@ -869,37 +868,37 @@
+@@ -872,37 +871,37 @@
      <java fork="yes"
            classname="dom.traversal.AllTests"
            failOnError="yes">
@@ -154,7 +154,7 @@ Forwarded: no
          <arg value="testSchemaLanguageSAX"/>
          <arg value="testSchemaSourceSAX"/>
          <arg value="testSchemaLanguageDOM"/>
-@@ -909,25 +908,25 @@
+@@ -912,25 +911,25 @@
      <java fork="yes"
            classname="xinclude.Test"
            failOnError="yes">