[pkg-java] r13574 - in trunk/easymock/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-04-25 11:36:16 +0000 (Mon, 25 Apr 2011)
New Revision: 13574

Modified:
   trunk/easymock/debian/
   trunk/easymock/debian/changelog
   trunk/easymock/debian/control
   trunk/easymock/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
Log:
* Team upload.
* Drop Depends on JRE packages since it's a library (as per Debian Java
  Policy).
* Update Standards-Version: 3.9.2 (no changes needed).


Property changes on: trunk/easymock/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/easymock/debian/changelog
===================================================================
--- trunk/easymock/debian/changelog	2011-04-25 10:18:31 UTC (rev 13573)
+++ trunk/easymock/debian/changelog	2011-04-25 11:36:16 UTC (rev 13574)
@@ -1,9 +1,17 @@
-easymock (2.4+ds1-5) UNRELEASED; urgency=low
+easymock (2.4+ds1-5) unstable; urgency=low
 
+  * Team upload.
+
+  [ Matthias Schmitz ]
   * Install the pom.xml (Closes:#593160)  
 
- -- Matthias Schmitz <matthias at sigxcpu.org>  Thu, 31 Mar 2011 21:22:51 +0200
+  [ Damien Raude-Morvan ]
+  * Drop Depends on JRE packages since it's a library (as per Debian Java
+    Policy).
+  * Update Standards-Version: 3.9.2 (no changes needed).
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 25 Apr 2011 13:35:11 +0200
+
 easymock (2.4+ds1-4) unstable; urgency=low
 
   * Team upload.

Modified: trunk/easymock/debian/control
===================================================================
--- trunk/easymock/debian/control	2011-04-25 10:18:31 UTC (rev 13573)
+++ trunk/easymock/debian/control	2011-04-25 11:36:16 UTC (rev 13574)
@@ -8,12 +8,12 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/easymock/
 Build-Depends: cdbs, debhelper (>= 5.0.42), default-jdk, ant-optional (>= 1.7.0),
  junit4 (>= 4.6-2), maven-repo-helper
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Homepage: http://www.easymock.org
 
 Package: libeasymock-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless
+Depends: ${misc:Depends}
 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

Modified: 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	2011-04-25 10:18:31 UTC (rev 13573)
+++ trunk/easymock/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch	2011-04-25 11:36:16 UTC (rev 13574)
@@ -5,9 +5,8 @@
 ## DP: Update documentation to link to the installed API docs and samples
 
 @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
+--- a/Documentation.html
++++ b/Documentation.html
 @@ -122,7 +122,7 @@
  <p>
  The code for both the class and the interface may be found 
@@ -17,7 +16,7 @@
  </p>
  <p>
  The following examples assume that you are familiar with the JUnit testing framework.
-@@ -856,6 +856,13 @@
+@@ -877,6 +877,13 @@
  provides the functionality for callbacks. 
  </p>
  <h2>