[SCM] jakarta-taglibs-standard packaging branch, master, updated. 440d39b8c5d66e57520f122a2909dc69da003969

James Page james.page at ubuntu.com
Tue Jun 19 21:10:46 UTC 2012 

The following commit has been merged in the master branch:
commit 440d39b8c5d66e57520f122a2909dc69da003969
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jun 19 22:10:42 2012 +0100

    Fix FTBFS with openjdk-7 (Closes: #678166, LP: #888941):
    
    * Fix FTBFS with openjdk-7 (Closes: #678166, LP: #888941):
      - d/patches/java7-compat.patch: Compatibility patch for compilation
        with Java 7 API.
    * Bumped Standards-Version: 3.9.3:
      - d/copyright: Tidied deprecated field names and referenced released
        version of DEP-5.
    * Switch to debhelper >= 7 style rules:
      - d/control: Drop cdbs Build-Depends, specify minimum versions for
        debhelper and maven-repo-helper.
      - d/rules: Refactor to use minimal overrides.
    * Provide taglibs:standard maven artifacts (Closes: #673119):
      - d/libjakarta-taglibs-standard-java.poms: Specify location of pom
        file and artifacts to install.
      - d/libjakarta-taglibs-standard-java.jlibs: Dropped - no longer required.
      - d/rules,d/poms/standard.pom: Grab pom file from maven central.

diff --git a/debian/changelog b/debian/changelog
index ff40392..a25c301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+jakarta-taglibs-standard (1.1.2-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS with openjdk-7 (Closes: #678166, LP: #888941):
+    - d/patches/java7-compat.patch: Compatibility patch for compilation
+      with Java 7 API.
+  * Bumped Standards-Version: 3.9.3:
+    - d/copyright: Tidied deprecated field names and referenced released
+      version of DEP-5.
+  * Switch to debhelper >= 7 style rules:
+    - d/control: Drop cdbs Build-Depends, specify minimum versions for 
+      debhelper and maven-repo-helper.
+    - d/rules: Refactor to use minimal overrides.
+  * Provide taglibs:standard maven artifacts (Closes: #673119):
+    - d/libjakarta-taglibs-standard-java.poms: Specify location of pom
+      file and artifacts to install.
+    - d/libjakarta-taglibs-standard-java.jlibs: Dropped - no longer required.
+    - d/rules,d/poms/standard.pom: Grab pom file from maven central.
+
+ -- James Page <james.page at ubuntu.com>  Tue, 19 Jun 2012 21:29:36 +0100
+
 jakarta-taglibs-standard (1.1.2-1) unstable; urgency=low
 
   * Initial version. (Closes: #630112)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 078c2de..858e5d0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,13 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Onkar Shinde <onkarshinde at ubuntu.com>,
  James Page <james.page at ubuntu.com>
-Build-Depends: ant, cdbs, debhelper (>=5), javahelper, maven-repo-helper
+Build-Depends:
+ ant,
+ debhelper (>= 7.0.50~),
+ javahelper,
+ maven-repo-helper (>= 1.5~)
 Build-Depends-Indep: default-jdk, libservlet2.5-java, libxalan2-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-java/jakarta-taglibs-standard.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jakarta-taglibs-standard.git
 Homepage: http://tomcat.apache.org/taglibs/standard/
@@ -30,5 +34,5 @@ Description: JSP Standard Tag Library API v1.1 Reference Implementation
  Various tags are defined for common tasks such as conditional execution, loops,
  internationalization, XML processing etc.
  .
- This package is the reference implementation of JSTL 1.1 specification based 
+ This package is the reference implementation of JSTL 1.1 specification based
  on Jakarta taglibs standard..
diff --git a/debian/copyright b/debian/copyright
index d541687..099f160 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,5 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: jakarta-taglibs-standard
-Maintainer: The Apache Software Foundation
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: jakarta-taglibs-standard
 Source: http://tomcat.apache.org/taglibs/standard/
 
 Files: *
diff --git a/debian/libjakarta-taglibs-standard-java.jlibs b/debian/libjakarta-taglibs-standard-java.jlibs
deleted file mode 100644
index 2a9f892..0000000
--- a/debian/libjakarta-taglibs-standard-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-standard/build/standard/standard/lib/standard.jar
diff --git a/debian/libjakarta-taglibs-standard-java.poms b/debian/libjakarta-taglibs-standard-java.poms
new file mode 100644
index 0000000..c238769
--- /dev/null
+++ b/debian/libjakarta-taglibs-standard-java.poms
@@ -0,0 +1 @@
+debian/poms/standard.pom --java-lib --artifact=standard/build/standard/standard/lib/standard.jar
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
new file mode 100644
index 0000000..ffa15cc
--- /dev/null
+++ b/debian/patches/java7-compat.patch
@@ -0,0 +1,25 @@
+Index: jakarta-taglibs-standard/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+===================================================================
+--- jakarta-taglibs-standard.orig/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java	2012-06-12 21:40:55.049170000 +0100
++++ jakarta-taglibs-standard/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java	2012-06-12 21:41:52.171712718 +0100
+@@ -25,6 +25,9 @@
+ 
+ import org.apache.taglibs.standard.resources.Resources;
+ 
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
++
+ 
+ /**
+  * <p>A simple <code>DataSource</code> wrapper for the standard
+@@ -125,4 +128,10 @@
+         return null;
+     }
+ 
++    /*
++     * JDBC 4.1
++     */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 1f24f51..2c100b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_fix_build.diff
+java7-compat.patch
diff --git a/debian/poms/jstl.pom b/debian/poms/jstl.pom
index 9e6f9c4..6eb06e0 100644
--- a/debian/poms/jstl.pom
+++ b/debian/poms/jstl.pom
@@ -11,4 +11,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/debian/poms/standard.pom b/debian/poms/standard.pom
new file mode 100644
index 0000000..d43698a
--- /dev/null
+++ b/debian/poms/standard.pom
@@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>taglibs</groupId>
+  <artifactId>standard</artifactId>
+  <version>1.1.2</version>
+</project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index cc29484..e22e6ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,23 @@
 #!/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
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/el-api-2.1.jar
 
-JAVA_HOME_DIRS		:= /usr/lib/jvm/default-java
-DEB_JARS		:= el-api-2.1.jar
-DEB_ANT_BUILDFILE	:= standard/build.xml
-PACKAGE				:= jstl
-MAVEN_REPO          := http://repo1.maven.org/maven2
+DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p')
+MAVEN_REPO           := http://repo1.maven.org/maven2
 
-# Override normal javahelper install for jstl1.1
-# package to enable maven artefacts
-install/lib$(PACKAGE)1.1-java::
-	mh_install -plib$(PACKAGE)1.1-java
-	jh_classpath -plib$(PACKAGE)1.1-java
+%:
+	dh $@ --with maven_repo_helper,javahelper
+
+override_dh_auto_build:
+	ant -propertyfile debian/ant.properties -f standard/build.xml
 
 get-orig-source:
 	uscan --force-download --rename
 
 get-orig-pom:
 	mkdir -p debian/poms
-	wget  -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
-		$(MAVEN_REPO)/javax/servlet/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+	wget -U NoSuchBrowser/1.0 -O debian/poms/jstl.pom \
+		$(MAVEN_REPO)/javax/servlet/jstl/$(DEB_UPSTREAM_VERSION)/jstl-$(DEB_UPSTREAM_VERSION).pom
+	wget -U NoSuchBrowser/1.0 -O debian/poms/standard.pom \
+        $(MAVEN_REPO)/taglibs/standard/$(DEB_UPSTREAM_VERSION)/standard-$(DEB_UPSTREAM_VERSION).pom

-- 
jakarta-taglibs-standard packaging

More information about the pkg-java-commits mailing list