[mojarra] 01/01: WIP

[Miguel Landaeta]

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

nomadium pushed a commit to branch 2.2.8
in repository mojarra.

commit dd0a677c7f156290b49141ba4a6515759caad56b
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Sep 27 18:34:40 2014 -0300

    WIP
---
 debian/changelog      |  6 ++++++
 debian/control        |  4 ++--
 debian/patches/series |  4 ++--
 debian/rules          | 22 ++++++++++++----------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7cb1a5..15be6d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mojarra (2.2.8-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 23 Aug 2014 11:27:59 -0700
+
 mojarra (2.0.3-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 0b33fce..84556ab 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Section: java
 Priority: optional
 Build-Depends: debhelper (>= 9), default-jdk, javahelper, ant,
  libservlet2.5-java, libgeronimo-validation-1.0-spec-java, glassfish-javaee,
- groovy, libtomcat6-java, libcommons-digester-java, libcommons-logging-java,
+ groovy, libtomcat7-java, libcommons-digester-java, libcommons-logging-java,
  libcommons-beanutils-java, ant-contrib, bnd, yui-compressor, libjetty-java,
  libjetty-extra-java, ant-optional, default-jdk-doc,
- libcommons-collections3-java
+ libcommons-collections3-java, libcdi-api-java
 Standards-Version: 3.9.5
 Homepage: https://javaserverfaces.dev.java.net/
 Vcs-Git: git://anonscm.debian.org/pkg-java/mojarra.git
diff --git a/debian/patches/series b/debian/patches/series
index 485a252..4956f13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-fix_debian_build.diff
-650430.diff
+#fix_debian_build.diff
+#650430.diff
diff --git a/debian/rules b/debian/rules
index ded3ba9..666c350 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,25 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/servlet-api-3.0.jar:/usr/share/java/el-api-2.2.jar:/usr/share/java/jsp-api-2.2.jar:/usr/share/java/glassfish-javaee.jar:/usr/share/java/cdi-api.jar:/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/geronimo-validation.jar:/usr/share/java/groovy.jar
 
 %:
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	ant -Djsf.build.home=$$(pwd)
-	ant -f debian/build.xml injectionprovider
-	# build command is run twice because in the first run jsf-api.jar
-	# has some classes missing and they are included in the 2nd run.
-	ant -Djsf.build.home=$$(pwd)
-	ant -f debian/build.xml javadoc
+#	ant -Djsf.build.home=$$(pwd)
+#	ant -f debian/build.xml injectionprovider
+#	# build command is run twice because in the first run jsf-api.jar
+#	# has some classes missing and they are included in the 2nd run.
+#	ant -Djsf.build.home=$$(pwd)
+#	ant -f debian/build.xml javadoc
+	jh_build javax.faces-2.2.8.jar com javax
 
-override_dh_auto_clean:
-	-ant -Djsf.build.home=$$(pwd) clean
+#override_dh_auto_clean:
+#	-ant -Djsf.build.home=$$(pwd) clean
 
-override_dh_clean:
-	dh_clean -X.glassfish.orig
+#override_dh_clean:
+#	dh_clean -X.glassfish.orig
 
 get-orig-source:
 	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mojarra.git