[pkg-java] r4239 - in trunk/libcommons-discovery-java/debian: . patches

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Thu Sep 20 18:30:59 UTC 2007 

Author: varun-guest
Date: 2007-09-20 18:30:59 +0000 (Thu, 20 Sep 2007)
New Revision: 4239

Added:
   trunk/libcommons-discovery-java/debian/orig-tar.sh
Removed:
   trunk/libcommons-discovery-java/debian/dirs
   trunk/libcommons-discovery-java/debian/patches/02_jikes_target_1_3.patch
   trunk/libcommons-discovery-java/debian/patches/03_gjdoc_crash_fix.patch
Modified:
   trunk/libcommons-discovery-java/debian/changelog
   trunk/libcommons-discovery-java/debian/compat
   trunk/libcommons-discovery-java/debian/control
   trunk/libcommons-discovery-java/debian/docs
   trunk/libcommons-discovery-java/debian/patches/01_dont_copy_license.patch
   trunk/libcommons-discovery-java/debian/rules
   trunk/libcommons-discovery-java/debian/watch
Log:
* New upstream release
* debian/control:
  + Add myself and Kumar Appaiah to Uploaders.
  + move cdbs and debhelper to Build-Depends.
  + modify Description.
* debian/compat: switch to 5
* remove links file from debian/
* debian/rules:
  + Use DEB_UPSTREAM_VERSION to install jar
  + Create a versioned symbolic link to the jar.
  + implement get-orig-source
* debian/patches:
  + remove 02_jikes_target_1_3.patch, builds without setting target to 1.3
  + remove 03_gjdoc_crash_fix.patch, gjdoc bug has been fixed and no longer needed.
* Add debian/orig-tar.sh to move tarball to deb-layout's tarballs dir.
* Update debian/watch to call debian/orig-tar.sh
* debian/docs: remove adc-guidelines.html and best-practices.html as
  upstream provides only Maven xdocs XMLs.

Modified: trunk/libcommons-discovery-java/debian/changelog
===================================================================
--- trunk/libcommons-discovery-java/debian/changelog	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/changelog	2007-09-20 18:30:59 UTC (rev 4239)
@@ -1,12 +1,33 @@
-libcommons-discovery-java (0.2-11) UNRELEASED; urgency=low
+libcommons-discovery-java (0.4-1) unstable; urgency=low
 
+  [ Kumar Appaiah ]
   * debian/control:
     + Add XS-Vcs-{Svn,Browser} to debian/control
     + Add Homepage field.
   * Update watch file.
 
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Thu, 20 Sep 2007 20:10:13 +0530
+  [ Varun Hiremath ]
+  * New upstream release
+  * debian/control:
+    + Add myself and Kumar Appaiah to Uploaders.
+    + move cdbs and debhelper to Build-Depends.
+    + modify Description.
+  * debian/compat: switch to 5
+  * remove links file from debian/
+  * debian/rules:
+    + Use DEB_UPSTREAM_VERSION to install jar
+    + Create a versioned symbolic link to the jar.
+    + implement get-orig-source
+  * debian/patches:
+    + remove 02_jikes_target_1_3.patch, builds without setting target to 1.3
+    + remove 03_gjdoc_crash_fix.patch, gjdoc bug has been fixed and no longer needed.
+  * Add debian/orig-tar.sh to move tarball to deb-layout's tarballs dir.
+  * Update debian/watch to call debian/orig-tar.sh
+  * debian/docs: remove adc-guidelines.html and best-practices.html as
+    upstream provides only Maven xdocs XMLs.
 
+ -- Varun Hiremath <varunhiremath at gmail.com>  Thu, 20 Sep 2007 23:27:45 +0530
+
 libcommons-discovery-java (0.2-10) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe.

Modified: trunk/libcommons-discovery-java/debian/compat
===================================================================
--- trunk/libcommons-discovery-java/debian/compat	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/compat	2007-09-20 18:30:59 UTC (rev 4239)
@@ -1 +1,2 @@
-4
+5
+

Modified: trunk/libcommons-discovery-java/debian/control
===================================================================
--- trunk/libcommons-discovery-java/debian/control	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/control	2007-09-20 18:30:59 UTC (rev 4239)
@@ -2,8 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), libcommons-logging-java, junit, cdbs, ant, ant-optional, java-gcj-compat-dev
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: libcommons-logging-java, junit,  ant, ant-optional, java-gcj-compat-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java
@@ -29,5 +30,3 @@
  facilities for working within managed environments. These allow
  configuration and property overrides without appealing to the global
  System properties (which are scoped across an entire JVM).
- .
-  Homepage: <http://jakarta.apache.org/commons/discovery/>

Deleted: trunk/libcommons-discovery-java/debian/dirs
===================================================================
--- trunk/libcommons-discovery-java/debian/dirs	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/dirs	2007-09-20 18:30:59 UTC (rev 4239)
@@ -1,2 +0,0 @@
-usr/share/java
-usr/share/doc

