[Git][java-team/castor][master] 7 commits: Standards-Version updated to 4.1.5
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jul 31 10:49:11 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / castor
Commits:
600f3513 by Emmanuel Bourg at 2018-07-31T08:32:44Z
Standards-Version updated to 4.1.5
- - - - -
f2ca637b by Emmanuel Bourg at 2018-07-31T09:14:46Z
Switch to debhelper level 11
- - - - -
07b672c0 by Emmanuel Bourg at 2018-07-31T09:14:55Z
Use salsa.debian.org Vcs-* URLs
- - - - -
672c15c0 by Emmanuel Bourg at 2018-07-31T09:21:33Z
Wrap and sort
- - - - -
fe3de072 by Emmanuel Bourg at 2018-07-31T09:21:37Z
Ignore the stax dependency (provided by the JDK)
- - - - -
c1674a0e by Emmanuel Bourg at 2018-07-31T09:44:45Z
Simplified debian/rules
- - - - -
e44b47c4 by Emmanuel Bourg at 2018-07-31T09:44:52Z
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- + debian/libcastor-xml-java.poms
- + debian/maven.ignoreRules
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+castor (1.3.2-7) unstable; urgency=medium
+
+ * Team upload.
+ * Ignore the stax dependency (provided by the JDK)
+ * Simplified debian/rules
+ * Standards-Version updated to 4.1.5
+ * Switch to debhelper level 11
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 31 Jul 2018 11:44:49 +0200
+
castor (1.3.2-6) unstable; urgency=medium
* Team upload.
=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,10 @@
+anttask/build/
+build/
+codegen/build/
+core/build/
+cpa/build/
+ddlgen/build/
+diff/build/
+dist/
+schema/build/
+target/
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,30 +1,31 @@
Source: castor
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Section: java
Priority: optional
-Build-Depends: ant,
- ant-optional,
- debhelper (>= 10~),
- default-jdk,
- javacc,
- javahelper,
- junit,
- junit4,
- libcglib-java (>= 3.0),
- libcommons-cli-java,
- libcommons-lang-java,
- libcommons-logging-java,
- libeasymock-java,
- libgeronimo-jta-1.2-spec-java,
- libgeronimo-jpa-2.0-spec-java,
- liblog4j1.2-java,
- liboro-java,
- libregexp-java,
- maven-repo-helper,
- velocity
-Standards-Version: 4.1.2
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/castor.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/castor.git
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 11~),
+ default-jdk,
+ javacc,
+ javahelper,
+ junit,
+ junit4,
+ libcglib-java (>= 3.0),
+ libcommons-cli-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ libeasymock-java,
+ libgeronimo-jpa-2.0-spec-java,
+ libgeronimo-jta-1.2-spec-java,
+ liblog4j1.2-java,
+ liboro-java,
+ libregexp-java,
+ maven-repo-helper,
+ velocity
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/castor.git
+Vcs-Browser: https://salsa.debian.org/java-team/castor
Homepage: http://castor-data-binding.github.io/castor/
Package: libcastor-xml-java
@@ -78,13 +79,14 @@ Description: Data binding framework for Java (XML, Objects, DB) - Core
Package: libcastor-jdo-java
Architecture: all
-Depends: libcastor-core-java,
- libcastor-xml-java,
- libcastor-xml-schema-java,
- libcglib-java (>= 3.0),
- libgeronimo-jpa-2.0-spec-java,
- libgeronimo-jta-1.2-spec-java,
- ${misc:Depends}
+Depends:
+ libcastor-core-java,
+ libcastor-xml-java,
+ libcastor-xml-schema-java,
+ libcglib-java (>= 3.0),
+ libgeronimo-jpa-2.0-spec-java,
+ libgeronimo-jta-1.2-spec-java,
+ ${misc:Depends}
Suggests: libcastor-java-doc (= ${binary:Version})
Description: Data binding framework for Java (XML, Objects, DB) - JDO
Castor is a data binding framework for Java. It's the shortest path between
@@ -107,11 +109,12 @@ Description: Data binding framework for Java (XML, Objects, DB) - JDO
Package: libcastor-codegen-java
Architecture: all
-Depends: libcastor-core-java,
- libcastor-xml-java,
- libcastor-xml-schema-java,
- libcommons-logging-java,
- ${misc:Depends}
+Depends:
+ libcastor-core-java,
+ libcastor-xml-java,
+ libcastor-xml-schema-java,
+ libcommons-logging-java,
+ ${misc:Depends}
Recommends: velocity
Suggests: libcastor-java-doc (= ${binary:Version})
Description: Data binding framework for Java (XML, Objects, DB) - Codegen
@@ -158,11 +161,14 @@ Description: Data binding framework for Java (XML, Objects, DB) - DDL generator
Package: libcastor-xml-schema-java
Architecture: all
-Depends: libcastor-core-java,
- libcastor-xml-java,
- libcommons-logging-java,
- ${misc:Depends}
-Suggests: libcastor-java-doc (= ${binary:Version}), libcommons-cli-java
+Depends:
+ libcastor-core-java,
+ libcastor-xml-java,
+ libcommons-logging-java,
+ ${misc:Depends}
+Suggests:
+ libcastor-java-doc (= ${binary:Version}),
+ libcommons-cli-java
Description: Data binding framework for Java (XML, Objects, DB) - XML Schema
Castor is a data binding framework for Java. It's the shortest path between
Java objects, XML documents and relational tables.
@@ -185,10 +191,11 @@ Description: Data binding framework for Java (XML, Objects, DB) - XML Schema
Package: libcastor-anttasks-java
Architecture: all
-Depends: libcastor-codegen-java,
- libcastor-ddlgen-java,
- libcommons-logging-java,
- ${misc:Depends}
+Depends:
+ libcastor-codegen-java,
+ libcastor-ddlgen-java,
+ libcommons-logging-java,
+ ${misc:Depends}
Recommends: ant
Suggests: libcastor-java-doc (= ${binary:Version})
Description: Data binding framework for Java (XML, Objects, DB) - Ant Tasks
=====================================
debian/libcastor-xml-java.poms
=====================================
--- /dev/null
+++ b/debian/libcastor-xml-java.poms
@@ -0,0 +1,7 @@
+core/pom.xml --no-parent --java-lib --package=libcastor-core-java --artifact=dist/castor-core-1.3.2.jar
+cpa/pom.xml --no-parent --java-lib --package=libcastor-jdo-java --artifact=dist/castor-jdo-1.3.2.jar
+xml/pom.xml --no-parent --java-lib --package=libcastor-xml-java --artifact=dist/castor-xml-1.3.2.jar
+codegen/pom.xml --no-parent --java-lib --package=libcastor-codegen-java --artifact=dist/castor-codegen-1.3.2.jar
+anttask/pom.xml --no-parent --java-lib --package=libcastor-anttasks-java --artifact=dist/castor-anttasks-1.3.2.jar
+ddlgen/pom.xml --no-parent --java-lib --package=libcastor-ddlgen-java --artifact=dist/castor-ddlgen-1.3.2.jar
+schema/pom.xml --no-parent --java-lib --package=libcastor-xml-schema-java --artifact=dist/castor-xml-schema-1.3.2.jar
=====================================
debian/maven.ignoreRules
=====================================
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+stax stax
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/dpkg/default.mk
-export JAVA_HOME=/usr/lib/jvm/default-java
-
%:
- dh $@ --with javahelper
+ dh $@ --buildsystem=ant --with javahelper --with maven-repo-helper
override_dh_auto_build:
cd src && ant release -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
@@ -13,45 +10,6 @@ override_dh_auto_build:
override_dh_install:
dh_install -Xjavadoc
- # XML module
- mh_installpom -plibcastor-xml-java --no-parent xml/pom.xml
- mh_installjar -plibcastor-xml-java -l xml/pom.xml \
- dist/castor-xml-$(DEB_VERSION_UPSTREAM).jar
- # Core module
- mh_installpom -plibcastor-core-java --no-parent core/pom.xml
- mh_installjar -plibcastor-core-java -l core/pom.xml \
- dist/castor-core-$(DEB_VERSION_UPSTREAM).jar
- # JDO module
- mh_installpom -plibcastor-jdo-java --no-parent cpa/pom.xml
- mh_installjar -plibcastor-jdo-java -l cpa/pom.xml \
- dist/castor-jdo-$(DEB_VERSION_UPSTREAM).jar
- # Codegen module
- mh_installpom -plibcastor-codegen-java --no-parent codegen/pom.xml
- mh_installjar -plibcastor-codegen-java -l codegen/pom.xml \
- dist/castor-codegen-$(DEB_VERSION_UPSTREAM).jar
- # Ant tasks
- mh_installpom -plibcastor-anttasks-java --no-parent anttask/pom.xml
- mh_installjar -plibcastor-anttasks-java -l anttask/pom.xml \
- dist/castor-anttasks-$(DEB_VERSION_UPSTREAM).jar
- # DDLgen module
- mh_installpom -plibcastor-ddlgen-java --no-parent ddlgen/pom.xml
- mh_installjar -plibcastor-ddlgen-java -l ddlgen/pom.xml \
- dist/castor-ddlgen-$(DEB_VERSION_UPSTREAM).jar
- # XML Schema module
- mh_installpom -plibcastor-xml-schema-java --no-parent schema/pom.xml
- mh_installjar -plibcastor-xml-schema-java -l schema/pom.xml \
- dist/castor-xml-schema-$(DEB_VERSION_UPSTREAM).jar
override_dh_auto_clean:
-cd src && ant distclean
- mh_clean
- cd cpa/target/generated-sources && rm -rf jjtree javacc
-
-get-orig-source:
- cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
- uscan \
- --verbose \
- --no-symlink \
- --destdir $(CURDIR) \
- --watchfile debian/watch \
- --force-download
View it on GitLab: https://salsa.debian.org/java-team/castor/compare/73919b581d0c4246422131bc39b2a5725dcef1d7...e44b47c446e8e8766d4453be1b7640aeff4d5856
--
View it on GitLab: https://salsa.debian.org/java-team/castor/compare/73919b581d0c4246422131bc39b2a5725dcef1d7...e44b47c446e8e8766d4453be1b7640aeff4d5856
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180731/5db6e985/attachment.html>
More information about the pkg-java-commits
mailing list