[pkg-java] r14031 - in trunk/libcommons-net1-java/debian: . patches source

Torsten Werner twerner at alioth.debian.org
Sun Aug 7 08:40:43 UTC 2011 

Author: twerner
Date: 2011-08-07 08:40:43 +0000 (Sun, 07 Aug 2011)
New Revision: 14031

Added:
   trunk/libcommons-net1-java/debian/patches/series
   trunk/libcommons-net1-java/debian/source/
   trunk/libcommons-net1-java/debian/source/format
Modified:
   trunk/libcommons-net1-java/debian/changelog
   trunk/libcommons-net1-java/debian/control
   trunk/libcommons-net1-java/debian/doc-base
   trunk/libcommons-net1-java/debian/patches/01_build_xml_fork_to_compile_tests.patch
   trunk/libcommons-net1-java/debian/patches/02_build_xml_dont_build_tests.patch
   trunk/libcommons-net1-java/debian/rules
Log:
* Rename package to libcommons-net1-java and add Provides:
  libcommons-net-java.
* Remove Java runtime Depends.
* Switch to source format 3.0.

Modified: trunk/libcommons-net1-java/debian/changelog
===================================================================
--- trunk/libcommons-net1-java/debian/changelog	2011-08-07 08:24:14 UTC (rev 14030)
+++ trunk/libcommons-net1-java/debian/changelog	2011-08-07 08:40:43 UTC (rev 14031)
@@ -1,9 +1,16 @@
-libcommons-net-java (1.4.1-2.1) UNRELEASED; urgency=low
+libcommons-net1-java (1.4.1-3) unstable; urgency=low
 
+  [ Michael Koch ]
   * Fixed watch file to match version 1.x only.
 
- -- Michael Koch <konqueror at gmx.de>  Tue, 29 Sep 2009 09:44:43 +0200
+  [ Torsten Werner ]
+  * Rename package to libcommons-net1-java and add Provides:
+    libcommons-net-java.
+  * Remove Java runtime Depends.
+  * Switch to source format 3.0.
 
+ -- Torsten Werner <twerner at debian.org>  Sun, 07 Aug 2011 10:33:15 +0200
+
 libcommons-net-java (1.4.1-2) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/libcommons-net1-java/debian/control
===================================================================
--- trunk/libcommons-net1-java/debian/control	2011-08-07 08:24:14 UTC (rev 14030)
+++ trunk/libcommons-net1-java/debian/control	2011-08-07 08:40:43 UTC (rev 14031)
@@ -1,4 +1,4 @@
-Source: libcommons-net-java
+Source: libcommons-net1-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -10,10 +10,10 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-net-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-net-java/
 
-Package: libcommons-net-java
+Package: libcommons-net1-java
 Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless,
- liboro-java (>= 2.0.8), ${misc:Depends}
+Depends: liboro-java (>= 2.0.8), ${misc:Depends}
+Provides: libcommons-net-java
 Description: internet protocol suite Java library
  This is an Internet protocol suite Java library originally developed by
  ORO, Inc. This version supports Finger, Whois, TFTP, Telnet, POP3, FTP,

