[easymock] 05/41: Reworkings resulting from Michael's comments

Tue Nov 25 16:49:09 GMT 2014

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository easymock.

commit 85aeadd233404e85c591b33fee83f0fcd3666499
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Thu Sep 13 06:31:10 2007 +0000

    Reworkings resulting from Michael's comments
---
 debian/README.Debian-source                        | 23 ++++++++++++
 debian/changelog                                   |  8 ++++
 debian/copyright                                   | 43 +++++-----------------
 debian/get-orig-source                             |  3 +-
 debian/libeasymock-java-doc.doc-base               | 16 ++++++++
 debian/libeasymock-java-doc.doc-base.apidocs       | 10 -----
 debian/libeasymock-java-doc.doc-base.manual        | 10 -----
 debian/patches/00list                              |  1 +
 ...to_samples_and_javadocs_in_Documentation.dpatch | 33 +++++++++++++++++
 debian/rules                                       |  2 +-
 10 files changed, 93 insertions(+), 56 deletions(-)

diff --git a/debian/README.Debian-source b/debian/README.Debian-source
new file mode 100644
index 0000000..56d7b29
--- /dev/null
+++ b/debian/README.Debian-source
@@ -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
+
diff --git a/debian/changelog b/debian/changelog
index 9019a71..49a5b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/copyright b/debian/copyright
index e851c6a..5e9f435 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,17 +3,14 @@ Tue, 11 Sep 2007 14:03:47 +0200
 
 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.
-
-Software license
-================
+Run the debian/get-orig-source.sh script to download the upstream ZIP file and 
+create the source tarball used by Debian.
 
 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 @@ License:
   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.
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 3a97883..10be288 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -16,7 +16,7 @@ UPSTREAM_SOURCE=$DESTDIR/easymock$VERSION.zip
 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 @@ mv $TEMPDIR/easymock$VERSION $BASEDIR
 
 mkdir $BASEDIR/src
 mkdir $BASEDIR/tests
+mkdir $BASEDIR/samples
 
 unzip -q $BASEDIR/src.zip -d $BASEDIR/src
 rm -f $BASEDIR/src.zip
diff --git a/debian/libeasymock-java-doc.doc-base b/debian/libeasymock-java-doc.doc-base
new file mode 100644
index 0000000..23201cb
--- /dev/null
+++ b/debian/libeasymock-java-doc.doc-base
@@ -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
diff --git a/debian/libeasymock-java-doc.doc-base.apidocs b/debian/libeasymock-java-doc.doc-base.apidocs
deleted file mode 100644
index 36ba018..0000000
--- a/debian/libeasymock-java-doc.doc-base.apidocs
+++ /dev/null
@@ -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
diff --git a/debian/libeasymock-java-doc.doc-base.manual b/debian/libeasymock-java-doc.doc-base.manual
deleted file mode 100644
index 4cab2a5..0000000
--- a/debian/libeasymock-java-doc.doc-base.manual
+++ /dev/null
@@ -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
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..b5a71cc
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
diff --git a/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch b/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
new file mode 100755
index 0000000..e7d04c7
--- /dev/null
+++ b/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
@@ -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>
diff --git a/debian/rules b/debian/rules
index 7dfe3e5..663792f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ DEB_ANT_BUILD_TARGET = jar javadoc
 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:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git

