[pkg-java] r17443 - in trunk/mockobjects/debian: . patches

Markus Koschany apo-guest at alioth.debian.org
Wed Nov 6 20:18:48 UTC 2013


Author: apo-guest
Date: 2013-11-06 20:18:47 +0000 (Wed, 06 Nov 2013)
New Revision: 17443

Added:
   trunk/mockobjects/debian/libmockobjects-java-doc.doc-base
Modified:
   trunk/mockobjects/debian/changelog
   trunk/mockobjects/debian/compat
   trunk/mockobjects/debian/control
   trunk/mockobjects/debian/copyright
   trunk/mockobjects/debian/patches/AssertMo.diff
   trunk/mockobjects/debian/rules
Log:
Debian release 0.09-5.

Remove needless dependency on default-headless-jre
Update to copyright format 1.0
Register documentation with doc-base.
Use compat level 9 and require debhelper >= 9
See also changelog



Modified: trunk/mockobjects/debian/changelog
===================================================================
--- trunk/mockobjects/debian/changelog	2013-11-06 15:33:43 UTC (rev 17442)
+++ trunk/mockobjects/debian/changelog	2013-11-06 20:18:47 UTC (rev 17443)
@@ -1,3 +1,20 @@
+mockobjects (0.09-5) unstable; urgency=low
+
+  * Team upload.
+  * Use compat level 9 and require debhelper >= 9.
+  * Run wrap-and-sort -sa.
+  * Update Standards-Version to 3.9.5, no changes.
+  * Use canonical VCS-URI.
+  * Update debian/copyright to copyright format 1.0
+  * libmockobjects-java: Remove dependency on
+    default-jre-headless | java2-runtime-headless. This is no longer required
+    by the Java policy.
+  * Register documentation with doc-base.
+  * Add DEP-3 header to AssertMo.diff.
+  * Use a slightly different short description for libmockobjects-java-doc.
+
+ -- Markus Koschany <apo at gambaru.de>  Wed, 06 Nov 2013 21:08:27 +0100
+
 mockobjects (0.09-4) unstable; urgency=low
 
   [ Thierry Carrez ]

Modified: trunk/mockobjects/debian/compat
===================================================================
--- trunk/mockobjects/debian/compat	2013-11-06 15:33:43 UTC (rev 17442)
+++ trunk/mockobjects/debian/compat	2013-11-06 20:18:47 UTC (rev 17443)
@@ -1 +1 @@
-5
+9

Modified: trunk/mockobjects/debian/control
===================================================================
--- trunk/mockobjects/debian/control	2013-11-06 15:33:43 UTC (rev 17442)
+++ trunk/mockobjects/debian/control	2013-11-06 20:18:47 UTC (rev 17443)
@@ -2,17 +2,25 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, default-jdk, junit
-Standards-Version: 3.8.4
+Uploaders:
+ Torsten Werner <twerner at debian.org>,
+ Varun Hiremath <varun at debian.org>
+Build-Depends:
+ cdbs,
+ debhelper (>= 9)
+Build-Depends-Indep:
+ ant,
+ default-jdk,
+ junit
+Standards-Version: 3.9.5
 Homepage: http://www.mockobjects.com
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mockobjects
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mockobjects/
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/mockobjects
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/mockobjects/
 
 Package: libmockobjects-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
+Depends:
+ ${misc:Depends}
 Description: Framework for developing and using mock objects
  Mock Objects is a test-first driven framework for building
  generic software and/or unit testing frameworks. It supports:
@@ -23,15 +31,17 @@
   also various other classes to make mock objects easier to write
   or to use.
   * A default set of mock implementations for the standard Java
-  platform APIs. We have made a start on packages such as servlets, sql, 
+  platform APIs. We have made a start on packages such as servlets, sql,
   and io.
 
 Package: libmockobjects-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
-Suggests: libmockobjects-java
-Description: Framework for developing and using mock objects
+Depends:
+ ${misc:Depends}
+Suggests:
+ libmockobjects-java
+Description: Framework for developing and using mock objects -- documentation
  Mock Objects is a test-first driven framework for building
  generic software and/or unit testing frameworks. It supports:
   * A methodology for developing and using mock objects.
@@ -41,7 +51,7 @@
   also various other classes to make mock objects easier to write
   or to use.
   * A default set of mock implementations for the standard Java
-  platform APIs. We have made a start on packages such as servlets, sql, 
+  platform APIs. We have made a start on packages such as servlets, sql,
   and io.
  .
  This package includes the mock objects javadocs.

Modified: trunk/mockobjects/debian/copyright
===================================================================
--- trunk/mockobjects/debian/copyright	2013-11-06 15:33:43 UTC (rev 17442)
+++ trunk/mockobjects/debian/copyright	2013-11-06 20:18:47 UTC (rev 17443)
@@ -1,62 +1,73 @@
-This package was debianized by Marcus Crafter <crafterm at debian.org> on
-Tue,  7 Sep 2004 12:43:20 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Mockobjects
+Source: http://sourceforge.net/cvs/?group_id=18189
 
