[libnetlib-java] 01/01: Enabled the generator module and other adjustments
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jan 28 22:43:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libnetlib-java.
commit cee0fcfb73723420dafef12f49aaaba7e795ac30
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jan 28 23:42:30 2016 +0100
Enabled the generator module and other adjustments
---
debian/control | 4 ++-
debian/libnetlib-java.poms | 3 +-
debian/libnetlib-java.substvars | 8 ------
debian/maven.ignoreRules | 2 --
debian/maven.rules | 13 ++-------
debian/patches/enable-generator-module.patch | 10 +++++++
debian/patches/fix_version_mismatch.patch | 41 ++++++++++++++++++----------
debian/patches/series | 1 +
debian/rules | 3 +-
9 files changed, 46 insertions(+), 39 deletions(-)
diff --git a/debian/control b/debian/control
index 009b540..77982f2 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,9 @@ Build-Depends: debhelper (>= 9),
javahelper,
junit,
maven-debian-helper,
- libplexus-compiler-java
+ liblombok-java,
+ libplexus-compiler-java,
+ libstringtemplate4-java
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libnetlib-java.git
Vcs-Git: https://anonscm.debian.org/pkg-java/libnetlib-java.git
diff --git a/debian/libnetlib-java.poms b/debian/libnetlib-java.poms
index a7e3e3c..fa00e5a 100644
--- a/debian/libnetlib-java.poms
+++ b/debian/libnetlib-java.poms
@@ -26,9 +26,10 @@
# Empty by default. [mh_install]
#
pom.xml --no-parent --has-package-version
-core/pom.xml
+core/pom.xml --has-package-version
legacy/pom.xml --has-package-version
native_ref/pom.xml --has-package-version
native_ref/java/pom.xml --has-package-version
native_system/pom.xml --has-package-version
native_system/java/pom.xml --has-package-version
+generator/pom.xml --has-package-version --no-parent
diff --git a/debian/libnetlib-java.substvars b/debian/libnetlib-java.substvars
deleted file mode 100644
index 672c0cc..0000000
--- a/debian/libnetlib-java.substvars
+++ /dev/null
@@ -1,8 +0,0 @@
-#List of dependencies for libnetlib-java, generated for use by debian/control
-maven.CompileDepends=libmaven-compiler-plugin-java, libmaven-jar-plugin-java
-maven.UpstreamPackageVersion=1.2-SNAPSHOT
-maven.Depends=
-maven.OptionalDepends=
-maven.TestDepends=junit4
-maven.DocDepends=default-jdk-doc
-maven.DocOptionalDepends=
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 4d8257f..f48e9c4 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,7 +1,5 @@
com.github.fommil jniloader * * * *
-com.github.fommil.netlib generator * * * *
net.sourceforge.f2j arpack_combined_all * * * *
org.apache.maven.plugins maven-gpg-plugin * * * *
org.codehaus.mojo native-maven-plugin * * * *
-org.projectlombok lombok * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index dcdc954..e458a17 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,13 +1,4 @@
-com.github.fommil.netlib core jar s/.*/debian/ * *
-com.github.fommil.netlib native_ref-java jar s/.*/debian/ * *
-com.github.fommil.netlib native_ref pom s/.*/debian/ * *
-com.github.fommil.netlib native_system-java jar s/.*/debian/ * *
-com.github.fommil.netlib native_system pom s/.*/debian/ * *
-com.github.fommil.netlib parent pom s/.*/debian/ * *
-com.google.guava guava bundle s/.*/debian/ * *
-com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
-com.googlecode.netlib-java netlib-java jar s/.*/debian/ * *
junit junit jar s/4\..*/4.x/ * *
-s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
-s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
+org.antlr s/stringtemplate/ST4/ * s/.*/debian/ * *
+s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * *
diff --git a/debian/patches/enable-generator-module.patch b/debian/patches/enable-generator-module.patch
new file mode 100644
index 0000000..b4a9f64
--- /dev/null
+++ b/debian/patches/enable-generator-module.patch
@@ -0,0 +1,10 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -61,6 +61,7 @@
+ <packaging>pom</packaging>
+
+ <modules>
++ <module>generator</module>
+ <module>core</module>
+ <module>legacy</module>
+ <module>native_ref</module>
diff --git a/debian/patches/fix_version_mismatch.patch b/debian/patches/fix_version_mismatch.patch
index 2a3b5c7..57cad25 100644
--- a/debian/patches/fix_version_mismatch.patch
+++ b/debian/patches/fix_version_mismatch.patch
@@ -11,7 +11,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
<packaging>pom</packaging>
<modules>
@@ -22,7 +22,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_system</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>native_system-java</artifactId>
@@ -33,7 +33,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>native_system</artifactId>
@@ -44,7 +44,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_system</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>native_system-xbuilds</artifactId>
@@ -55,7 +55,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_ref</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>native_ref-xbuilds</artifactId>
@@ -66,7 +66,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_system-xbuilds</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>netlib-native_system-linux-armhf</artifactId>
@@ -77,7 +77,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_system-xbuilds</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>netlib-native_system-linux-i686</artifactId>
@@ -88,7 +88,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_system-xbuilds</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>netlib-native_system-linux-x86_64</artifactId>
@@ -99,7 +99,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<groupId>com.googlecode.netlib-java</groupId>
@@ -110,7 +110,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_ref</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>native_ref-java</artifactId>
@@ -121,7 +121,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>native_ref</artifactId>
@@ -132,7 +132,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_ref-xbuilds</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>netlib-native_ref-linux-armhf</artifactId>
@@ -143,7 +143,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_ref-xbuilds</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>netlib-native_ref-linux-i686</artifactId>
@@ -154,7 +154,7 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>native_ref-xbuilds</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>netlib-native_ref-linux-x86_64</artifactId>
@@ -165,7 +165,18 @@ Description: Normalise version numbers
<groupId>com.github.fommil.netlib</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
-+ <version>1.1</version>
++ <version>1.1.2</version>
</parent>
<artifactId>perf</artifactId>
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -7,7 +7,7 @@
+ <parent>
+ <groupId>com.github.fommil.netlib</groupId>
+ <artifactId>parent</artifactId>
+- <version>1.1</version>
++ <version>1.1.2</version>
+ </parent>
+
+ <artifactId>core</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index 6e900bb..16ff75d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
suppress_native_plugins.patch
fix_version_mismatch.patch
+enable-generator-module.patch
diff --git a/debian/rules b/debian/rules
index 829c820..0a552c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,5 @@
%:
dh $@ --buildsystem=maven --with javahelper
-
+override_dh_auto_build:
+ dh_auto_build -- install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnetlib-java.git
More information about the pkg-java-commits
mailing list