r2014 - in trunk/java-snmp/debian: . patches

Morten Werner Olsen werner at costa.debian.org
Wed Mar 22 23:22:16 UTC 2006


Author: werner
Date: 2006-03-22 23:22:15 +0000 (Wed, 22 Mar 2006)
New Revision: 2014

Modified:
   trunk/java-snmp/debian/changelog
   trunk/java-snmp/debian/copyright
   trunk/java-snmp/debian/patches/010_build_clean_target.diff
Log:
preparing new upload

Modified: trunk/java-snmp/debian/changelog
===================================================================
--- trunk/java-snmp/debian/changelog	2006-03-22 20:04:51 UTC (rev 2013)
+++ trunk/java-snmp/debian/changelog	2006-03-22 23:22:15 UTC (rev 2014)
@@ -1,9 +1,11 @@
-java-snmp (1.4-5) UNRELEASED; urgency=low
+java-snmp (1.4-5) unstable; urgency=low
 
+  * Added new clean-target patch from upstream (although it doesn't
+    work as the patch is reverted before 'ant clean' is called).
   * Updated upstream URL in debian/copyright.
   * Changed my uploader address. :)
 
- -- Morten Werner Olsen <werner at debian.org>  Thu, 19 Jan 2006 22:34:44 +0100
+ -- Morten Werner Olsen <werner at debian.org>  Thu, 23 Mar 2006 00:01:58 +0100
 
 java-snmp (1.4-4) unstable; urgency=low
 

Modified: trunk/java-snmp/debian/copyright
===================================================================
--- trunk/java-snmp/debian/copyright	2006-03-22 20:04:51 UTC (rev 2013)
+++ trunk/java-snmp/debian/copyright	2006-03-22 23:22:15 UTC (rev 2014)
@@ -8,24 +8,30 @@
 
 Copyright (C) 2003, Jonathan Sevy <jsevy at mcs.drexel.edu>
 
-This is free software. Redistribution and use in source and binary forms, with
-or without modification, are permitted provided that the following conditions
-are met:
+License:
 
- 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. The name of the author may not be used to endorse or promote products 
-    derived from this software without specific prior written permission.
+This is free software. Redistribution and use in source and binary
+forms, with or without modification, are permitted provided that the
+following conditions are met:
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 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. The name of the author may not be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

Modified: trunk/java-snmp/debian/patches/010_build_clean_target.diff
===================================================================
--- trunk/java-snmp/debian/patches/010_build_clean_target.diff	2006-03-22 20:04:51 UTC (rev 2013)
+++ trunk/java-snmp/debian/patches/010_build_clean_target.diff	2006-03-22 23:22:15 UTC (rev 2014)
@@ -1,13 +1,57 @@
-diff -ruN build.xml.orig build.xml
---- build.xml	2005-03-21 18:28:37.556968272 +0100
-+++ build.xml	2005-03-21 18:29:52.630555352 +0100
-@@ -70,6 +70,9 @@
+--- build.xml	2004-12-31 02:16:58.000000000 +0100
++++ /home/werner/build.xml	2006-03-23 00:19:22.000000000 +0100
+@@ -4,6 +4,19 @@
+         Ant build file for the Java SNMP Package
+     </description>
+   
++  <target name="SNMPPackage" description="Build the SNMP package">
++    <!-- Set the build directory -->
++    <property name="buildDir" value="build_package"/>
++    <!-- Create the build directory -->
++    <mkdir dir="${buildDir}"/>
++    <!-- Compile the java code from source into build -->
++    <javac srcdir="source" destdir="${buildDir}" includes="snmp/*.java"/>
++    <!-- Put everything in build into the ${mainClass}.jar file -->
++    <jar jarfile="snmp.jar" basedir="${buildDir}"/>
++    <!-- Delete the build directory tree -->
++    <delete dir="${buildDir}"/>
++  </target>
++
+   <target name="SNMPInquisitor" description="Build the SNMP Inquisitor application">
+     <!-- Set the main class to be SNMPInquisitor -->
+     <property name="mainClass" value="SNMPInquisitor"/>
+@@ -48,19 +61,6 @@
+     <delete dir="${buildDir}"/>
+   </target>
+ 
+-  <target name="SNMPPackage" description="Build the SNMP package">
+-    <!-- Set the build directory -->
+-    <property name="buildDir" value="build_package"/>
+-    <!-- Create the build directory -->
+-    <mkdir dir="${buildDir}"/>
+-    <!-- Compile the java code from source into build -->
+-    <javac srcdir="source" destdir="${buildDir}" includes="snmp/*.java"/>
+-    <!-- Put everything in build into the ${mainClass}.jar file -->
+-    <jar jarfile="snmp.jar" basedir="${buildDir}"/>
+-    <!-- Delete the build directory tree -->
+-    <delete dir="${buildDir}"/>
+-  </target>
+-
+   <target name="SNMPDistribution" description="Build the SNMP source distribution">
+     <!-- Zip up the source, manifests, and build files -->
+     <zip destfile="snmp_source.zip">
+@@ -70,6 +70,14 @@
      </zip>
    </target>
  
-+  <target name="clean" description="The clean target">
-+    <!-- Do nothing -->
++  <target name="clean" description="Clean up any previously built binaries">
++    <!-- Clean up any jar files -->
++    <delete quiet="true" file="snmp.jar"/>
++    <delete quiet="true" file="SNMPInquisitor.jar"/>
++    <delete quiet="true" file="SNMPAgentTest.jar"/>
++    <delete quiet="true" file="SNMPTrapTest.jar"/>
 +  </target>
++
  
  </project>
     




More information about the pkg-java-commits mailing list