This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch experimental in repository mojarra.
commit b90650686a057bf472bf4a7cbca33257ab85c15c Author: Miguel Landaeta <[email protected]> Date: Sun Sep 28 13:09:53 2014 -0300 Fix 738110 and other minor issues --- debian/README.Debian | 14 +++----------- debian/changelog | 6 ++++-- debian/classpath-debian | 7 +++---- debian/clean | 1 + debian/control | 9 +++++---- debian/libjsf-api-java.jlibs | 1 - debian/libjsf-api-java.poms | 1 + debian/libjsf-impl-java.jlibs | 1 - debian/libjsf-java-doc.javadoc | 2 +- debian/maven.rules | 4 ++++ debian/rules | 8 +++++++- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index b07d3ff..a5db920 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -9,18 +9,10 @@ Mojarra Debian package doesn't contain some of the functionalities of upstream binary releases. Here is a list of excluded files regarding original content of Mojarra -2.0.2: +2.2.8: * libjsf-impl-java - [not-in-debian] Servlet 3.0 API. Code depending on this software cannot + [not-in-debian] JavaEE 7.0 API. Code depending on this software cannot be compiled and included because it is not available in Debian yet. - com/sun/faces/config/FacesInitializer.class - - [not-in-debian] Glassfish Application Server. Code depending on this - software cannot be compiled and included because it is not available - in Debian yet. - - com/sun/faces/vendor/GlassFishInjectionProvider* - - -- Miguel Landaeta <[email protected]> Tue, 15 Jun 2010 23:23:51 -0430 + -- Miguel Landaeta <[email protected]> Sun, 28 Sep 2014 13:45:39 -0300 diff --git a/debian/changelog b/debian/changelog index 54ef73b..7898d47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mojarra (2.2.8+dfsg-1) unstable; urgency=medium +mojarra (2.2.8+dfsg-1) UNRELEASED; urgency=medium [ Markus Koschany ] * New upstream release. (Closes: #758972, #759163). @@ -18,8 +18,10 @@ mojarra (2.2.8+dfsg-1) unstable; urgency=medium * Drop libjsf-impl-java package. Reason: it can't be built with software available in the archive. * Provide Maven artifacts. (Closes: #738110). + * Bump Standards-Version to 3.9.6. No changes were required. + * Replace dependencies on libservlet2.5-java with libservlet3.0-java. - -- Miguel Landaeta <[email protected]> Sat, 27 Sep 2014 20:30:01 -0300 + -- Miguel Landaeta <[email protected]> Sun, 28 Sep 2014 13:43:40 -0300 mojarra (2.0.3-3) unstable; urgency=low diff --git a/debian/classpath-debian b/debian/classpath-debian index df018bf..fb9de7c 100644 --- a/debian/classpath-debian +++ b/debian/classpath-debian @@ -1,10 +1,9 @@ -usr/share/java/el-api-2.1.jar -usr/share/java/jsp-api-2.1.jar -usr/share/java/servlet-api-2.5.jar +usr/share/java/el-api-2.2.jar +usr/share/java/jsp-api-2.2.jar +usr/share/java/servlet-api-3.0.jar usr/share/java/geronimo-validation.jar usr/share/java/glassfish-javaee.jar usr/share/java/groovy.jar -usr/share/java/catalina.jar usr/share/java/commons-digester.jar usr/share/java/commons-logging.jar usr/share/java/commons-beanutils.jar diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..84be17f --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +jsf-api.jar diff --git a/debian/control b/debian/control index 923c8a2..ac833c0 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Priority: optional Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.17), - javahelper + javahelper, + maven-repo-helper Build-Depends-Indep: ant, ant-contrib, @@ -24,9 +25,9 @@ Build-Depends-Indep: libgeronimo-validation-1.0-spec-java, libjetty-extra-java, libjetty-java, - libservlet2.5-java, + libservlet3.0-java, yui-compressor -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://javaserverfaces.java.net/ Vcs-Git: git://anonscm.debian.org/pkg-java/mojarra.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/mojarra.git @@ -34,7 +35,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/mojarra.git Package: libjsf-api-java Architecture: all Depends: - libservlet2.5-java, + libservlet3.0-java, ${misc:Depends} Suggests: glassfish-javaee, diff --git a/debian/libjsf-api-java.jlibs b/debian/libjsf-api-java.jlibs deleted file mode 100644 index 0647721..0000000 --- a/debian/libjsf-api-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -jsf-api/build/lib/jsf-api.jar diff --git a/debian/libjsf-api-java.poms b/debian/libjsf-api-java.poms new file mode 100644 index 0000000..6fa727f --- /dev/null +++ b/debian/libjsf-api-java.poms @@ -0,0 +1 @@ +./jsf-api/interim-pom.xml diff --git a/debian/libjsf-impl-java.jlibs b/debian/libjsf-impl-java.jlibs deleted file mode 100644 index ac8c662..0000000 --- a/debian/libjsf-impl-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -jsf-ri/build/lib/jsf-impl.jar diff --git a/debian/libjsf-java-doc.javadoc b/debian/libjsf-java-doc.javadoc index 79fa7ae..40ba81c 100644 --- a/debian/libjsf-java-doc.javadoc +++ b/debian/libjsf-java-doc.javadoc @@ -1 +1 @@ -target/api /usr/share/doc/libjsf-api-java/api +internal /usr/share/doc/libjsf-api-java/api diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..5bce9bf --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,4 @@ +javax.servlet servlet-api jar s/.*/3.0/ * * +javax.servlet.jsp jsp-api jar s/.*/2.2/ * * +javax.el el-api jar s/.*/2.2/ * * +s/javax\.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ jar s/.*/debian/ * * diff --git a/debian/rules b/debian/rules index 50ea785..5dc4bce 100755 --- a/debian/rules +++ b/debian/rules @@ -13,9 +13,15 @@ export CLASSPATH=/usr/share/java/servlet-api-3.0.jar:/usr/share/java/el-api-2.2. dh $@ --with javahelper override_dh_auto_clean: + mh_clean override_dh_auto_build: - jh_build javax.faces-api.jar jsf-api/src + jh_build jsf-api.jar jsf-api/src + +override_jh_installlibs: + mh_installpoms -plibjsf-api-java --set-version=$(UP_VER) + mh_installjar -plibjsf-api-java --usj-version=$(UP_VER) \ + --set-version=$(UP_VER) -l ./jsf-api/interim-pom.xml jsf-api.jar ## https://wiki.debian.org/onlyjob/get-orig-source get-orig-source: $(PKG)_$(VER).orig.tar.xz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mojarra.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
