[pkg-java] r11864 - in trunk/libhamcrest-java/debian: . source

Gabriele Giacone gg0-guest at alioth.debian.org
Sun Mar 14 16:19:30 UTC 2010


Author: gg0-guest
Date: 2010-03-14 16:19:29 +0000 (Sun, 14 Mar 2010)
New Revision: 11864

Added:
   trunk/libhamcrest-java/debian/README.source
   trunk/libhamcrest-java/debian/source/
   trunk/libhamcrest-java/debian/source/format
Modified:
   trunk/libhamcrest-java/debian/build.xml
   trunk/libhamcrest-java/debian/changelog
   trunk/libhamcrest-java/debian/control
   trunk/libhamcrest-java/debian/copyright
Log:
generation of one class with all static imports

Added: trunk/libhamcrest-java/debian/README.source
===================================================================
--- trunk/libhamcrest-java/debian/README.source	                        (rev 0)
+++ trunk/libhamcrest-java/debian/README.source	2010-03-14 16:19:29 UTC (rev 11864)
@@ -0,0 +1,11 @@
+Information about libhamcrest
+-----------------------------
+
+ REPACKAGING
+
+ The upstream supplied source package contains binary jar files,
+ and hence upstream sources have been repackaged. Please use the
+ get-orig-source target from debian/rules to create the orig.tar.gz
+ used for Debian packaging. For more details on repackaging of
+ upstream sources please see the debian/orig-tar.sh file.
+

Modified: trunk/libhamcrest-java/debian/build.xml
===================================================================
--- trunk/libhamcrest-java/debian/build.xml	2010-03-14 12:29:14 UTC (rev 11863)
+++ trunk/libhamcrest-java/debian/build.xml	2010-03-14 16:19:29 UTC (rev 11864)
@@ -77,11 +77,40 @@
     <mkdir dir="${hamcrest-library.dir}/${class.dir}"/>
     <javac srcdir="${hamcrest-library.dir}/${source.dir}" destdir="${hamcrest-library.dir}/${class.dir}"
 	   debug="true" source="1.5" classpath="${hamcrest-core.jar}"/>
+    <jar jarfile="${hamcrest-library.jar}" manifest="debian/manifest/library.mf">
+      <fileset dir="${hamcrest-library.dir}/${class.dir}">
+        <include name="**"/>
+      </fileset>
+    </jar>
     
+    <!-- Generate one class with all static imports -->
+    <mkdir dir="${hamcrest-library.dir}/generated-code"/>
+    <java classname="org.hamcrest.generator.config.XmlConfigurator"
+          fork="yes"
+          failonerror="yes"
+          classpath="
+            ${hamcrest-core.jar};
+            ${hamcrest-generator.jar};
+            ${hamcrest-library.jar};
+            ${qdox.jar};
+          ">
+        <arg value="matchers.xml"/>
+        <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
+        <arg value="org.hamcrest.Matchers"/>
+        <arg value="${hamcrest-library.dir}/generated-code"/>
+    </java>
+    <mkdir dir="${hamcrest-library.dir}/generated-classes"/>
+    <javac srcdir="${hamcrest-library.dir}/generated-code" destdir="${hamcrest-library.dir}/generated-classes"
+           debug="true" source="1.5" classpath="${hamcrest-core.jar}:${hamcrest-library.jar};"/>
+
+    <!-- Append to library jar -->
     <jar jarfile="${hamcrest-library.jar}" manifest="debian/manifest/library.mf">
       <fileset dir="${hamcrest-library.dir}/${class.dir}">
         <include name="**"/>
       </fileset>
+      <fileset dir="${hamcrest-library.dir}/generated-classes">
+        <include name="**"/>
+      </fileset>
     </jar>
 
     <mkdir dir="${hamcrest-text.dir}/${class.dir}"/>

Modified: trunk/libhamcrest-java/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog	2010-03-14 12:29:14 UTC (rev 11863)
+++ trunk/libhamcrest-java/debian/changelog	2010-03-14 16:19:29 UTC (rev 11864)
@@ -1,3 +1,13 @@
+libhamcrest-java (1.1-5) unstable; urgency=low
+
+  * Added generation of one class with all static imports (Matchers.class).
+  * Standards-Version to 3.8.4.
+  * Source format 3.0 (quilt).
+  * d/copyright converted to DEP-5 format.
+  * Repackaging info moved from d/copyright to d/README.source
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 14 Mar 2010 15:24:16 +0100
+
 libhamcrest-java (1.1-4) unstable; urgency=low
 
   [ Thierry Carrez ]

Modified: trunk/libhamcrest-java/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control	2010-03-14 12:29:14 UTC (rev 11863)
+++ trunk/libhamcrest-java/debian/control	2010-03-14 16:19:29 UTC (rev 11864)
@@ -1,17 +1,16 @@
 Source: libhamcrest-java
 Section: java
+Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Michael Koch <konqueror at gmx.de>,
  Damien Raude-Morvan <drazzib at debian.org>
-Priority: optional
 Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
 Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/hamcrest/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libhamcrest-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhamcrest-java
 
-
 Package: libhamcrest-java
 Architecture: all
 Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}

Modified: trunk/libhamcrest-java/debian/copyright
===================================================================
--- trunk/libhamcrest-java/debian/copyright	2010-03-14 12:29:14 UTC (rev 11863)
+++ trunk/libhamcrest-java/debian/copyright	2010-03-14 16:19:29 UTC (rev 11864)
@@ -1,51 +1,15 @@
-This package was debianized by Varun Hiremath <varun at debian.org> on
-Fri, 7 Mar 2008 16:56:14 +0530
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Hamcrest - library of matchers for building test expressions
+Maintainer: Hamcrest Developers <http://groups.google.com/group/hamcrest-dev>
+Source: http://code.google.com/p/hamcrest/
 
-It was downloaded from http://code.google.com/p/hamcrest/
+Copyright: 2000-2006, www.hamcrest.org
+License: BSD
+  On Debian systems, the complete text of the BSD License can be
+  found in `/usr/share/common-licenses/BSD'.
 
-Repackaging:
-    The upstream supplied source package contains binary jar files,
-    and hence upstream sources have been repackaged. Please use the
-    get-orig-source target from debian/rules to create the orig.tar.gz
-    used for Debian packaging. For more details on repackaging of
-    upstream sources please see the debian/orig-tar.sh file.
-
-Upstream Authors: www.hamcrest.org
-
-Copyright: © 2000-2006, www.hamcrest.org
-
-License:
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following
-    disclaimer. 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.
-    
-    Neither the name of Hamcrest 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 COPYRIGHT HOLDERS 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 ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    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.
-    
-    On Debian systems, the complete text of the BSD License can be
-    found in `/usr/share/common-licenses/BSD'.
-
-The Debian packaging is (C) 2008, Varun Hiremath <varun at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Files: debian/*
+Copyright: 2008, Varun Hiremath <varun at debian.org>
+License: GPL
+  On Debian systems, the complete text of the GPL License can be
+  found in `/usr/share/common-licenses/GPL'.

Added: trunk/libhamcrest-java/debian/source/format
===================================================================
--- trunk/libhamcrest-java/debian/source/format	                        (rev 0)
+++ trunk/libhamcrest-java/debian/source/format	2010-03-14 16:19:29 UTC (rev 11864)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the pkg-java-commits mailing list