[pkg-java] r10581 - trunk/libjboss-common-java/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-09-24 19:55:25 +0000 (Thu, 24 Sep 2009)
New Revision: 10581

Modified:
   trunk/libjboss-common-java/debian/build.xml
   trunk/libjboss-common-java/debian/changelog
   trunk/libjboss-common-java/debian/control
   trunk/libjboss-common-java/debian/copyright
   trunk/libjboss-common-java/debian/rules
Log:
libjboss-common-java (0.0+svn2938-2) UNRELEASED; urgency=low

  * Use default-{jre,jdk} as (Build-)Depends and added ant to
    Build-Depends.
  * Removed Build-Depends on libslide-webdavclient-java, which is
    scheduled for removal. This breaks backwards compatibility, as
    we had to remove: "org.jboss.net.protocol.http.DavURLLister"
  * Made debian/copyright refer to LGPL-2.1 rather than LGPL.
  * Bumped Standards-Version to 3.8.3.
    - Moved to section java.

 -- Niels Thykier <niels at thykier.net>  Thu, 24 Sep 2009 21:31:15 +0200


Modified: trunk/libjboss-common-java/debian/build.xml
===================================================================
--- trunk/libjboss-common-java/debian/build.xml	2009-09-24 19:52:43 UTC (rev 10580)
+++ trunk/libjboss-common-java/debian/build.xml	2009-09-24 19:55:25 UTC (rev 10581)
@@ -17,6 +17,8 @@
       <fileset dir="${common-logging-jdk.dir}/${source.dir}" />
     </copy>
 
+    <!-- We cannot build this, since it depends on a deprecated library -->
+    <delete file="all-sources/org/jboss/net/protocol/http/DavURLLister.java" />
     <mkdir dir="${class.dir}"/>
     <javac srcdir="all-sources" destdir="${class.dir}"
       debug="true" source="1.5"/>

Modified: trunk/libjboss-common-java/debian/changelog
===================================================================
--- trunk/libjboss-common-java/debian/changelog	2009-09-24 19:52:43 UTC (rev 10580)
+++ trunk/libjboss-common-java/debian/changelog	2009-09-24 19:55:25 UTC (rev 10581)
@@ -1,3 +1,16 @@
+libjboss-common-java (0.0+svn2938-2) UNRELEASED; urgency=low
+
+  * Use default-{jre,jdk} as (Build-)Depends and added ant to
+    Build-Depends.
+  * Removed Build-Depends on libslide-webdavclient-java, which is
+    scheduled for removal. This breaks backwards compatibility, as
+    we had to remove: "org.jboss.net.protocol.http.DavURLLister"
+  * Made debian/copyright refer to LGPL-2.1 rather than LGPL.
+  * Bumped Standards-Version to 3.8.3.
+    - Moved to section java.
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 24 Sep 2009 21:31:15 +0200
+
 libjboss-common-java (0.0+svn2938-1) unstable; urgency=low
 
   * new upstream version

Modified: trunk/libjboss-common-java/debian/control
===================================================================
--- trunk/libjboss-common-java/debian/control	2009-09-24 19:52:43 UTC (rev 10580)
+++ trunk/libjboss-common-java/debian/control	2009-09-24 19:55:25 UTC (rev 10581)
@@ -1,21 +1,22 @@
 Source: libjboss-common-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>,
- Torsten Werner <twerner at debian.org>
+ Torsten Werner <twerner at debian.org>,
+ Niels Thykier <niels at thykier.net>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev, libslide-webdavclient-java,
- liblog4j1.2-java, libcommons-httpclient-java
-Standards-Version: 3.8.0
-Homepage: http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCommonProject
+Build-Depends-Indep: default-jdk, liblog4j1.2-java,
+ libcommons-httpclient-java, ant
+Standards-Version: 3.8.3
+Homepage: http://www.jboss.org/community/wiki/JBossCommonProject
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-common-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-common-java
 
 Package: libjboss-common-java
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime
+ default-jre | java1-runtime | java2-runtime
 Description: The JBoss Common Project
  The common module in JBoss Application Server has been promoted to a
  standalone project. The project itself has now been and broken up

Modified: trunk/libjboss-common-java/debian/copyright
===================================================================
--- trunk/libjboss-common-java/debian/copyright	2009-09-24 19:52:43 UTC (rev 10580)
+++ trunk/libjboss-common-java/debian/copyright	2009-09-24 19:55:25 UTC (rev 10581)
@@ -22,7 +22,7 @@
     Lesser General Public License for more details.
 
     On Debian systems, full text of the LGPL license can be found at
-    `/usr/share/common-licenses/LGPL'.
+    `/usr/share/common-licenses/LGPL-2.1'.
 
 -------
 Some files in: 
@@ -78,5 +78,5 @@
     OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
+The Debian packaging is © 2007, Varun Hiremath <varunhiremath at gmail.com> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/libjboss-common-java/debian/rules
===================================================================
--- trunk/libjboss-common-java/debian/rules	2009-09-24 19:52:43 UTC (rev 10580)
+++ trunk/libjboss-common-java/debian/rules	2009-09-24 19:55:25 UTC (rev 10581)
@@ -3,10 +3,10 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-gcj
+JAVA_HOME 		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= log4j-1.2 commons-httpclient jakarta-slide-webdavlib
+DEB_JARS		:= log4j-1.2 commons-httpclient
 
 install/libjboss-common-java::
 	install -m 644 -D jboss-common.jar $(DEB_DESTDIR)/usr/share/java/jboss-common-$(DEB_UPSTREAM_VERSION).jar