[pkg-java] r4130 - in trunk/libyanfs-java: . debian

kumanna-guest at alioth.debian.org kumanna-guest at alioth.debian.org
Fri Sep 7 21:01:52 UTC 2007


Author: kumanna-guest
Date: 2007-09-07 21:01:52 +0000 (Fri, 07 Sep 2007)
New Revision: 4130

Added:
   trunk/libyanfs-java/debian/build.properties
   trunk/libyanfs-java/debian/build.xml
Removed:
   trunk/libyanfs-java/build.properties
   trunk/libyanfs-java/build.xml
Modified:
   trunk/libyanfs-java/debian/changelog
   trunk/libyanfs-java/debian/control
   trunk/libyanfs-java/debian/copyright
   trunk/libyanfs-java/debian/install
   trunk/libyanfs-java/debian/orig-tar.sh
   trunk/libyanfs-java/debian/rules
Log:
Overall package cleanup:

Move the build.* to debian/
Fix symlink
Versioned as 0.0+cvs<date>
Cleaned control, copyright


Deleted: trunk/libyanfs-java/build.properties
===================================================================
--- trunk/libyanfs-java/build.properties	2007-09-07 19:43:22 UTC (rev 4129)
+++ trunk/libyanfs-java/build.properties	2007-09-07 21:01:52 UTC (rev 4130)
@@ -1,4 +0,0 @@
-class.dir=class
-source.dir=src
-doc.dir=api
-jar.name=yanfs.jar

Deleted: trunk/libyanfs-java/build.xml
===================================================================
--- trunk/libyanfs-java/build.xml	2007-09-07 19:43:22 UTC (rev 4129)
+++ trunk/libyanfs-java/build.xml	2007-09-07 21:01:52 UTC (rev 4130)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<project default="jar" name="yanfs" basedir=".">
-  <property file="./build.properties" />
-  <target name="clean">
-    <delete dir="${class.dir}" quiet="true" />
-    <delete file="${jar.name}" quiet="true" />
-    <delete dir="${doc.dir}" quiet="true" />
-  </target>
-
-  <target name="compile">
-    <mkdir dir="${class.dir}" />
-    <javac srcdir="${source.dir}" destdir="${class.dir}"
-    deprecation="true" debug="true" optimize="false" />
-  </target>
-
-  <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="${jar.name}" basedir="${class.dir}"/>
-  </target>
-
-  <target name="javadoc" description="Creates Javadoc documentation">
-    <mkdir dir="${doc.dir}" />
-    <javadoc packagenames="com.sun.*"
-    sourcepath="${source.dir}" destdir="${doc.dir}" />
-  </target>
-
-  <target name="install" depends="jar">
-    <mkdir dir="${destdir}/usr/share/java/" />
-    <copy todir="${destdir}/usr/share/java/">
-      <fileset file="${jar.name}" />
-    </copy>
-  </target>
-</project>

Copied: trunk/libyanfs-java/debian/build.properties (from rev 4129, trunk/libyanfs-java/build.properties)
===================================================================
--- trunk/libyanfs-java/debian/build.properties	                        (rev 0)
+++ trunk/libyanfs-java/debian/build.properties	2007-09-07 21:01:52 UTC (rev 4130)
@@ -0,0 +1,4 @@
+class.dir=class
+source.dir=src
+doc.dir=api
+jar.name=yanfs.jar

Copied: trunk/libyanfs-java/debian/build.xml (from rev 4129, trunk/libyanfs-java/build.xml)
===================================================================
--- trunk/libyanfs-java/debian/build.xml	                        (rev 0)
+++ trunk/libyanfs-java/debian/build.xml	2007-09-07 21:01:52 UTC (rev 4130)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<project default="jar" name="yanfs" basedir="..">
+  <property file="./build.properties" />
+  <target name="clean">
+    <delete dir="${class.dir}" quiet="true" />
+    <delete file="${jar.name}" quiet="true" />
+    <delete dir="${doc.dir}" quiet="true" />
+  </target>
+
+  <target name="compile">
+    <mkdir dir="${class.dir}" />
+    <javac srcdir="${source.dir}" destdir="${class.dir}"
+    deprecation="true" debug="true" optimize="false" />
+  </target>
+
+  <target name="jar" description="o Create the jar" depends="compile">
+    <jar jarfile="${jar.name}" basedir="${class.dir}"/>
+  </target>
+
+  <target name="javadoc" description="Creates Javadoc documentation">
+    <mkdir dir="${doc.dir}" />
+    <javadoc packagenames="com.sun.*"
+    sourcepath="${source.dir}" destdir="${doc.dir}" />
+  </target>
+
+  <target name="install" depends="jar">
+    <mkdir dir="${destdir}/usr/share/java/" />
+    <copy todir="${destdir}/usr/share/java/">
+      <fileset file="${jar.name}" />
+    </copy>
+  </target>
+</project>