-It was downloaded from http://sourceforge.net/cvs/?group_id=18189
+Files: *
+Copyright: 2000-2003, The Mockobjects developers
+License: Apache-1.1
+Comment:
+ See also https://sourceforge.net/mailarchive/forum.php?forum_id=971 for a list
+ of contributors for Mockobjects.
 
-Upstream Authors: Mock objects developers <http://sourceforge.net/mailarchive/forum.php?forum_id=971>
+Files: debian/*
+Copyright: 2004,       Marcus Crafter <crafterm at debian.org>
+           2006,       Thijs Kinkhorst <thijs at debian.org>
+           2007, 2010, Torsten Werner <twerner at debian.org>
+           2008,       Varun Hiremath <varun at debian.org>
+           2013,       Markus Koschany <apo at gambaru.de>
+License: Apache-1.1
 
-Copyright:
-
-/* ==================================================================== 
- * The Apache Software License, Version 1.1 
- * 
- * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights 
- * reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- * 
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in 
- *    the documentation and/or other materials provided with the 
- *    distribution. 
- * 
- * 3. The end-user documentation included with the redistribution, 
- *    if any, must include the following acknowledgment: 
- *       "This product includes software developed by the 
- *        Apache Software Foundation (http://www.apache.org/)." 
- *    Alternately, this acknowledgment may appear in the software itself, 
- *    if and wherever such third-party acknowledgments normally appear. 
- * 
- * 4. The name "MockObjects" must not be  
- *    used to endorse or promote products derived from this software  
- *    without prior written permission. For written permission, please  
- *    contact apache at apache.org. 
- * 
- * 5. Products derived from this software may not be called  
- *    "MockObjects", nor may "MockObjects" appear in their name,  
- *    without prior written permission of the Apache Software Foundation. 
- * 
- * THIS SOFTWARE IS PROVIDED AS IS'' AND ANY EXPRESSED OR IMPLIED 
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR 
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
- * ==================================================================== 
- * 
- * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Software Foundation.  For more 
- * information on the Apache Software Foundation, please see 
- * <http://www.apache.org/>. 
- */ 
+License: Apache-1.1
+ /* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The name "MockObjects" must not be
+ *    used to endorse or promote products derived from this software
+ *    without prior written permission. For written permission, please
+ *    contact apache at apache.org.
+ *
+ * 5. Products derived from this software may not be called
+ *    "MockObjects", nor may "MockObjects" appear in their name,
+ *    without prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */

Added: trunk/mockobjects/debian/libmockobjects-java-doc.doc-base
===================================================================
--- trunk/mockobjects/debian/libmockobjects-java-doc.doc-base	                        (rev 0)
+++ trunk/mockobjects/debian/libmockobjects-java-doc.doc-base	2013-11-06 20:18:47 UTC (rev 17443)
@@ -0,0 +1,9 @@
+Document: mockobjects
+Title: Mockobjects
+Author: The authors of mockobjects
+Abstract: This document describes how to use the Java Mockobjects library
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libmockobjects-java-doc/javadoc/index.html
+Files: /usr/share/doc/libmockobjects-java-doc/javadoc/*.html

Modified: trunk/mockobjects/debian/patches/AssertMo.diff
===================================================================
--- trunk/mockobjects/debian/patches/AssertMo.diff	2013-11-06 15:33:43 UTC (rev 17442)
+++ trunk/mockobjects/debian/patches/AssertMo.diff	2013-11-06 20:18:47 UTC (rev 17443)
@@ -1,8 +1,17 @@
-Index: mockobjects-0.09/src/core/com/mockobjects/util/AssertMo.java
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Wed, 6 Nov 2013 21:03:18 +0100
+Subject: AssertMo
+
 ===================================================================
---- mockobjects-0.09.orig/src/core/com/mockobjects/util/AssertMo.java	2008-01-13 00:11:14.000000000 +0530
-+++ mockobjects-0.09/src/core/com/mockobjects/util/AssertMo.java	2008-01-13 00:11:47.000000000 +0530
-@@ -77,7 +77,7 @@
+---
+ src/core/com/mockobjects/util/AssertMo.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/com/mockobjects/util/AssertMo.java b/src/core/com/mockobjects/util/AssertMo.java
+index 11846d5..ebd7923 100644
+--- a/src/core/com/mockobjects/util/AssertMo.java
++++ b/src/core/com/mockobjects/util/AssertMo.java
+@@ -77,7 +77,7 @@ public class AssertMo extends Assert {
          assertTrue("Should not have verified", threwException);
      }
  

Modified: trunk/mockobjects/debian/rules
===================================================================
--- trunk/mockobjects/debian/rules	2013-11-06 15:33:43 UTC (rev 17442)
+++ trunk/mockobjects/debian/rules	2013-11-06 20:18:47 UTC (rev 17443)
@@ -7,9 +7,9 @@
 DEB_ANT_BUILD_TARGET := jar-core javadoc
 DEB_JARS             := junit
 
-install/libmockobjects-java:: 
+install/libmockobjects-java::
 	install -m644 -D out/mockobjects-core-*.jar debian/libmockobjects-java/usr/share/java/mockobjects-core-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -p libmockobjects-java /usr/share/java/mockobjects-core-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/mockobjects-core.jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename	
+	-uscan --upstream-version 0 --rename




More information about the pkg-java-commits mailing list