[easymock] 04/41: Added doc-base files; many fixes in debian/changelog

Markus Koschany apo-guest at moszumanska.debian.org
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 ad0a01b7c99e1e0d41ba08ac22b07dfa70519817
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Wed Sep 12 08:05:12 2007 +0000

    Added doc-base files; many fixes in debian/changelog
---
 debian/changelog                             |  7 +++
 debian/control                               |  7 +--
 debian/copyright                             | 67 +++++++++++++++++++---------
 debian/libeasymock-java-doc.doc-base.apidocs | 10 +++++
 debian/libeasymock-java-doc.doc-base.manual  | 10 +++++
 5 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 652099b..9019a71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+easymock (2.3+ds1-1~pre2) unstable; urgency=low
+
+  * Many fixes to the packaging suggested by Michael Koch, regarding
+    debian/copyright, binary package relations and adding .doc-base files
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 12 Sep 2007 09:07:30 +0200
+
 easymock (2.3+ds1-1~pre1) unstable; urgency=low
 
   * Initial release. (Closes: #441839)
diff --git a/debian/control b/debian/control
index 4bdecfa..9dc4cd0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,14 @@ Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/easymock/
 XS-Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/easymock/
 Build-Depends: cdbs, debhelper (>= 5.0.42), dpatch (>= 2.0),
- java-gcj-compat-dev (>= 1.0.76),
- ant (>= 1.7.0), ant-optional (>= 1.7.0), junit4 (>= 4.3.1)
+ java-gcj-compat-dev (>= 1.0.76), ant-optional (>= 1.7.0), 
+ junit4 (>= 4.3.1)
 Standards-Version: 3.7.2
 
 Package: libeasymock-java
 Architecture: all
 Depends: java-gcj-compat (>= 1.0.76) | java2-runtime
+Suggests: libeasymock-java-doc
 Description: Java library to generate Mock Objects for given interfaces
  EasyMock 2 is a library that provides an easy way to use Mock Objects for given
  interfaces. Mock Objects simulate parts of the behavior of domain code,
@@ -25,7 +26,7 @@ Description: Java library to generate Mock Objects for given interfaces
 Package: libeasymock-java-doc
 Architecture: all
 Section: doc
-Suggests: libeasymock-java
+Enhances: libeasymock-java
 Description: Java library to generate Mock Objects for given interfaces (documentation)
  EasyMock 2 is a library that provides an easy way to use Mock Objects for given
  interfaces. Mock Objects simulate parts of the behavior of domain code,
diff --git a/debian/copyright b/debian/copyright
index 987135b..e851c6a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,61 @@
 This package was debianized by Jan-Pascal van Best <janpascal at vanbest.org> on
 Tue, 11 Sep 2007 14:03:47 +0200
 
-It was downloaded from
-http://www.easymock.org/Downloads.html
+It was downloaded from http://www.easymock.org/Downloads.html
 
-The easymockVERSION.zip file provided by upstream contains the source files in
+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.
+create easymock_$VERSION.orig.tar.gz containing the easymock source files.
 
-Copyright (c) 2001-2007 OFFIS <http://www.offis.de>, Tammo Freese <http://tammofreese.de>
+Software license
+================
 
+Upstream Authors: Tammo Freese <http://tammofreese.de>
+Copyright: 2001-2007 OFFIS <http://www.offis.de>, Tammo Freese <http://tammofreese.de>
 License:
+  EasyMock 2 License (MIT License)
 
-EasyMock 2 License (MIT License)
+  Permission is hereby granted, free of charge, to any person obtaining a copy of
+  this software and associated documentation files (the "Software"), to deal in
+  the Software without restriction, including without limitation the rights to
+  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+  the Software, and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+  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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-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.
diff --git a/debian/libeasymock-java-doc.doc-base.apidocs b/debian/libeasymock-java-doc.doc-base.apidocs
new file mode 100644
index 0000000..36ba018
--- /dev/null
+++ b/debian/libeasymock-java-doc.doc-base.apidocs
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000..4cab2a5
--- /dev/null
+++ b/debian/libeasymock-java-doc.doc-base.manual
@@ -0,0 +1,10 @@
+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

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



More information about the pkg-java-commits mailing list