Modified: trunk/libyanfs-java/debian/changelog
===================================================================
--- trunk/libyanfs-java/debian/changelog	2007-09-07 19:43:22 UTC (rev 4129)
+++ trunk/libyanfs-java/debian/changelog	2007-09-07 21:01:52 UTC (rev 4130)
@@ -1,4 +1,4 @@
-libyanfs-java (20070825-1) unstable; urgency=low
+libyanfs-java (0.0+cvs20070825-1) unstable; urgency=low
 
   [ Varun Hiremath ]
   * Initial release (Closes: #441047)

Modified: trunk/libyanfs-java/debian/control
===================================================================
--- trunk/libyanfs-java/debian/control	2007-09-07 19:43:22 UTC (rev 4129)
+++ trunk/libyanfs-java/debian/control	2007-09-07 21:01:52 UTC (rev 4130)
@@ -11,7 +11,7 @@
 
 Package: libyanfs-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | gij | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java2-runtime
 Description: Yet Another NFS - a Java NFS library
  This project represents a Java implementation of the XDR, RPC, NFSv2,
  and NFSv3 protocols in client side form.

Modified: trunk/libyanfs-java/debian/copyright
===================================================================
--- trunk/libyanfs-java/debian/copyright	2007-09-07 19:43:22 UTC (rev 4129)
+++ trunk/libyanfs-java/debian/copyright	2007-09-07 21:01:52 UTC (rev 4130)
@@ -4,17 +4,26 @@
 It was downloaded from https://yanfs.dev.java.net/source/browse/yanfs/
 
 Upstream Authors:
-Agnes Jacob
-Brent Callaghan
-Lin Ling
-Ricardo Labiaga
+	 Agnes Jacob
+	 Brent Callaghan
+	 Lin Ling
+	 Ricardo Labiaga
 
-Copyright: (c) 1997, 2007 Sun Microsystems, Inc.
+Copyright: (c) 1997, 2007 Sun Microsystems, Inc. All rights reserved.
 
 License:
     Redistribution and use in source and binary forms, with or without
-    modification, are permitted under the terms of the BSD License.
-
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+    
     THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

Modified: trunk/libyanfs-java/debian/install
===================================================================
--- trunk/libyanfs-java/debian/install	2007-09-07 19:43:22 UTC (rev 4129)
+++ trunk/libyanfs-java/debian/install	2007-09-07 21:01:52 UTC (rev 4130)
@@ -1,2 +1 @@
-*.jar /usr/share/java
 api/* /usr/share/doc/libyanfs-java/api/

Modified: trunk/libyanfs-java/debian/orig-tar.sh
===================================================================
--- trunk/libyanfs-java/debian/orig-tar.sh	2007-09-07 19:43:22 UTC (rev 4129)
+++ trunk/libyanfs-java/debian/orig-tar.sh	2007-09-07 21:01:52 UTC (rev 4130)
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
-DATE=$1
-DIR=libyanfs-java-$DATE.orig
-TAR=../libyanfs-java_$DATE.orig.tar.gz
+DATE=$(echo $1|sed 's/^.*\+cvs//')
+DIR=libyanfs-java-$1.orig
+TAR=../libyanfs-java_$1.orig.tar.gz
 echo -n "Enter username for cvs.dev.java.net: "; read USERNAME
 CVSROOT=:pserver:$USERNAME at cvs.dev.java.net:/cvs
 

Modified: trunk/libyanfs-java/debian/rules
===================================================================
--- trunk/libyanfs-java/debian/rules	2007-09-07 19:43:22 UTC (rev 4129)
+++ trunk/libyanfs-java/debian/rules	2007-09-07 21:01:52 UTC (rev 4130)
@@ -1,7 +1,11 @@
 #!/usr/bin/make -f
 
+# This variable is used by the Makefile
+# to determine the root directory of
+# the sources. Upstream uses this, but
+# doesn't define it explicitly. So, we
+# do it here.
 export CODEMGR_WS=.
-export JAVADIR=/usr
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -9,6 +13,8 @@
 
 JAVA_HOME		:= /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET	:= jar javadoc
+DEB_ANT_BUILDFILE	:= debian/build.xml
+DEB_ANT_PROPERTYFILE	:= debian/build.properties
 
 clean::
 	(cd ./src/com/sun/gssapi/mechs/dummy/; $(RM) Dummy.java DummyCtxt.java)	
@@ -22,8 +28,11 @@
 	touch $@
 
 install/libyanfs-java::
-	dh_link /usr/share/java/yanfs.jar \
-		/usr/share/java/yanfs$(DEB_UPSTREAM_VERSION).jar
+	dh_install yanfs.jar /usr/share/java
+	mv $(DEB_DESTDIR)/usr/share/java/yanfs.jar \
+		$(DEB_DESTDIR)/usr/share/java/yanfs-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/yanfs-$(DEB_UPSTREAM_VERSION).jar \
+		/usr/share/java/yanfs.jar
 
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)




More information about the pkg-java-commits mailing list