[pkg-java] r16927 - in trunk/jaxme/debian: . patches

Emmanuel Bourg ebourg-guest at alioth.debian.org
Wed Jun 26 13:35:44 UTC 2013 

Author: ebourg-guest
Date: 2013-06-26 13:35:44 +0000 (Wed, 26 Jun 2013)
New Revision: 16927

Modified:
   trunk/jaxme/debian/changelog
   trunk/jaxme/debian/control
   trunk/jaxme/debian/patches/upstream.diff
Log:
Replaced the build dependency on libhsqldb-java by libhsqldb1.8.0-java (Closes: #713766)
Removed Michael Koch from the uploaders list (Closes: #654032)
Updated Standards-Versions to 3.9.4 (no changes)
Use canonical URLs for the Vcs-* fields



Modified: trunk/jaxme/debian/changelog
===================================================================
--- trunk/jaxme/debian/changelog	2013-06-26 13:07:01 UTC (rev 16926)
+++ trunk/jaxme/debian/changelog	2013-06-26 13:35:44 UTC (rev 16927)
@@ -1,3 +1,13 @@
+jaxme (0.5.2+dfsg-7) unstable; urgency=low
+
+  * Replaced the build dependency on libhsqldb-java by libhsqldb1.8.0-java
+    (Closes: #713766)
+  * Removed Michael Koch from the uploaders list (Closes: #654032)
+  * Updated Standards-Versions to 3.9.4 (no changes)
+  * Use canonical URLs for the Vcs-* fields
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 26 Jun 2013 15:33:32 +0200
+
 jaxme (0.5.2+dfsg-6) unstable; urgency=low
 
   * Add OSGi metadata to jar manifests

Modified: trunk/jaxme/debian/control
===================================================================
--- trunk/jaxme/debian/control	2013-06-26 13:07:01 UTC (rev 16926)
+++ trunk/jaxme/debian/control	2013-06-26 13:35:44 UTC (rev 16927)
@@ -2,15 +2,14 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>,
-           Jakub Adam <jakub.adam at ktknet.cz>
+Uploaders: Jakub Adam <jakub.adam at ktknet.cz>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 8), default-jdk, ant, ant-optional,
                antlr, junit, liblog4j1.2-java, libxerces2-java,
-               libxalan2-java, libcommons-codec-java, libhsqldb-java,
+               libxalan2-java, libcommons-codec-java, libhsqldb1.8.0-java,
                javahelper
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jaxme/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jaxme/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jaxme/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jaxme/
 Homepage: http://ws.apache.org/jaxme/
 
 Package: libjaxme-java

Modified: trunk/jaxme/debian/patches/upstream.diff
===================================================================
--- trunk/jaxme/debian/patches/upstream.diff	2013-06-26 13:07:01 UTC (rev 16926)
+++ trunk/jaxme/debian/patches/upstream.diff	2013-06-26 13:35:44 UTC (rev 16927)
@@ -1,10 +1,10 @@
---- jaxme-0.5.2+dfsg.orig/jaxme.properties
-+++ jaxme-0.5.2+dfsg/jaxme.properties
+--- /dev/null
++++ b/jaxme.properties
 @@ -0,0 +1,2 @@
 +preqs=/usr/share/java
 +javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
---- jaxme-0.5.2+dfsg.orig/build.xml
-+++ jaxme-0.5.2+dfsg/build.xml
+--- a/build.xml
++++ b/build.xml
 @@ -34,7 +34,7 @@
                 <include name="prerequisites/junit*.jar"/>
                 <include name="prerequisites/log4j*.jar"/>
@@ -14,8 +14,8 @@
                 <include name="prerequisites/xmldb-api-*.jar"/>
  	       </tarfileset>
  	       <tarfileset prefix="ws-jaxme-${version}/docs" dir="${build.site}"/>
---- jaxme-0.5.2+dfsg.orig/ant/pm.xml
-+++ jaxme-0.5.2+dfsg/ant/pm.xml
+--- a/ant/pm.xml
++++ b/ant/pm.xml
 @@ -37,9 +37,9 @@
          <pathelement location="${dist}/jaxmexs-${version}.jar"/>
          <pathelement location="${dist}/jaxme2-${version}.jar"/>
@@ -36,8 +36,8 @@
              <exclude name="org/apache/ws/jaxme/**/api4j/*" unless="have.inoapi4j"/>
              <exclude name="org/apache/ws/jaxme/pm/ino/URLEncoder14.java" unless="have14"/>   
          </javac>
---- jaxme-0.5.2+dfsg.orig/ant/xs.xml
-+++ jaxme-0.5.2+dfsg/ant/xs.xml
+--- a/ant/xs.xml
++++ b/ant/xs.xml
 @@ -23,7 +23,7 @@
      <property name="src.xs" location="${basedir}/src/xs"/>
  
@@ -47,8 +47,8 @@
          <pathelement location="${preqs}/junit.jar"/>
          <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
      </path>
---- jaxme-0.5.2+dfsg.orig/ant/api.xml
-+++ jaxme-0.5.2+dfsg/ant/api.xml
+--- a/ant/api.xml
++++ b/ant/api.xml
 @@ -25,7 +25,7 @@
      </target>
     
@@ -58,8 +58,8 @@
      </path>
  
      <target name="API.compile" depends="init">
---- jaxme-0.5.2+dfsg.orig/ant/jm.xml
-+++ jaxme-0.5.2+dfsg/ant/jm.xml
+--- a/ant/jm.xml
++++ b/ant/jm.xml
 @@ -34,9 +34,10 @@
        <pathelement location="${dist}/jaxmejs-${version}.jar"/>
        <pathelement location="${dist}/jaxmexs-${version}.jar"/>
@@ -72,8 +72,8 @@
      </path>
  
      <path id="jaxme.test.path">
---- jaxme-0.5.2+dfsg.orig/ant/js.xml
-+++ jaxme-0.5.2+dfsg/ant/js.xml
+--- a/ant/js.xml
++++ b/ant/js.xml
 @@ -35,8 +35,8 @@
      <property name="src.js" location="${basedir}/src/js"/>
  
@@ -90,7 +90,7 @@
      <path id="js.test.path">
          <path refid="js.class.path"/>
 -        <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
-+        <pathelement location="${preqs}/hsqldb.jar"/>
++        <pathelement location="${preqs}/hsqldb1.8.0.jar"/>
          <pathelement location="${dist}/jaxmejs-${version}.jar"/>
          <pathelement location="${build.js.test.classes}"/>
      </path>
@@ -103,8 +103,8 @@
              </classpath>
              <arg line="-o ${build.js.src}/org/apache/ws/jaxme/js/jparser"/>
              <arg file="${src.js}/org/apache/ws/jaxme/js/jparser/java15.g"/>
---- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
+--- a/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
++++ b/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
 @@ -21,16 +21,22 @@
  import java.io.OutputStreamWriter;
  import java.io.UnsupportedEncodingException;
@@ -184,8 +184,8 @@
 +        throw new UnsupportedOperationException();
 +    }
  }
---- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
+--- a/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
++++ b/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
 @@ -26,6 +26,10 @@
  import javax.xml.bind.JAXBException;
  import javax.xml.bind.UnmarshalException;
@@ -279,8 +279,8 @@
 +        throw new UnsupportedOperationException();
 +    }
  }
---- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
+--- a/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
++++ b/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
 @@ -556,7 +556,8 @@
  	  marshaller.marshal(e, sw);
  	  String got = sw.toString();
@@ -291,8 +291,8 @@
  }
  
    private RootElementHandler getRootElementInfo(String pElement) throws ParserConfigurationException, IOException, SAXException {
---- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
+--- a/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
++++ b/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
 @@ -88,9 +88,10 @@
      }
  
@@ -332,8 +332,8 @@
      }
  
      public void testUnmarshalOtherAttribute() throws Exception {
---- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
+--- a/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
++++ b/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
 @@ -17,9 +17,7 @@
  package org.apache.ws.jaxme.util;

More information about the pkg-java-commits mailing list