Modified: trunk/libcommons-discovery-java/debian/docs
===================================================================
--- trunk/libcommons-discovery-java/debian/docs	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/docs	2007-09-20 18:30:59 UTC (rev 4239)
@@ -1,3 +1 @@
-discovery/adc-guidelines.html
-discovery/best-practices.html
-discovery/dist/docs/*
+dist/docs/*

Added: trunk/libcommons-discovery-java/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-discovery-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libcommons-discovery-java/debian/orig-tar.sh	2007-09-20 18:30:59 UTC (rev 4239)
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $3 $origDir
+    echo "moved $3 to $origDir"
+fi
+
+exit 0


Property changes on: trunk/libcommons-discovery-java/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/libcommons-discovery-java/debian/patches/01_dont_copy_license.patch
===================================================================
--- trunk/libcommons-discovery-java/debian/patches/01_dont_copy_license.patch	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/patches/01_dont_copy_license.patch	2007-09-20 18:30:59 UTC (rev 4239)
@@ -1,14 +1,17 @@
---- discovery/build.xml.orig	2004-03-13 00:23:35.591406024 +0100
-+++ discovery/build.xml	2004-03-13 00:23:43.435213584 +0100
-@@ -163,11 +163,7 @@
+diff -Nur libcommons-discovery-java-0.4/build.xml libcommons-discovery-java-0.4.new/build.xml
+--- libcommons-discovery-java-0.4/build.xml	2006-11-30 04:45:55.000000000 +0530
++++ libcommons-discovery-java-0.4.new/build.xml	2007-09-20 22:40:04.000000000 +0530
+@@ -180,13 +180,9 @@
     description="Create binary distribution">
      <!-- TODO: top level files like LICENSE and README -->
      <mkdir      dir="${dist.home}"/>
--    <copy      file="../LICENSE"
+-    <copy      file="LICENSE.txt"
 -              todir="${dist.home}"/>
+     <copy      file="NOTICE.txt"
+               todir="${dist.home}"/>
      <mkdir      dir="${build.home}/classes/META-INF"/>
--    <copy      file="../LICENSE"
+-    <copy      file="LICENSE.txt"
 -             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-     <jar    jarfile="${dist.home}/commons-${component.name}.jar"
-             basedir="${build.home}/classes"
-            manifest="${build.home}/conf/MANIFEST.MF"/>
+     <copy      file="NOTICE.txt"
+              tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+     <jar    jarfile="${dist.home}/${component.name}.jar"

Deleted: trunk/libcommons-discovery-java/debian/patches/02_jikes_target_1_3.patch
===================================================================
--- trunk/libcommons-discovery-java/debian/patches/02_jikes_target_1_3.patch	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/patches/02_jikes_target_1_3.patch	2007-09-20 18:30:59 UTC (rev 4239)
@@ -1,10 +0,0 @@
---- discovery/build.xml.orig	2004-08-14 16:15:48.241580576 +0200
-+++ discovery/build.xml	2004-08-14 16:15:00.145892232 +0200
-@@ -120,6 +120,7 @@
-            destdir="${build.home}/classes"
-              debug="${compile.debug}"
-        deprecation="${compile.deprecation}"
-+            target="1.3"
-           optimize="${compile.optimize}">
-       <classpath refid="compile.classpath"/>
-     </javac>

Deleted: trunk/libcommons-discovery-java/debian/patches/03_gjdoc_crash_fix.patch
===================================================================
--- trunk/libcommons-discovery-java/debian/patches/03_gjdoc_crash_fix.patch	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/patches/03_gjdoc_crash_fix.patch	2007-09-20 18:30:59 UTC (rev 4239)
@@ -1,10 +0,0 @@
---- discovery/src/java/org/apache/commons/discovery/tools/ResourceUtils.java.orig	2002-08-30 15:06:17.000000000 +0000
-+++ discovery/src/java/org/apache/commons/discovery/tools/ResourceUtils.java	2005-10-05 12:00:27.000000000 +0000
-@@ -153,7 +153,6 @@
-      *     <li>System Class Loader</li>
-      *   </ul>
-      * 
--     * @param
-      * @param propertiesFileName The property file name.
-      * 
-      * @return Instance of a class implementing the SPI.

Modified: trunk/libcommons-discovery-java/debian/rules
===================================================================
--- trunk/libcommons-discovery-java/debian/rules	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/rules	2007-09-20 18:30:59 UTC (rev 4239)
@@ -11,15 +11,14 @@
 JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := commons-logging junit $(ANT_HOME)/lib/ant-launcher.jar
-DEB_BUILDDIR	     := discovery
 DEB_ANT_BUILD_TARGET := dist test.discovery
 
 LIBRARY=commons-discovery
-VERSION=0.2
 
 install/lib${LIBRARY}-java::
-	install -m 644 discovery/dist/${LIBRARY}.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 -D -m 644 dist/${LIBRARY}.jar \
+		debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar
+	dh_link usr/share/java/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar usr/share/java/${LIBRARY}.jar
 
-clean::
-	-rm debian/lib${LIBRARY}-java.links
+get-orig-source:
+	-uscan --upstream-version 0 --rename

Modified: trunk/libcommons-discovery-java/debian/watch
===================================================================
--- trunk/libcommons-discovery-java/debian/watch	2007-09-20 16:30:02 UTC (rev 4238)
+++ trunk/libcommons-discovery-java/debian/watch	2007-09-20 18:30:59 UTC (rev 4239)
@@ -1,2 +1,3 @@
 version=3
-http://www.apache.org/dist/commons/discovery/source/ commons-discovery-([\d\.]+)-src.tar.gz debian uupdate
+http://www.apache.org/dist/commons/discovery/source/ commons-discovery-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh
+

More information about the pkg-java-commits mailing list