[jmock] 03/48: o Cleaning up after some comments from Arnaud.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jmock.

commit 68a29280f833a2567d86e2ff16c39bc38d5ebcac
Author: Trygve Laugstøl <trygvis at inamo.no>
Date:   Fri Sep 23 13:01:42 2005 +0000

    o Cleaning up after some comments from Arnaud.
---
 debian/changelog | 1 -
 debian/control   | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09b6d9d..f4eab78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 jmock (1.0.1-1) unstable; urgency=low
 
-  * Non-maintainer upload.
   * Initial Release (closes: #323048).
 
  -- Trygve Laugstøl <trygvis at inamo.no>  Mon,  8 Aug 2005 03:29:13 +0200
diff --git a/debian/control b/debian/control
index f6df417..f1f9361 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.no>
-Build-Depends-Indep: ant (>= 1.6.5), classpath (>= 2:0.17), debhelper (>> 4.0.0), dpatch (>= 2.0.15), gjdoc (>= 0.7.5), junit (>= 3.8.1), kaffe (>= 2:1.1.5), libgcj6 (>= 4.0.1)
+Build-Depends-Indep: ant (>= 1.6.5), classpath (>= 2:0.17), debhelper (>> 4.0.0), dpatch (>= 2.0.15), junit (>= 3.8.1), kaffe (>= 2:1.1.5), libgcj6 (>= 4.0.1)
 Standards-Version: 3.6.2
 
 Package: libjmock-java
 Architecture: all
-Depends: kaffe (>= 2:1.1.5) | java2-runtime
+Depends: kaffe (>= 2:1.1.5) | java1-runtime | java2-runtime
 Suggests: libjmock-java-doc
 Description: Java library for testing code with mock objects
  Mock objects help you design and test the interactions between the objects in
@@ -16,5 +16,5 @@ Description: Java library for testing code with mock objects
 
 Package: libjmock-java-doc
 Architecture: all
-Description: Java library for testing code with mock objects
+Description: Java library for testing code with mock objects - documentation
  Includes javadoc only.

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