[pkg-java] r14947 - trunk/easyconf/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-09-19 17:51:00 +0000 (Mon, 19 Sep 2011)
New Revision: 14947

Modified:
   trunk/easyconf/debian/changelog
   trunk/easyconf/debian/control
   trunk/easyconf/debian/copyright
Log:
* d/control: Bump Standards-Version to 3.9.2: no changes needed.
* d/copyright: Fix DEP-5 format.

Modified: trunk/easyconf/debian/changelog
===================================================================
--- trunk/easyconf/debian/changelog	2011-09-19 17:12:37 UTC (rev 14946)
+++ trunk/easyconf/debian/changelog	2011-09-19 17:51:00 UTC (rev 14947)
@@ -1,3 +1,10 @@
+easyconf (0.9.5-2) unstable; urgency=low
+
+  * d/control: Bump Standards-Version to 3.9.2: no changes needed.
+  * d/copyright: Fix DEP-5 format.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 19 Sep 2011 19:48:57 +0200
+
 easyconf (0.9.5-1) unstable; urgency=low
 
   * Initial release. (Closes: #571261)

Modified: trunk/easyconf/debian/control
===================================================================
--- trunk/easyconf/debian/control	2011-09-19 17:12:37 UTC (rev 14946)
+++ trunk/easyconf/debian/control	2011-09-19 17:51:00 UTC (rev 14947)
@@ -3,20 +3,37 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, maven-repo-helper,
- libcommons-collections3-java, libcommons-logging-java, libcommons-lang-java,
- libcommons-digester-java, libcommons-configuration-java, libcommons-beanutils-java,
- libstruts1.2-java, libservlet2.5-java, libxstream-java, junit, ant-optional
-Standards-Version: 3.8.4
+Build-Depends: ant,
+               ant-optional,
+               cdbs,
+               debhelper (>= 7),
+               default-jdk,
+               junit,
+               libcommons-beanutils-java,
+               libcommons-collections3-java,
+               libcommons-configuration-java,
+               libcommons-digester-java,
+               libcommons-lang-java,
+               libcommons-logging-java,
+               libservlet2.5-java,
+               libstruts1.2-java,
+               libxstream-java,
+               maven-repo-helper
+Standards-Version: 3.9.2
 Homepage: http://easyconf.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/easyconf/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/easyconf/
 
 Package: libeasyconf-java
 Architecture: all
-Depends: ${misc:Depends}, libcommons-collections3-java, libcommons-logging-java, libcommons-lang-java,
- libcommons-digester-java, libcommons-configuration-java, libcommons-beanutils-java
-Suggests: libstruts1.2-java, libservlet2.5-java, libxstream-java
+Depends: libcommons-beanutils-java,
+         libcommons-collections3-java,
+         libcommons-configuration-java,
+         libcommons-digester-java,
+         libcommons-lang-java,
+         libcommons-logging-java,
+         ${misc:Depends}
+Suggests: libservlet2.5-java, libstruts1.2-java, libxstream-java
 Description: library to access configuration of software components
  EasyConf is a library to access configuration of software components
  and applications.

Modified: trunk/easyconf/debian/copyright
===================================================================
--- trunk/easyconf/debian/copyright	2011-09-19 17:12:37 UTC (rev 14946)
+++ trunk/easyconf/debian/copyright	2011-09-19 17:51:00 UTC (rev 14947)
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: EasyConf
-Maintainer: http://easyconf.sourceforge.net/
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: EasyConf
+Upstream-Contact: http://easyconf.sourceforge.net/
 Source: http://sourceforge.net/projects/easyconf/files/
 
 
@@ -14,14 +14,13 @@
 License: Apache-2.0
 
 Files: src/java/com/germinus/easyconf/servlet/RefreshConfigurationServlet.java
-Copyright: Copyright (c) 2000-2004 Liferay, LLC. 
+Copyright: Copyright (c) 2000-2004 Liferay, LLC.
 License: MIT
 
 Files: debian/*
 Copyright: 2010, Damien Raude-Morvan <drazzib at debian.org>
-License: Apache-2.0 | MIT
+License: Apache-2.0 or MIT
 
-
 License: Apache-2.0
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
@@ -33,10 +32,10 @@
  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 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
@@ -44,4 +43,3 @@
  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.
-