[pkg-eucalyptus-commits] r236 - gwt/trunk/debian
Chris Halls
halls at alioth.debian.org
Wed Jul 4 12:09:37 UTC 2012
Author: halls
Date: 2012-07-04 12:09:37 +0000 (Wed, 04 Jul 2012)
New Revision: 236
Added:
gwt/trunk/debian/libgwt-dev-java.classpath
gwt/trunk/debian/libgwt-dev-java.jlibs
gwt/trunk/debian/libgwt-user-java.classpath
gwt/trunk/debian/libgwt-user-java.jlibs
Modified:
gwt/trunk/debian/changelog
gwt/trunk/debian/control
gwt/trunk/debian/rules
Log:
Migrate packaging to use javahelper
* Use jlibs instead of manual dh_install/link in rules
Modified: gwt/trunk/debian/changelog
===================================================================
--- gwt/trunk/debian/changelog 2012-07-04 12:09:33 UTC (rev 235)
+++ gwt/trunk/debian/changelog 2012-07-04 12:09:37 UTC (rev 236)
@@ -1,11 +1,6 @@
-gwt (2.4.0-1~0+halls) UNRELEASED; urgency=low
+gwt (2.4.0-1) UNRELEASED; urgency=low
- * Build on Debian
-
- -- Chris Halls <halls at debian.org> Thu, 31 May 2012 21:45:13 +0000
-
-gwt (2.4.0-0ubuntu2) precise; urgency=low
-
+ * Upload to Debian (Closes: #677571)
* Fix clean target when package is not built
* Bump version to build against jdt 3.7.3
* Add target to debian/rules for running dev unit tests
@@ -15,8 +10,9 @@
* patches/fix-guava-pkg-path: Fix path in unit tests
* patches/fix-test-classpath: New patch to use the same classpath for running
tests as used during the build
+ * Use javahelper to set a classpath and dependencies
- -- Chris Halls <chris.halls at credativ.co.uk> Tue, 24 Apr 2012 15:40:39 +0000
+ -- Chris Halls <halls at debian.org> Thu, 31 May 2012 21:45:13 +0000
gwt (2.4.0-0ubuntu1) precise; urgency=low
Modified: gwt/trunk/debian/control
===================================================================
--- gwt/trunk/debian/control 2012-07-04 12:09:33 UTC (rev 235)
+++ gwt/trunk/debian/control 2012-07-04 12:09:37 UTC (rev 236)
@@ -29,15 +29,16 @@
libhibernate-validator-java,
libhibernate3-java,
libjsilver-java
-Build-Depends: ant, ant-contrib, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.9.2
+Build-Depends: ant, ant-contrib, debhelper (>= 5), cdbs (>= 0.4.5.3), javahelper
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/pkg-eucalyptus/gwt/trunk
Vcs-Browser: http://svn.debian.org/websvn/pkg-eucalyptus/gwt
Homepage: http://google-web-toolkit.googlecode.com
Package: libgwt-user-java
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
Description: Google Web Toolkit (GWT) runtime libs
Google Web Toolkit (GWT) allows developers to quickly build and maintain
complex JavaScript front-end applications in the Java programming language.
@@ -46,7 +47,8 @@
Package: libgwt-dev-java
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
Description: Google Web Toolkit (GWT) dev libs
Google Web Toolkit (GWT) allows developers to quickly build and maintain
complex JavaScript front-end applications in the Java programming language.
Added: gwt/trunk/debian/libgwt-dev-java.classpath
===================================================================
--- gwt/trunk/debian/libgwt-dev-java.classpath (rev 0)
+++ gwt/trunk/debian/libgwt-dev-java.classpath 2012-07-04 12:09:37 UTC (rev 236)
@@ -0,0 +1 @@
+usr/share/java/gwt-dev-2.4.0.jar /usr/share/java/ant.jar /usr/share/java/commons-collections3.jar /usr/share/java/eclipse-ecj.jar /usr/share/java/glassfish-javaee.jar /usr/share/java/google-collections-1.0.jar /usr/share/java/guava.jar /usr/share/java/htmlunit-core-js.jar /usr/share/java/htmlunit.jar /usr/share/java/jetty.jar /usr/share/java/jetty-util.jar /usr/share/java/protobuf.jar
Added: gwt/trunk/debian/libgwt-dev-java.jlibs
===================================================================
--- gwt/trunk/debian/libgwt-dev-java.jlibs (rev 0)
+++ gwt/trunk/debian/libgwt-dev-java.jlibs 2012-07-04 12:09:37 UTC (rev 236)
@@ -0,0 +1 @@
+target/gwt-dev-*.jar
Added: gwt/trunk/debian/libgwt-user-java.classpath
===================================================================
--- gwt/trunk/debian/libgwt-user-java.classpath (rev 0)
+++ gwt/trunk/debian/libgwt-user-java.classpath 2012-07-04 12:09:37 UTC (rev 236)
@@ -0,0 +1,2 @@
+usr/share/java/gwt-servlet-2.4.0.jar /usr/share/java/flute-1.1-SNAPSHOT.jar /usr/share/java/glassfish-javaee-2.1.1-b31g.jar /usr/share/java/google-collections-1.0.jar /usr/share/java/guava-11.0.2.jar /usr/share/java/jsilver-1.0.0.jar /usr/share/java/json_simple-1.1.jar /usr/share/java/libgcj-4.7.jar /usr/share/java/sac-1.3.jar /usr/share/java/servlet-api-2.5.jar /usr/share/java/xml-apis-1.3.04.jar /usr/share/java/xml-apis-1.4.01.jar /usr/share/java/xml-apis-ext-1.4.01.jar /usr/share/maven-repo/javax/xml/jaxp-api/1.3/jaxp-api-1.3.jar /usr/share/maven-repo/org/apache/geronimo/specs/geronimo-validation_1.0_spec/1.1/geronimo-validation_1.0_spec-1.1.jar /usr/share/maven-repo/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA.jar
+usr/share/java/gwt-user-2.4.0.jar /usr/share/java/com.ibm.icu-4.2.1.1.jar /usr/share/java/com.ibm.icu-4.4.jar /usr/share/java/com.ibm.icu.base-4.2.1.1.jar /usr/share/java/com.ibm.icu.base-4.4.jar /usr/share/java/flute-1.1-SNAPSHOT.jar /usr/share/java/glassfish-javaee-2.1.1-b31g.jar /usr/share/java/google-collections-1.0.jar /usr/share/java/guava-11.0.2.jar /usr/share/java/jetty-6.1.24.jar /usr/share/java/jsilver-1.0.0.jar /usr/share/java/json_simple-1.1.jar /usr/share/java/junit-3.8.2.jar /usr/share/java/junit4-4.10.jar /usr/share/java/libgcj-4.7.jar /usr/share/java/sac-1.3.jar /usr/share/java/servlet-api-2.5.jar /usr/share/java/xml-apis-1.3.04.jar /usr/share/java/xml-apis-1.4.01.jar /usr/share/java/xml-apis-ext-1.4.01.jar /usr/share/maven-repo/javax/xml/jaxp-api/1.3/jaxp-api-1.3.jar /usr/share/maven-repo/net/sourceforge/htmlunit/htmlunit/2.8/htmlunit-2.8.jar /usr/share/maven-repo/org/apache/geronimo/specs/geronimo-validation_1.0_spec/1.1/geronimo-validation_1.0_spec-1.1.jar /usr/share/maven-repo/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA.jar
Added: gwt/trunk/debian/libgwt-user-java.jlibs
===================================================================
--- gwt/trunk/debian/libgwt-user-java.jlibs (rev 0)
+++ gwt/trunk/debian/libgwt-user-java.jlibs 2012-07-04 12:09:37 UTC (rev 236)
@@ -0,0 +1,2 @@
+target/gwt-user-*.jar
+target/gwt-servlet-*.jar
Modified: gwt/trunk/debian/rules
===================================================================
--- gwt/trunk/debian/rules 2012-07-04 12:09:33 UTC (rev 235)
+++ gwt/trunk/debian/rules 2012-07-04 12:09:37 UTC (rev 236)
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
@@ -13,20 +14,10 @@
clean::
rm -rf build target
-binary-post-install/libgwt-user-java::
- for jar in user servlet; do \
- dh_install -plibgwt-user-java target/gwt-$$jar-$(DEB_UPSTREAM_VERSION).jar usr/share/java; \
- dh_link -plibgwt-user-java usr/share/java/gwt-$$jar-$(DEB_UPSTREAM_VERSION).jar usr/share/java/gwt-$$jar.jar; \
- done
-
configure/libgwt-dev-java::
mkdir -p $(CURDIR)/build/out/dev/bin/com/google/gwt/dev
echo gwt.version=$(DEB_UPSTREAM_VERSION) >> $(CURDIR)/build/out/dev/bin/com/google/gwt/dev/About.properties
-binary-post-install/libgwt-dev-java::
- dh_install -plibgwt-dev-java target/gwt-dev-$(DEB_UPSTREAM_VERSION).jar usr/share/java
- dh_link -plibgwt-dev-java usr/share/java/gwt-dev-$(DEB_UPSTREAM_VERSION).jar usr/share/java/gwt-dev.jar
-
get-orig-source:
debian/orig-tar.sh --upstream-version $(DEB_UPSTREAM_VERSION)
More information about the pkg-eucalyptus-commits
mailing list