Modified: trunk/libcommons-net1-java/debian/doc-base
===================================================================
--- trunk/libcommons-net1-java/debian/doc-base	2011-08-07 08:24:14 UTC (rev 14030)
+++ trunk/libcommons-net1-java/debian/doc-base	2011-08-07 08:40:43 UTC (rev 14031)
@@ -6,5 +6,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-net-java/api/index.html
-Files: /usr/share/doc/libcommons-net-java/api/*
+Index: /usr/share/doc/libcommons-net1-java/api/index.html
+Files: /usr/share/doc/libcommons-net1-java/api/*

Modified: trunk/libcommons-net1-java/debian/patches/01_build_xml_fork_to_compile_tests.patch
===================================================================
--- trunk/libcommons-net1-java/debian/patches/01_build_xml_fork_to_compile_tests.patch	2011-08-07 08:24:14 UTC (rev 14030)
+++ trunk/libcommons-net1-java/debian/patches/01_build_xml_fork_to_compile_tests.patch	2011-08-07 08:40:43 UTC (rev 14031)
@@ -1,5 +1,7 @@
---- build.xml~	2005-12-03 16:05:48.000000000 +0000
-+++ build.xml	2006-08-01 09:45:03.000000000 +0000
+Index: libcommons-net-java/build.xml
+===================================================================
+--- libcommons-net-java.orig/build.xml	2011-08-07 10:34:34.000000000 +0200
++++ libcommons-net-java/build.xml	2011-08-07 10:35:40.000000000 +0200
 @@ -123,7 +123,8 @@
    <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
      <mkdir dir="${testclassesdir}">

Modified: trunk/libcommons-net1-java/debian/patches/02_build_xml_dont_build_tests.patch
===================================================================
--- trunk/libcommons-net1-java/debian/patches/02_build_xml_dont_build_tests.patch	2011-08-07 08:24:14 UTC (rev 14030)
+++ trunk/libcommons-net1-java/debian/patches/02_build_xml_dont_build_tests.patch	2011-08-07 08:40:43 UTC (rev 14031)
@@ -1,5 +1,7 @@
---- build.xml~	2006-08-01 09:47:53.000000000 +0000
-+++ build.xml	2006-08-01 09:50:13.000000000 +0000
+Index: libcommons-net-java/build.xml
+===================================================================
+--- libcommons-net-java.orig/build.xml	2011-08-07 10:35:40.000000000 +0200
++++ libcommons-net-java/build.xml	2011-08-07 10:35:48.000000000 +0200
 @@ -58,7 +58,7 @@
        </fileset>
      </copy>

Added: trunk/libcommons-net1-java/debian/patches/series
===================================================================
--- trunk/libcommons-net1-java/debian/patches/series	                        (rev 0)
+++ trunk/libcommons-net1-java/debian/patches/series	2011-08-07 08:40:43 UTC (rev 14031)
@@ -0,0 +1,2 @@
+01_build_xml_fork_to_compile_tests.patch
+02_build_xml_dont_build_tests.patch

Modified: trunk/libcommons-net1-java/debian/rules
===================================================================
--- trunk/libcommons-net1-java/debian/rules	2011-08-07 08:24:14 UTC (rev 14030)
+++ trunk/libcommons-net1-java/debian/rules	2011-08-07 08:40:43 UTC (rev 14031)
@@ -8,7 +8,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 DEB_JARS := oro junit
@@ -17,9 +16,9 @@
 VERSION=1.4.1
 ANT_OPTS = -Dant.build.javac.source=1.4
 
-install/lib$(LIBRARY)-java::
-	install -m 644 target/$(LIBRARY)-$(VERSION).jar debian/lib$(LIBRARY)-java/usr/share/java/$(LIBRARY)-$(VERSION).jar
-	echo "usr/share/java/$(LIBRARY)-$(VERSION).jar usr/share/java/$(LIBRARY).jar" > debian/lib$(LIBRARY)-java.links
+install/libcommons-net1-java::
+	dh_install -plibcommons-net1-java target/$(LIBRARY)-$(VERSION).jar /usr/share/java/
+	dh_link -plibcommons-net1-java /usr/share/java/$(LIBRARY)-$(VERSION).jar /usr/share/java/$(LIBRARY).jar
 
 #clean::
 #	-rm debian/lib$(LIBRARY)-java.links gjdoc_rawcomment.cache

Added: trunk/libcommons-net1-java/debian/source/format
===================================================================
--- trunk/libcommons-net1-java/debian/source/format	                        (rev 0)
+++ trunk/libcommons-net1-java/debian/source/format	2011-08-07 08:40:43 UTC (rev 14031)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-java-commits mailing list