[openjpa] 02/03: whatever

Miguel Landaeta nomadium-guest at alioth.debian.org
Sun Oct 6 23:44:35 UTC 2013 

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

nomadium-guest pushed a commit to branch master
in repository openjpa.

commit 5d0c83d7a7633d355c684013296e4af520281b75
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sat Aug 31 21:39:18 2013 -0300

    whatever
---
 debian/changelog              |    6 ++++
 debian/control                |    5 +++-
 debian/libopenjpa-java.poms   |   53 +++++++++++++++++++++++++++++++++
 debian/maven.cleanIgnoreRules |    1 +
 debian/maven.ignoreRules      |    1 +
 debian/maven.properties       |    1 +
 debian/maven.publishedRules   |    1 +
 debian/maven.rules            |   26 ++++++++++++++++
 debian/patches/pom.diff       |   66 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |    3 +-
 debian/rules                  |   23 +++++++-------
 11 files changed, 174 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a590e0c..7e22b1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjpa (2.2.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Fri, 30 Aug 2013 15:14:47 -0300
+
 openjpa (2.0.1-1) unstable; urgency=low
 
   [ Miguel Landaeta ]
diff --git a/debian/control b/debian/control
index a090363..f3d4e5a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,10 @@ Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant, javacc,
  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,
- libgeronimo-jpa-2.0-spec-java, xmlto
+ libgeronimo-jpa-2.0-spec-java, xmlto,
+ libmaven-antrun-plugin-java,
+ libjavacc-maven-plugin-java,
+ libmaven-dependency-plugin-java
 Standards-Version: 3.9.3
 Homepage: http://openjpa.apache.org/
 Vcs-Git: git://git.debian.org/git/pkg-java/openjpa.git
diff --git a/debian/libopenjpa-java.poms b/debian/libopenjpa-java.poms
new file mode 100644
index 0000000..97c577a
--- /dev/null
+++ b/debian/libopenjpa-java.poms
@@ -0,0 +1,53 @@
+# 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 --ignore --no-parent
+openjpa-lib/pom.xml --has-package-version --java-lib --no-parent
+openjpa-kernel/pom.xml --has-package-version --java-lib --no-parent
+openjpa-jdbc/pom.xml --has-package-version --java-lib --no-parent
+openjpa-persistence/pom.xml --has-package-version --java-lib --no-parent
+openjpa-persistence-jdbc/pom.xml --has-package-version --java-lib --no-parent
+#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 --ignore
+#openjpa/pom.xml --ignore
+#openjpa-project/pom.xml --ignore
+#openjpa-examples/pom.xml --ignore
+#openjpa-examples/simple/pom.xml --ignore
+#openjpa-examples/image-gallery/pom.xml --ignore
+#openjpa-examples/openbooks/pom.xml --ignore
+#openjpa-integration/pom.xml --ignore
+#openjpa-integration/daytrader/pom.xml --ignore
+#openjpa-integration/examples/pom.xml --ignore
+#openjpa-integration/slf4j/pom.xml --ignore
+#openjpa-integration/tck/pom.xml --ignore
+#openjpa-integration/validation/pom.xml --ignore
+#openjpa-integration/jmx/pom.xml --ignore
+#openjpa-all/pom.xml --ignore
+#openjpa-tools/pom.xml --ignore
+#openjpa-tools/openjpa-maven-plugin/pom.xml --ignore
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..d2f1b82
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1 @@
+maven.test.skip=true
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..cdc6926
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,26 @@
+
+commons-beanutils commons-beanutils jar s/.*/debian/ * *
+commons-collections commons-collections jar s/3\..*/3.x/ * *
+commons-dbcp commons-dbcp jar s/.*/debian/ * *
+junit junit jar s/3\..*/3.x/ * *
+net.sourceforge.serp serp jar s/.*/debian/ * *
+org.apache.maven apache-maven pom s/.*/3.0.4/ * *
+org.apache.maven maven-aether-provider jar s/.*/3.0.4/ * *
+org.apache.maven maven-artifact jar s/.*/3.0.4/ * *
+org.apache.maven maven-compat jar s/.*/3.0.4/ * *
+org.apache.maven maven-core jar s/.*/3.0.4/ * *
+org.apache.maven maven-embedder jar s/.*/3.0.4/ * *
+org.apache.maven maven-model-builder jar s/.*/3.0.4/ * *
+org.apache.maven maven-model jar s/.*/3.0.4/ * *
+org.apache.maven maven-plugin-api jar s/.*/3.0.4/ * *
+org.apache.maven maven pom s/.*/3.0.4/ * *
+s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ jar s/.*/debian/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
+s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
+log4j log4j * s/1\.2\..*/1.2.x/ * *
+s/ant/org.apache.ant/ * * 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/ * *
+s/org.apache.felix/org.osgi/ org.osgi.core * * * *
+s/org.jmock/jmock/ jmock* jar s/2\..*/2.x/ * *
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
new file mode 100644
index 0000000..2719cf7
--- /dev/null
+++ b/debian/patches/pom.diff
@@ -0,0 +1,66 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpa (2.2.2-1) UNRELEASED; urgency=low
+ .
+   * New upstream release.
+Author: Miguel Landaeta <miguel at miguel.cc>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpa-2.2.2.orig/pom.xml
++++ openjpa-2.2.2/pom.xml
+@@ -23,11 +23,11 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+     <modelVersion>4.0.0</modelVersion>
+ 
+-    <parent>
++    <!--parent>
+       <groupId>org.apache</groupId>
+       <artifactId>apache</artifactId>
+       <version>7</version>
+-    </parent>
++    </parent-->
+ 
+     <groupId>org.apache.openjpa</groupId>
+     <artifactId>openjpa-parent</artifactId>
+@@ -154,16 +154,16 @@
+         <module>openjpa-jdbc</module>
+         <module>openjpa-persistence</module>
+         <module>openjpa-persistence-jdbc</module>
+-        <module>openjpa-persistence-locking</module>
++        <!--module>openjpa-persistence-locking</module-->
+         <module>openjpa-xmlstore</module>
+         <module>openjpa-slice</module>
+-        <module>openjpa-jest</module>
+-        <module>openjpa</module>
+-        <module>openjpa-project</module>
+-        <module>openjpa-examples</module>
+-        <module>openjpa-integration</module>
+-        <module>openjpa-all</module>
+-        <module>openjpa-tools</module>
++        <!--module>openjpa-jest</module-->
++        <!--module>openjpa</module-->
++        <!--module>openjpa-project</module-->
++        <!--module>openjpa-examples</module-->
++        <!--module>openjpa-integration</module-->
++        <!--module>openjpa-all</module-->
++        <!--module>openjpa-tools</module-->
+     </modules>
+ 
+     <profiles>
diff --git a/debian/patches/series b/debian/patches/series
index 70a6c86..012eb0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-java7-compat.diff
+#java7-compat.diff
+pom.diff
diff --git a/debian/rules b/debian/rules
index 8d75f23..231cce7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,19 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-
-%:
-	dh --with javahelper $@
-
-override_dh_auto_build:
-	ant -f debian/build.xml
-
-override_dh_auto_clean:
-	ant -f debian/build.xml clean
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
+JAVA_HOME := /usr/lib/jvm/default-java
+#
+#%:
+#	dh --with javahelper $@
+#
+#override_dh_auto_build:
+#	ant -f debian/build.xml
+#
+#override_dh_auto_clean:
+#	ant -f debian/build.xml clean
+#
 override_dh_compress:
 	dh_compress -X.xml -X.sql -X.java
 

-- 
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