[jasperreports] 01/01: Build with maven-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jul 28 13:20:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jasperreports.
commit 80967586fab87db2f2263d765ccd77ce5c7b027d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jul 28 15:20:09 2016 +0200
Build with maven-debian-helper
---
debian/changelog | 7 +++
debian/control | 48 ++++-----------------
debian/libjasperreports-java-doc.install | 2 +-
debian/libjasperreports-java.jlibs | 1 -
debian/libjasperreports-java.poms | 29 ++++++++++++-
debian/maven.ignoreRules | 1 +
debian/maven.rules | 7 +--
.../patches/exclude-barcode4j-and-barbecue.patch | 50 ++++++++++------------
debian/patches/javadoc.patch | 21 ---------
debian/patches/series | 1 -
debian/rules | 14 ++----
11 files changed, 75 insertions(+), 106 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3b88da4..a9a3af7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jasperreports (6.1.1+dfsg-7) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Build with maven-debian-helper
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 25 Jul 2016 10:55:11 +0200
+
jasperreports (6.1.1+dfsg-6) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 1b901c2..6199217 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ Build-Depends:
default-jdk,
glassfish-javaee,
groovy,
- javahelper,
libantlr-java,
libapache-poi-java,
+ libaxis-java,
libbatik-java (>= 1.8),
libcastor-core-java,
libcastor-xml-java,
@@ -24,6 +24,7 @@ Build-Depends:
libcommons-lang-java,
libcommons-logging-java,
libecj-java,
+ libgeronimo-jpa-2.0-spec-java,
libhibernate3-java,
libhttpclient-java,
libitext-java,
@@ -36,13 +37,14 @@ Build-Depends:
libjexcelapi-java,
libjfreechart-java,
liblucene4.10-java,
- libmondrian-java,
+ libmaven-javadoc-plugin-java,
+ libmondrian-java (>= 1:3.11.0.1-4~),
libolap4j-java,
librhino-java,
libspring-beans-java,
libspring-core-java,
libxalan2-java,
- maven-repo-helper,
+ maven-debian-helper,
velocity
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/jasperreports.git
@@ -51,38 +53,8 @@ Homepage: http://jasperreports.sourceforge.net
Package: libjasperreports-java
Architecture: all
-Depends:
- libcastor-core-java,
- libcastor-xml-java,
- libcommons-beanutils-java,
- libcommons-codec-java,
- libcommons-collections3-java,
- libcommons-digester-java,
- libcommons-logging-java,
- libecj-java,
- libitext-java,
- libjackson2-annotations-java,
- libjackson2-core-java,
- libjackson2-databind-java,
- libjcommon-java,
- libjfreechart-java,
- liblucene4.10-java,
- libolap4j-java,
- ${misc:Depends}
-Suggests:
- groovy,
- libantlr-java,
- libapache-poi-java,
- libbatik-java (>= 1.8),
- libbsh-java,
- libhibernate3-java,
- libhttpclient-java,
- libjexcelapi-java,
- libmondrian-java,
- libspring-beans-java,
- libspring-core-java,
- libxalan2-java,
- velocity
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
Description: Java reporting generator library
JasperReports is a Java reporting generator library. XML report templates
are used to generate ready to print documents using data from customizable data
@@ -92,10 +64,8 @@ Description: Java reporting generator library
Package: libjasperreports-java-doc
Architecture: all
Section: doc
-Depends:
- ${misc:Depends}
-Suggests:
- libjasperreports-java
+Depends: ${misc:Depends}
+Suggests: libjasperreports-java
Description: Java reporting generator library - documentation
JasperReports is a Java reporting generator library. XML report templates
are used to generate ready to print documents using data from customizable data
diff --git a/debian/libjasperreports-java-doc.install b/debian/libjasperreports-java-doc.install
index 9552595..8b2e4c5 100644
--- a/debian/libjasperreports-java-doc.install
+++ b/debian/libjasperreports-java-doc.install
@@ -1,3 +1,3 @@
-dist/docs/api /usr/share/doc/libjasperreports-java/
+target/site/apidocs/* /usr/share/doc/libjasperreports-java/api/
dist/docs/config.reference.html /usr/share/doc/libjasperreports-java/
dist/docs/schema.reference.html /usr/share/doc/libjasperreports-java/
diff --git a/debian/libjasperreports-java.jlibs b/debian/libjasperreports-java.jlibs
deleted file mode 100644
index 16e8868..0000000
--- a/debian/libjasperreports-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-dist/jasperreports-*
diff --git a/debian/libjasperreports-java.poms b/debian/libjasperreports-java.poms
index 07d1a00..0417132 100644
--- a/debian/libjasperreports-java.poms
+++ b/debian/libjasperreports-java.poms
@@ -1 +1,28 @@
-pom.xml --usj-name=jasperreports --has-package-version
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --has-package-version
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 767ce2f..f78d5b6 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,6 +1,7 @@
com.google.zxing core * * * *
com.keypoint png-encoder * * * *
+commons-javaflow commons-javaflow * * * *
log4j log4j * * * *
net.sf.barcode4j barcode4j * * * *
net.sf.jasperreports jasperreports-fonts * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 4f24bcc..dc796fe 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -9,15 +9,12 @@ com.fasterxml.jackson.core jackson-databind s/jar/bundle/ s/2\..*/2.x/ * *
commons-beanutils commons-beanutils jar s/.*/debian/ * *
commons-collections commons-collections jar s/3\..*/3.x/ * *
net.sf.jasperreports jasperreports jar s/.*/debian/ * *
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
+s/javax.xml.soap/axis/ s/saaj-api/axis-saaj/ * s/.*/debian/ * *
org.apache.velocity velocity jar s/.*/debian/ * *
commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
-s/ant/org.apache.ant/ * * s/.*/debian/ * *
s/org.mozilla/rhino/ s/rhino/js/ * s/.*/debian/ * *
s/org.jfree/jfree/ * * s/.*/debian/ * *
org.apache.lucene lucene-core * s/4\..*/4.10.x/ * *
org.apache.lucene lucene-analyzers-common * s/4\..*/4.10.x/ * *
org.apache.lucene lucene-queryparser * s/4\..*/4.10.x/ * *
-
diff --git a/debian/patches/exclude-barcode4j-and-barbecue.patch b/debian/patches/exclude-barcode4j-and-barbecue.patch
index 7bb7ea8..4651b0d 100644
--- a/debian/patches/exclude-barcode4j-and-barbecue.patch
+++ b/debian/patches/exclude-barcode4j-and-barbecue.patch
@@ -1,22 +1,9 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Sun, 18 Oct 2015 18:52:04 +0200
-Subject: exclude barcode4j and barbecue
-
-Exclude all barcode4j and barbecue code. The build-dependencies are not
-available in Debian.
-
+Description: Exclude all barcode4j and barbecue code. The build-dependencies are not available in Debian.
+Author: Markus Koschany <apo at gambaru.de>
Forwarded: not-needed
----
- .../ComponentsExtensionsRegistryFactory.java | 22 ---
- .../ComponentsXmlDigesterConfigurer.java | 174 ---------------------
- .../components/ComponentsXmlWriter.java | 67 --------
- 3 files changed, 263 deletions(-)
-
-diff --git a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
-index 3f452f8..d562351 100644
--- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
-@@ -28,12 +28,6 @@ import java.util.Collections;
+@@ -28,12 +28,6 @@
import java.util.HashMap;
import java.util.List;
@@ -29,7 +16,7 @@ index 3f452f8..d562351 100644
import net.sf.jasperreports.components.iconlabel.IconLabelComponentCompiler;
import net.sf.jasperreports.components.iconlabel.IconLabelComponentDesignConverter;
import net.sf.jasperreports.components.iconlabel.IconLabelComponentFillFactory;
-@@ -125,22 +119,6 @@ public class ComponentsExtensionsRegistryFactory implements
+@@ -125,22 +119,6 @@
tableManager.setComponentFillFactory(new FillTableFactory());
componentManagers.put(TABLE_COMPONENT_NAME, tableManager);
@@ -52,8 +39,6 @@ index 3f452f8..d562351 100644
ComponentsManager spiderChartManager = new ComponentsManager();
spiderChartManager.setDesignConverter(new SpiderChartDesignConverter());
-diff --git a/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java b/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
-index 1b9e77e..1f1de23 100644
--- a/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
+++ b/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
@@ -23,25 +23,6 @@
@@ -82,7 +67,7 @@ index 1b9e77e..1f1de23 100644
import net.sf.jasperreports.components.iconlabel.IconLabelComponentDigester;
import net.sf.jasperreports.components.list.DesignListContents;
import net.sf.jasperreports.components.list.StandardListComponent;
-@@ -87,8 +68,6 @@ public class ComponentsXmlDigesterConfigurer implements XmlDigesterConfigurer
+@@ -87,8 +68,6 @@
public void configureDigester(Digester digester)
{
addListRules(digester);
@@ -91,7 +76,7 @@ index 1b9e77e..1f1de23 100644
addTableRules(digester);
SpiderChartDigester.addSpiderChartRules(digester);
addMapRules(digester);
-@@ -113,159 +92,6 @@ public class ComponentsXmlDigesterConfigurer implements XmlDigesterConfigurer
+@@ -113,159 +92,6 @@
digester.addSetNext(listContentsPattern, "setContents");
}
@@ -251,11 +236,9 @@ index 1b9e77e..1f1de23 100644
@SuppressWarnings("deprecation")
protected void addMapRules(Digester digester)
-diff --git a/src/net/sf/jasperreports/components/ComponentsXmlWriter.java b/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
-index bbf7455..7b9a043 100644
--- a/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
+++ b/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
-@@ -26,9 +26,6 @@ package net.sf.jasperreports.components;
+@@ -26,9 +26,6 @@
import java.io.IOException;
import java.util.List;
@@ -265,7 +248,7 @@ index bbf7455..7b9a043 100644
import net.sf.jasperreports.components.list.ListComponent;
import net.sf.jasperreports.components.list.ListContents;
import net.sf.jasperreports.components.map.Item;
-@@ -92,19 +89,6 @@ public class ComponentsXmlWriter extends AbstractComponentXmlWriter
+@@ -92,19 +89,6 @@
{
writeTable(componentElement, reportWriter);
}
@@ -285,7 +268,7 @@ index bbf7455..7b9a043 100644
else if (component instanceof SpiderChartComponent)
{
SpiderChartXmlWriter spiderChartWriter = new SpiderChartXmlWriter(
-@@ -154,42 +138,6 @@ public class ComponentsXmlWriter extends AbstractComponentXmlWriter
+@@ -154,42 +138,6 @@
writer.closeElement();
}
@@ -328,7 +311,7 @@ index bbf7455..7b9a043 100644
protected void writeMap(JRComponentElement componentElement, JRXmlWriter reportWriter) throws IOException
{
-@@ -574,25 +522,10 @@ public class ComponentsXmlWriter extends AbstractComponentXmlWriter
+@@ -574,25 +522,10 @@
{
return isNewerVersionOrEqual(componentElement, reportWriter, JRConstants.VERSION_3_5_1);
}
@@ -354,3 +337,16 @@ index bbf7455..7b9a043 100644
- return false;
- }
}
+--- a/pom.xml
++++ b/pom.xml
+@@ -110,6 +110,10 @@
+ <source>1.6</source>
+ <target>1.6</target>
+ <encoding>UTF-8</encoding>
++ <excludes>
++ <exclude>**/barcode4j/**</exclude>
++ <exclude>**/barbecue/**</exclude>
++ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
diff --git a/debian/patches/javadoc.patch b/debian/patches/javadoc.patch
deleted file mode 100644
index c135ae2..0000000
--- a/debian/patches/javadoc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Fri, 22 Apr 2016 11:14:01 +0200
-Subject: javadoc
-
----
- build.xml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index 480b61f..29c4f55 100644
---- a/build.xml
-+++ b/build.xml
-@@ -196,6 +196,8 @@
- windowtitle="JasperReports ${version} API"
- excludepackagenames="org.w3c.tools.codec"
- maxmemory="1024m"
-+ additionalparam="-notimestamp"
-+ locale="en"
- encoding="ISO-8859-1">
- <doctitle>
- <![CDATA[
diff --git a/debian/patches/series b/debian/patches/series
index 7e5fd4d..58b0956 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ build.patch
commons-codec-Base64.patch
batik-1.8.patch
exclude-barcode4j-and-barbecue.patch
-javadoc.patch
no-commons-javaflow.patch
diff --git a/debian/rules b/debian/rules
index 88035db..2795377 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,15 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
%:
- dh $@ --parallel --with javahelper,jh_maven_repo_helper --buildsystem=ant
-
-override_dh_prep:
- dh_prep
- mh_patchpoms -plibjasperreports-java
+ dh $@ --buildsystem=maven
override_dh_auto_build:
- mkdir -p lib
- ant jar docs
- $(RM) -r lib
+ ant preparedocs schemaref componentschemaref configref
+ dh_auto_build
override_dh_auto_clean:
dh_auto_clean
- mh_unpatchpoms -plibjasperreports-java
+ rm -Rf dist
get-orig-source:
uscan --verbose --download-current-version --force-download
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasperreports.git
More information about the pkg-java-commits
mailing list