[jaxb] 10/24: Build libcodemodel-java and relocate the com.sun.codemodel artifacts to org.glassfish.jaxb

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jaxb.

commit b0b85ffaa9b93917afd8c09769d5862995793538
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 28 14:05:59 2017 +0200

    Build libcodemodel-java and relocate the com.sun.codemodel artifacts to org.glassfish.jaxb
---
 debian/changelog                   |  2 ++
 debian/control                     | 15 ++++++++++++---
 debian/libcodemodel-java.classpath |  1 +
 debian/libjaxb-java.classpath      |  1 -
 debian/libjaxb-java.poms           |  7 ++++---
 debian/rules                       | 10 ++++++++++
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92ebc3e..c87c503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ jaxb (2.2.10-1) UNRELEASED; urgency=medium
       to com.sun.xml.bind.external
     - Build libtxw2-java and relocate the com.sun.xml.txw2 artifacts
       to org.glassfish.jaxb
+    - Build libcodemodel-java and relocate the com.sun.codemodel artifacts
+      to org.glassfish.jaxb
   * Track and download the new releases from GitHub
   * Standards-Version updated to 4.1.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index aa06b9f..4a4baee 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
  default-jdk,
  javahelper (>= 0.43),
  libargs4j-java,
- libcodemodel-java (>= 2.6),
  libbuild-helper-maven-plugin-java,
  libdtd-parser-java,
  libfastinfoset-java,
@@ -26,7 +25,7 @@ Homepage: https://jaxb.java.net
 
 Package: libjaxb-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, librngom-java (>= ${source:Version}), libtxw2-java (>= ${source:Version})
+Depends: ${misc:Depends}, ${maven:Depends}, libcodemodel-java (>= 2.6+jaxb${source:Version}), librngom-java (>= ${source:Version}), libtxw2-java (>= ${source:Version})
 Suggests: ${maven:OptionalDepends}
 Description: JAXB Reference Implementation
  GlassFish Java Architecture for XML Binding (JAXB) Reference
@@ -61,6 +60,16 @@ Description: JAXB Reference Implementation -- documentation
  .
  This package contains the Javadoc API.
 
+Package: libcodemodel-java
+Architecture: all
+Depends: ${misc:Depends}, libistack-commons-java
+Description: Java library for code generators
+ CodeModel is a Java library for code generators; it provides a way to
+ generate Java programs in a way much nicer than
+ PrintStream.println(). This project is a spin-off from the JAXB
+ Reference Implementation for its schema compiler to generate Java
+ source files.
+
 Package: librngom-java
 Architecture: all
 Depends: ${misc:Depends}, librelaxng-datatype-java
@@ -79,7 +88,7 @@ Description: Java library for parsing RELAX NG grammars
 
 Package: libtxw2-java
 Architecture: all
-Depends: ${misc:Depends}, libargs4j-java, libcodemodel-java, librngom-java (>= ${source:Version}), libxsom-java
+Depends: ${misc:Depends}, libargs4j-java, libcodemodel-java (>= 2.6+jaxb${source:Version}), librngom-java (>= ${source:Version}), libxsom-java
 Description: Typed XML Writer for Java
  A Java library that allows client applications to write arbitrary
  well-formed typed XML documents.
diff --git a/debian/libcodemodel-java.classpath b/debian/libcodemodel-java.classpath
new file mode 100644
index 0000000..d61d5b1
--- /dev/null
+++ b/debian/libcodemodel-java.classpath
@@ -0,0 +1 @@
+usr/share/java/codemodel-annotation-compiler.jar codemodel.jar istack-commons-tools.jar
diff --git a/debian/libjaxb-java.classpath b/debian/libjaxb-java.classpath
index 50377d7..d3180b1 100644
--- a/debian/libjaxb-java.classpath
+++ b/debian/libjaxb-java.classpath
@@ -1,4 +1,3 @@
-usr/share/java/codemodel-annotation-compiler.jar codemodel.jar istack-commons-tools.jar
 usr/share/java/jaxb-core.jar                     jaxb-api.jar txw2.jar istack-commons-runtime.jar
 usr/share/java/jaxb-jxc.jar                      jaxb-xjc.jar jaxb-runtime.jar
 usr/share/java/jaxb-runtime.jar                  jaxb-core.jar stax-ex.jar stax-api.jar FastInfoset.jar
diff --git a/debian/libjaxb-java.poms b/debian/libjaxb-java.poms
index dc4ab33..53010e1 100644
--- a/debian/libjaxb-java.poms
+++ b/debian/libjaxb-java.poms
@@ -1,9 +1,6 @@
 jaxb-ri/pom.xml
 jaxb-ri/boms/bom-ext/pom.xml
 jaxb-ri/boms/bom/pom.xml --no-parent
-jaxb-ri/codemodel/pom.xml
-jaxb-ri/codemodel/codemodel/pom.xml
-jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml
 jaxb-ri/core/pom.xml
 jaxb-ri/external/pom.xml --no-parent --package=librngom-java
 jaxb-ri/external/rngom/pom.xml --package=librngom-java --relocate=org.kohsuke.rngom:rngom:debian
@@ -13,6 +10,10 @@ jaxb-ri/runtime/impl/pom.xml
 jaxb-ri/runtime/jaxb1/pom.xml
 jaxb-ri/xjc/pom.xml
 
+jaxb-ri/codemodel/pom.xml --no-parent                   --package=libcodemodel-java
+jaxb-ri/codemodel/codemodel/pom.xml                     --package=libcodemodel-java --relocate=com.sun.codemodel:codemodel
+jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml --package=libcodemodel-java --relocate=com.sun.codemodel:codemodel-annotation-compiler
+
 jaxb-ri/txw/pom.xml --no-parent --package=libtxw2-java
 jaxb-ri/txw/compiler/pom.xml    --package=libtxw2-java --relocate=com.sun.xml.txw2:txwc2
 jaxb-ri/txw/runtime/pom.xml     --package=libtxw2-java --relocate=com.sun.xml.txw2:txw2
diff --git a/debian/rules b/debian/rules
index 36957be..f556561 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 %:
 	dh $@ --buildsystem=maven --with javahelper
 
@@ -15,5 +17,13 @@ override_dh_auto_install:
 override_dh_auto_clean:
 	dh_auto_clean -- -f jaxb-ri/pom.xml clean
 
+override_dh_gencontrol:
+	dh_gencontrol
+
+	# src:libcodemodel-java was at version 2.6 before src:jaxb took over the package.
+	# To avoid introducing an epoch the jaxb version is appended to the former
+	# libcodemodel-java version until jaxb > 2.6 is released.
+	dh_gencontrol -plibcodemodel-java -- -v2.6+jaxb$(DEB_VERSION)
+
 get-orig-source:
 	uscan --download-current-version --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jaxb.git