summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Bourg <ebourg@apache.org>2018-07-19 10:56:48 +0200
committerEmmanuel Bourg <ebourg@apache.org>2018-07-19 10:56:48 +0200
commit9fa07e0fcea6c9c9783046b1772e2e954c366f1c (patch)
tree6a0248c6ef194e79a7ca6745b6242fed4b2c32c4
parent13f2365f4d2b45dc4fed290699bd6ffbd2b935c9 (diff)
Ignore the runtime-testsuite/annotations and runtime-testsuite/processors modules
-rw-r--r--debian/antlr4.poms2
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/02-ignore-modules.patch15
-rw-r--r--debian/patches/series1
4 files changed, 20 insertions, 0 deletions
diff --git a/debian/antlr4.poms b/debian/antlr4.poms
index 4695713..dbe08ab 100644
--- a/debian/antlr4.poms
+++ b/debian/antlr4.poms
@@ -31,3 +31,5 @@ tool/pom.xml --java-lib
antlr4-maven-plugin/pom.xml --package=antlr4-maven-plugin
tool-testsuite/pom.xml --ignore
runtime-testsuite/pom.xml --ignore
+runtime-testsuite/annotations/pom.xml --ignore
+runtime-testsuite/processors/pom.xml --ignore
diff --git a/debian/changelog b/debian/changelog
index ed245d2..035e80b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ antlr4 (4.6-1) UNRELEASED; urgency=medium
* New upstream release
- New dependency on libjsonp-java
- Updated the Maven rules
+ - Ignore the runtime-testsuite/annotations and runtime-testsuite/processors
+ modules
* Removed the Maven 2 compatibility patch
* Standards-Version updated to 4.1.5
* Switch to debhelper level 11
diff --git a/debian/patches/02-ignore-modules.patch b/debian/patches/02-ignore-modules.patch
new file mode 100644
index 0000000..d1e6a00
--- /dev/null
+++ b/debian/patches/02-ignore-modules.patch
@@ -0,0 +1,15 @@
+Description: Ignore the runtime-testsuite/annotations and runtime-testsuite/processors modules
+ (the --ignore option in debian/antlr4.poms doesn't work due to #839738)
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -81,8 +81,6 @@
+ <module>tool</module>
+ <module>antlr4-maven-plugin</module>
+ <module>tool-testsuite</module>
+- <module>runtime-testsuite/annotations</module>
+- <module>runtime-testsuite/processors</module>
+ <module>runtime-testsuite</module>
+ </modules>
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..25053f0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+02-ignore-modules.patch