[pkg-java] r4158 - in trunk/easymock/debian: . patches
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Thu Sep 13 06:31:11 UTC 2007
Author: janpascal-guest
Date: 2007-09-13 06:31:10 +0000 (Thu, 13 Sep 2007)
New Revision: 4158
Added:
trunk/easymock/debian/README.Debian-source
trunk/easymock/debian/libeasymock-java-doc.doc-base
trunk/easymock/debian/patches/
trunk/easymock/debian/patches/00list
trunk/easymock/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
Removed:
trunk/easymock/debian/libeasymock-java-doc.doc-base.apidocs
trunk/easymock/debian/libeasymock-java-doc.doc-base.manual
Modified:
trunk/easymock/debian/changelog
trunk/easymock/debian/copyright
trunk/easymock/debian/get-orig-source
trunk/easymock/debian/rules
Log:
Reworkings resulting from Michael's comments
Added: trunk/easymock/debian/README.Debian-source
===================================================================
--- trunk/easymock/debian/README.Debian-source (rev 0)
+++ trunk/easymock/debian/README.Debian-source 2007-09-13 06:31:10 UTC (rev 4158)
@@ -0,0 +1,23 @@
+README.Debian-source for EasyMock
+=================================
+
+The download from upstream is a ZIP file which contains:
+- src.zip, containing the source files for EasyMock
+- tests.zip, containing unit test source and class files
+- samples.zip containing sample source and class files
+- HTML documentation
+- pre-build javadocs
+- pre-build JAR file
+- Clover results
+
+The debian/get-orig-source.sh script downloads the upstream source that belongs
+with this Debian package, and creates the easymock_$VERSION.orig.tar.gz used as
+Debian source file. The script does the following:
+- unpack the upstream ZIP file to a temporary directory
+- unpack src.zip to src/
+- unpack tests.zip to tests/ and remove all class files from it
+- unpack samples.zip to samples/ and remove all class files from it
+- remove the pre-build javadocs and JAR file
+- remove the Clover result files
+- tar and gzip the result
+
Modified: trunk/easymock/debian/changelog
===================================================================
--- trunk/easymock/debian/changelog 2007-09-12 08:05:12 UTC (rev 4157)
+++ trunk/easymock/debian/changelog 2007-09-13 06:31:10 UTC (rev 4158)
@@ -1,3 +1,11 @@
+easymock (2.3+ds1-1~pre3) unstable; urgency=low
+
+ * Moved repackaging info to debian/README.Debian-source
+ * Included samples in the -doc package
+ * Clarified debian/copyright
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 13 Sep 2007 07:56:01 +0200
+
easymock (2.3+ds1-1~pre2) unstable; urgency=low
* Many fixes to the packaging suggested by Michael Koch, regarding
Modified: trunk/easymock/debian/copyright
===================================================================
--- trunk/easymock/debian/copyright 2007-09-12 08:05:12 UTC (rev 4157)
+++ trunk/easymock/debian/copyright 2007-09-13 06:31:10 UTC (rev 4158)
@@ -3,17 +3,14 @@
It was downloaded from http://www.easymock.org/Downloads.html
-The easymock$VERSION.zip file provided by upstream contains the source files in
-another zip file. It also contains the pre-built jar file and pre-built
-javadocs.
-Use the script debian/get-orig-source.sh to download the upstream source and
-create easymock_$VERSION.orig.tar.gz containing the easymock source files.
+Run the debian/get-orig-source.sh script to download the upstream ZIP file and
+create the source tarball used by Debian.
-Software license
-================
-
Upstream Authors: Tammo Freese <http://tammofreese.de>
-Copyright: 2001-2007 OFFIS <http://www.offis.de>, Tammo Freese <http://tammofreese.de>
+
+Copyright: 2001-2007 OFFIS <http://www.offis.de>
+ 2001-2007 Tammo Freese <http://tammofreese.de>
+
License:
EasyMock 2 License (MIT License)
@@ -34,28 +31,6 @@
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Debian packaging license
-========================
-
-The Debian packaging consists of build.xml and the files under debian/.
-
-Author: Jan-Pascal van Best <janpascal at vanbest.org>
-Copyright: 2007 Jan-Pascal van Best <janpascal at vanbest.org>
-License:
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
- Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- On Debian systems, the complete text of the GNU General Public License,
- version 2, can be found in /usr/share/common-licenses/GPL-2.
-
+The Debian packaging (build.xml and the files under debian/) is
+Copyright 2007 Jan-Pascal van Best <janpascal at vanbest.org>. It is
+licensed under the terms of the EasyMock 2 License above.
Modified: trunk/easymock/debian/get-orig-source
===================================================================
--- trunk/easymock/debian/get-orig-source 2007-09-12 08:05:12 UTC (rev 4157)
+++ trunk/easymock/debian/get-orig-source 2007-09-13 06:31:10 UTC (rev 4158)
@@ -16,7 +16,7 @@
ORIGFILE=$DESTDIR/easymock_$VERSION+ds1.orig.tar.gz
# Download upstream source
-#wget "$URL" -O $UPSTREAM_SOURCE
+wget "$URL" -O $UPSTREAM_SOURCE
# Easymock.zip contains the source files
# Repackage upstream source file without the third party jars
@@ -30,6 +30,7 @@
mkdir $BASEDIR/src
mkdir $BASEDIR/tests
+mkdir $BASEDIR/samples
unzip -q $BASEDIR/src.zip -d $BASEDIR/src
rm -f $BASEDIR/src.zip
Added: trunk/easymock/debian/libeasymock-java-doc.doc-base
===================================================================
--- trunk/easymock/debian/libeasymock-java-doc.doc-base (rev 0)
+++ trunk/easymock/debian/libeasymock-java-doc.doc-base 2007-09-13 06:31:10 UTC (rev 4158)
@@ -0,0 +1,16 @@
+Document: easymock-manual
+Title: EasyMock
+Author: Tammo Freese
+Abstract: This document describes how to use the
+ Java EasyMock library when testing your Java code.
+ Contains API documentation and sample code.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libeasymock-java-doc/Documentation.html
+Files: /usr/share/doc/libeasymock-java-doc/*.html
+ /usr/share/doc/libeasymock-java-doc/api/*.html
+ /usr/share/doc/libeasymock-java-doc/api/org/easymock/*.html
+ /usr/share/doc/libeasymock-java-doc/api/org/easymock/internal/*.html
+ /usr/share/doc/libeasymock-java-doc/api/org/easymock/internal/matchers/*.html
+ /usr/share/doc/libeasymock-java-doc/samples/org/easymock/samples/*.html
Deleted: trunk/easymock/debian/libeasymock-java-doc.doc-base.apidocs
===================================================================
--- trunk/easymock/debian/libeasymock-java-doc.doc-base.apidocs 2007-09-12 08:05:12 UTC (rev 4157)
+++ trunk/easymock/debian/libeasymock-java-doc.doc-base.apidocs 2007-09-13 06:31:10 UTC (rev 4158)
@@ -1,10 +0,0 @@
-Document: easymock-apidocs
-Title: EasyMock API documentation
-Author: Tammo Freese
-Abstract: Provides API documentation for the
- Java EasyMock library
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/libeasymock-java-doc/api/index.html
-Files: /usr/share/doc/libeasymock-java-doc/api/*.html /usr/share/doc/libeasymock-java-doc/api/org/easymock/*.html /usr/share/doc/libeasymock-java-doc/api/org/easymock/internal/*.html /usr/share/doc/libeasymock-java-doc/api/org/easymock/internal/matchers/*.html
Deleted: trunk/easymock/debian/libeasymock-java-doc.doc-base.manual
===================================================================
--- trunk/easymock/debian/libeasymock-java-doc.doc-base.manual 2007-09-12 08:05:12 UTC (rev 4157)
+++ trunk/easymock/debian/libeasymock-java-doc.doc-base.manual 2007-09-13 06:31:10 UTC (rev 4158)
@@ -1,10 +0,0 @@
-Document: easymock-manual
-Title: EasyMock documentation
-Author: Tammo Freese
-Abstract: This document describes how to use the
- Java EasyMock library when testing your Java code.
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/libeasymock-java-doc/Documentation.html
-Files: /usr/share/doc/libeasymock-java-doc/*.html
Added: trunk/easymock/debian/patches/00list
===================================================================
--- trunk/easymock/debian/patches/00list (rev 0)
+++ trunk/easymock/debian/patches/00list 2007-09-13 06:31:10 UTC (rev 4158)
@@ -0,0 +1 @@
+10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
Added: trunk/easymock/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
===================================================================
--- trunk/easymock/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch (rev 0)
+++ trunk/easymock/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch 2007-09-13 06:31:10 UTC (rev 4158)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_create_link_to_javadocs_in_Documentation.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad easymock~/Documentation.html easymock/Documentation.html
+--- easymock~/Documentation.html 2007-07-10 02:45:58.000000000 +0200
++++ easymock/Documentation.html 2007-09-13 08:17:21.000000000 +0200
+@@ -122,7 +122,7 @@
+ <p>
+ The code for both the class and the interface may be found
+ in the package
+-<code>org.easymock.samples</code> in <code>samples.zip</code>.
++<code>org.easymock.samples</code> in the <a href="samples/">samples</a> directory.
+ </p>
+ <p>
+ The following examples assume that you are familiar with the JUnit testing framework.
+@@ -856,6 +856,13 @@
+ provides the functionality for callbacks.
+ </p>
+ <h2>
++EasyMock API documentation
++</h2>
++<p>
++The API documentation for EasyMock is available in the
++<a href="api/">api</a> directory.
++</p>
++<h2>
+ EasyMock Development
+ </h2>
+ <p>
Property changes on: trunk/easymock/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/easymock/debian/rules
===================================================================
--- trunk/easymock/debian/rules 2007-09-12 08:05:12 UTC (rev 4157)
+++ trunk/easymock/debian/rules 2007-09-13 06:31:10 UTC (rev 4158)
@@ -26,7 +26,7 @@
DEB_ANT_CHECK_TARGET = test
DEB_JARS = ant-junit junit4
-DEB_INSTALL_DOCS_libeasymock-java-doc := api Documentation*.html easymock.css
+DEB_INSTALL_DOCS_libeasymock-java-doc := Documentation*.html easymock.css samples api
cleanbuilddir:: src
src:
More information about the pkg-java-commits
mailing list