[mojarra] 01/01: Prepare 2.2.8+dfsg-1 upload
Miguel Landaeta
nomadium at moszumanska.debian.org
Sun Sep 28 01:15:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch experimental
in repository mojarra.
commit c4774bd4634bbb68e1501c6ef7d1b510c310a040
Author: Miguel Landaeta <nomadium at debian.org>
Date: Sat Sep 27 22:15:43 2014 -0300
Prepare 2.2.8+dfsg-1 upload
---
debian/changelog | 23 ++++++++++++++++++++---
debian/control | 47 ++++++++---------------------------------------
debian/copyright | 2 +-
debian/rules | 19 ++++++-------------
debian/watch | 7 ++++---
5 files changed, 39 insertions(+), 59 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cf29d3e..54ef73b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,25 @@
mojarra (2.2.8+dfsg-1) unstable; urgency=medium
- * Test
-
- -- Markus Koschany <apo at gambaru.de> Sat, 30 Aug 2014 12:50:12 +0200
+ [ Markus Koschany ]
+ * New upstream release. (Closes: #758972, #759163).
+ This fixes the following security issues:
+ - CVE-2013-5855. (Closes: #740586).
+ - CVE-2012-2672. (Closes: #677194).
+ * Drop B-D on libtomcat6-java. (Closes: #749206, #759634).
+ * Update copyright file.
+ * Wrap and sort fields in d/control.
+ * Rewrite and improve get-orig-source target.
+ * Add B-D on Build-Depend on dpkg-dev >= 1.17 due to use of
+ dpkg-parsechangelog option -S.
+
+ [ Miguel Landaeta ]
+ * Update my maintainer email address.
+ * Switch build tool to Javahelper.
+ * Drop libjsf-impl-java package.
+ Reason: it can't be built with software available in the archive.
+ * Provide Maven artifacts. (Closes: #738110).
+
+ -- Miguel Landaeta <nomadium at debian.org> Sat, 27 Sep 2014 20:30:01 -0300
mojarra (2.0.3-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ae804e7..923c8a2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: mojarra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders:
- Miguel Landaeta <miguel at miguel.cc>
+ Miguel Landaeta <nomadium at debian.org>
Section: java
Priority: optional
Build-Depends:
@@ -36,42 +36,11 @@ Architecture: all
Depends:
libservlet2.5-java,
${misc:Depends}
-Recommends:
- libjsf-impl-java (= ${binary:Version})
Suggests:
glassfish-javaee,
libjsf-java-doc (= ${binary:Version})
-Description: JavaServer Faces 2.0 Java EE web framework - API
- JavaServer Faces 2.0 (JSF) is a Java-based Web application framework intended
- to simplify development integration of web-based user interfaces.
- .
- JSF hides complexity to maximize developer productivity and provides a
- component model, page templating, Ajax support, client device independence,
- clean separation of roles, better MVC handling for webapps, and world-class
- IDE integration from every available Java IDE.
- .
- JSF also provides a easy integration with popular enterprise technologies,
- including Hibernate, Spring, Seam, Jasper Reports and others. JSF 2.0 is
- compatible with JavaEE 5 application servers or any server implementing
- Servlet 2.5.
- .
- This package contains only API of JSF 2.0 spec. The reference implementation
- is provided with libjsf-impl-java.
-
-Package: libjsf-impl-java
-Architecture: all
-Depends:
- libjsf-api-java (= ${binary:Version}),
- libservlet2.5-java,
- ${misc:Depends}
-Suggests:
- groovy,
- libjetty-extra-java,
- libjetty-java,
- libjsf-java-doc (= ${binary:Version}),
- libtomcat6-java
-Description: JavaServer Faces 2.0 Java EE web framework - Implementation
- JavaServer Faces (JSF) 2.0 is a Java-based Web application framework intended
+Description: JavaServer Faces 2.2 Java EE web framework - API
+ JavaServer Faces 2.2 (JSF) is a Java-based Web application framework intended
to simplify development integration of web-based user interfaces.
.
JSF hides complexity to maximize developer productivity and provides a
@@ -80,11 +49,11 @@ Description: JavaServer Faces 2.0 Java EE web framework - Implementation
IDE integration from every available Java IDE.
.
JSF also provides a easy integration with popular enterprise technologies,
- including Hibernate, Spring, Seam, Jasper Reports and others. JSF 2.0 is
+ including Hibernate, Spring, Seam, Jasper Reports and others. JSF 2.2 is
compatible with JavaEE 5 application servers or any server implementing
Servlet 2.5.
.
- This package contains the reference implementation of JSF 2.0 API spec.
+ This package contains only API of JSF 2.2 spec.
Package: libjsf-java-doc
Architecture: all
@@ -96,7 +65,7 @@ Recommends:
Suggests:
default-jdk-doc
Description: Documentation for libjsf-api-java
- Documentation for JavaServer Faces (JSF) 2.0, that is a Java-based Web
+ Documentation for JavaServer Faces (JSF) 2.2, that is a Java-based Web
application framework intended to simplify development integration of
web-based user interfaces.
.
@@ -106,8 +75,8 @@ Description: Documentation for libjsf-api-java
IDE integration from every available Java IDE.
.
JSF also provides a easy integration with popular enterprise technologies,
- including Hibernate, Spring, Seam, Jasper Reports and others. JSF 2.0 is
+ including Hibernate, Spring, Seam, Jasper Reports and others. JSF 2.2 is
compatible with JavaEE 5 application servers or any server implementing
Servlet 2.5.
.
- This package contains a manual and Javadoc files for JSF 2.0 API spec.
+ This package contains a manual and Javadoc files for JSF 2.2 API spec.
diff --git a/debian/copyright b/debian/copyright
index af1585c..9c2fa60 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -307,7 +307,7 @@ Copyright: 1997-2010, Oracle anor its affiliates.
License: CDDL or GPL-2 and Apache-2.0
Files: debian/*
-Copyright: 2010, Miguel Landaeta <miguel at miguel.cc>
+Copyright: 2010,2014, Miguel Landaeta <nomadium at debian.org>
2014, Markus Koschany <apo at gambaru.de>
License: Apache-2.0
diff --git a/debian/rules b/debian/rules
index 14bd462..50ea785 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,25 +4,18 @@ VER := $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d- -f1)
UURL := https://svn.java.net/svn/mojarra~svn/tags/
PKG := mojarra
DTYPE := +dfsg
+UP_VER := $(shell echo $(VER) | sed "s/$(DTYPE)//")
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=$(CURDIR)
- 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=$(CURDIR)
- ant -f debian/build.xml javadoc
-
override_dh_auto_clean:
- -ant -Djsf.build.home=$(CURDIR) clean
-override_dh_clean:
- dh_clean -X.glassfish.orig
+override_dh_auto_build:
+ jh_build javax.faces-api.jar jsf-api/src
## https://wiki.debian.org/onlyjob/get-orig-source
get-orig-source: $(PKG)_$(VER).orig.tar.xz
@@ -30,7 +23,7 @@ get-orig-source: $(PKG)_$(VER).orig.tar.xz
$(PKG)_$(VER).orig.tar.xz:
svn checkout --config-option config:miscellany:use-commit-times=yes \
- $(UURL)$(VER) $(PKG)-$(VER) \
+ $(UURL)$(UP_VER) $(PKG)-$(VER) \
|| $(RM) -r $(PKG)-$(VER)
@echo "Clean-up..."
find $(PKG)-$(VER) -iname "*.jar" -delete -printf 'removed %p\n'
@@ -38,5 +31,5 @@ $(PKG)_$(VER).orig.tar.xz:
find $(PKG)-$(VER) -depth -name ".svn" -exec $(RM) -r '{}' \;
@echo "Packing..."
find -L "$(PKG)-$(VER)" -xdev -type f -print \
- | sort | XZ_OPT="-7v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+ | sort | XZ_OPT="-7v" tar -caf "$(PKG)_$(UP_VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
&& $(RM) -r "$(PKG)-$(VER)"
diff --git a/debian/watch b/debian/watch
index 35cd013..20e6c01 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
version=3
-http://java.net/projects/javaserverfaces/downloads/directory/release \
-/projects/javaserverfaces/downloads/download/release/mojarra-([0-9\.]+).*-source\.zip \
-debian debian/orig-tar.sh
+opts="dversionmangle=s/\+dfsg//" \
+ https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/ \
+ https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/(.+)/ \
+ debian
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mojarra.git
More information about the pkg-java-commits
mailing list