[openjpa] 01/01: 2.2.2-1 release, take 2
Miguel Landaeta
nomadium-guest at alioth.debian.org
Mon Sep 2 19:33:22 UTC 2013
This is an automated email from the git hooks/post-receive script.
nomadium-guest pushed a commit to branch maven-build
in repository openjpa.
commit 3da6aa00d71851dd20bb2ac3dc036b42bf7226c7
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Mon Sep 2 19:31:14 2013 -0300
2.2.2-1 release, take 2
* Use canonical form of Vcs-* fields.
* Remove obsolete DMUA header.
* OpenJPA user manual is no longer included in -doc.
---
debian/changelog | 6 +++++-
debian/control | 7 +++----
debian/libopenjpa-java-doc.doc-base.1 | 8 --------
debian/libopenjpa-java-doc.install | 3 +--
debian/libopenjpa-java-doc.javadoc | 2 +-
debian/libopenjpa-java.poms | 4 +---
debian/preserve | 2 ++
debian/rules | 2 ++
8 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 707ec8f..1fb535c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,15 +5,19 @@ openjpa (2.2.2-1) UNRELEASED; urgency=low
This release includes a fix for security issue CVE-2013-1768
that allowed remote attackers to execute arbitrary code.
* Switch build system from Ant to Maven since that was upstream use.
+ Replace debhelper with cdbs.
Several Maven plugins and libraries were added to dependency lists.
* Bump Standards-Version to 3.9.4. No changes were required.
* Added Stephen Nelson to Uploaders list.
* Drop java7-compat.diff patch, it's not needed anymore.
+ * Use canonical form of Vcs-* fields.
+ * Remove obsolete DMUA header.
+ * OpenJPA user manual is no longer included in -doc.
[ Stephen Nelson ]
* Fix FTBFS cause by libhsqldb-java API changes. (Closes: #706176).
- -- Miguel Landaeta <miguel at miguel.cc> Sun, 01 Sep 2013 18:16:39 -0300
+ -- Miguel Landaeta <miguel at miguel.cc> Mon, 02 Sep 2013 19:28:41 -0300
openjpa (2.0.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 01c5626..4bfd0a1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,13 @@ Source: openjpa
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Miguel Landaeta <miguel at miguel.cc>,
Stephen Nelson <stephen at eccostudio.com>
-DM-Upload-Allowed: yes
Section: java
Priority: optional
Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant, javacc,
ant-optional, libcommons-lang-java, libcommons-collections3-java,
glassfish-javaee, libpostgresql-jdbc-java, libhsqldb-java,
libcommons-pool-java, liblog4j1.2-java, libcommons-logging-java, aspectj,
- libserp-java, libgeronimo-validation-1.0-spec-java,
+ libserp-java, libgeronimo-validation-1.0-spec-java, cdbs,
libgeronimo-jpa-2.0-spec-java, xmlto, libmaven-antrun-plugin-java,
libjavacc-maven-plugin-java, libmaven-dependency-plugin-java,
libgeronimo-jms-1.1-spec-java, libmaven-enforcer-plugin-java,
@@ -17,8 +16,8 @@ Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant, javacc,
libcommons-jci-rhino-java
Standards-Version: 3.9.4
Homepage: http://openjpa.apache.org/
-Vcs-Git: git://git.debian.org/git/pkg-java/openjpa.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/openjpa.git
+Vcs-Git: git://anonscm.debian.org/git/pkg-java/openjpa.git
+Vcs-Browser: http://anonscm.debian.org/?p=pkg-java/openjpa.git
Package: libopenjpa-java
Architecture: all
diff --git a/debian/libopenjpa-java-doc.doc-base.1 b/debian/libopenjpa-java-doc.doc-base.1
deleted file mode 100644
index 0411bc9..0000000
--- a/debian/libopenjpa-java-doc.doc-base.1
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: libopenjpa-java-manual
-Title: Apache OpenJPA 2.0 User's Guide
-Abstract: OpenJPA is Apache's implementation of Sun's Java Persistence 2.0 API (JSR-317 JPA 2.0) specification
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libopenjpa-java/html/index.html
-Files: /usr/share/doc/libopenjpa-java/html/*.html
diff --git a/debian/libopenjpa-java-doc.install b/debian/libopenjpa-java-doc.install
index 45db459..e851c1e 100644
--- a/debian/libopenjpa-java-doc.install
+++ b/debian/libopenjpa-java-doc.install
@@ -1,2 +1 @@
-openjpa-examples/src/main/java/* usr/share/doc/libopenjpa-java/examples
-target/doc/* usr/share/doc/libopenjpa-java
+openjpa-examples/* usr/share/doc/libopenjpa-java/examples
diff --git a/debian/libopenjpa-java-doc.javadoc b/debian/libopenjpa-java-doc.javadoc
index a42a4a0..9154e5c 100644
--- a/debian/libopenjpa-java-doc.javadoc
+++ b/debian/libopenjpa-java-doc.javadoc
@@ -1 +1 @@
-target/api /usr/share/doc/libopenjpa-java/api
+target/site/apidocs/* usr/share/doc/libopenjpa-java/api
diff --git a/debian/libopenjpa-java.poms b/debian/libopenjpa-java.poms
index bc8e4c1..8fcff9b 100644
--- a/debian/libopenjpa-java.poms
+++ b/debian/libopenjpa-java.poms
@@ -35,9 +35,7 @@ openjpa-persistence-locking/pom.xml --ignore
openjpa-xmlstore/pom.xml --has-package-version --java-lib --no-parent
openjpa-slice/pom.xml --has-package-version --java-lib --no-parent
openjpa-jest/pom.xml --has-package-version --java-lib --no-parent
-# TO-DO: fix issue with openjpa-jest build and enable openjpa bundle
-# because it is needed by libspring-java
-openjpa/pom.xml --has-package-version --java-lib --no-parent --ignore
+openjpa/pom.xml --has-package-version --java-lib --no-parent
openjpa-project/pom.xml --ignore
openjpa-examples/pom.xml --ignore
openjpa-examples/simple/pom.xml --ignore
diff --git a/debian/preserve b/debian/preserve
new file mode 100644
index 0000000..82ebfdb
--- /dev/null
+++ b/debian/preserve
@@ -0,0 +1,2 @@
+openjpa/dependency-reduced-pom.xml
+openjpa-2.2.2/pom.xml
diff --git a/debian/rules b/debian/rules
index 92d3665..cfa8e2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ include /usr/share/cdbs/1/class/maven.mk
JAVA_HOME := /usr/lib/jvm/default-java
DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
+DEB_MAVEN_ARGS := -e
+DEB_MAVEN_BUILD_TARGET := install
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjpa.git
More information about the pkg-java-commits
mailing list