[pkg-java] r16276 - trunk/jajuk/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-08-16 21:19:02 +0000 (Thu, 16 Aug 2012)
New Revision: 16276

Modified:
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/control
   trunk/jajuk/debian/copyright
Log:
* Transition package to default java implementation (Closes: #683540):
  - d/rules: Prefer default-java for JAVA_HOME.
* d/control: Ensure to use default-{jdk,jre} (>= 1:1.6).
* d/control: Bump Standards-Version to 3.9.3: no changes needed.
* d/copyright: Upgrade to copyright-format 1.0

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2012-08-16 20:59:53 UTC (rev 16275)
+++ trunk/jajuk/debian/changelog	2012-08-16 21:19:02 UTC (rev 16276)
@@ -1,18 +1,18 @@
-jajuk (1:1.9.6-2) UNRELEASED; urgency=low
+jajuk (1:1.9.6-6) unstable; urgency=low
 
-  [ Miguel Landaeta ]
-  * Team upload.
-  * Bump Standards-Version to 3.9.3. No changes were required.
-  * Update copyright file.
-
   [ James Page ]
-  * Transition package to default java implementation:
+  * Transition package to default java implementation (Closes: #683540):
     - d/control: Switch BD from openjdk-6-jdk -> default-jdk, make
       default-jre the primary dependency for runtime.
-    - d/rules: Prefer default-java for JAVA_HOME. (Closes: #683540).
+    - d/rules: Prefer default-java for JAVA_HOME.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Thu, 02 Aug 2012 22:16:22 -0430
+  [ Damien Raude-Morvan ]
+  * d/control: Ensure to use default-{jdk,jre} (>= 1:1.6).
+  * d/control: Bump Standards-Version to 3.9.3: no changes needed.
+  * d/copyright: Upgrade to copyright-format 1.0
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 16 Aug 2012 23:02:01 +0200
+
 jajuk (1:1.9.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control	2012-08-16 20:59:53 UTC (rev 16275)
+++ trunk/jajuk/debian/control	2012-08-16 21:19:02 UTC (rev 16276)
@@ -7,6 +7,7 @@
            Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, debhelper (>= 7)
 Build-Depends-Indep: ant,
+                     default-jdk (>= 1:1.6),
                      entagged,
                      libbasicplayer-java,
                      libcobra-java,
@@ -39,7 +40,6 @@
                      libvorbisspi-java,
                      libxstream-java,
                      mplayer,
-                     default-jdk,
                      substance (>= 5.2)
 Standards-Version: 3.9.3
 Homepage: http://jajuk.info/
@@ -48,7 +48,8 @@
 
 Package: jajuk
 Architecture: all
-Depends: entagged,
+Depends: default-jre (>= 1:1.6) | java6-runtime | java7-runtime,
+         entagged,
          java-wrappers,
          libbasicplayer-java,
          libcobra-java,
@@ -84,7 +85,6 @@
          libvorbisspi-java,
          libxstream-java,
          mplayer,
-         default-jre | java6-runtime | java7-runtime,
          substance (>= 5.2),
          ${misc:Depends}
 Description: advanced jukebox and music organizer

Modified: trunk/jajuk/debian/copyright
===================================================================
--- trunk/jajuk/debian/copyright	2012-08-16 20:59:53 UTC (rev 16275)
+++ trunk/jajuk/debian/copyright	2012-08-16 21:19:02 UTC (rev 16276)
@@ -8,19 +8,19 @@
 License: GPL-2+
 
 Files: debian/*
-Copyright: © 2007-2009, Varun Hiremath <varunhiremath at gmail.com>,
+Copyright: © 2007-2009, Varun Hiremath <varunhiremath at gmail.com>
  © 2009-2010, Damien Raude-Morvan <drazzib at debian.org>
 License: GPL-2+
 
 Files: src/main/java/org/jajuk/i18n/*
-Copyright: © 2003,2009 Bertrand Florat,
- © 2003-2008 Gerhard Dietrichsteiner and Dominik Stadler,
- © 2004,2005,2006 Josep Carles Collazos,
- © 2006 Bart Cremers,
- © 2007, 2008, 2009 Vitaliy Tamm,
- © 2008 The Jajuk Team,
- © 2008 Xabier Cancela,
- © 2009 Zdenek Pech
+Copyright: Copyright 2003,2009 Bertrand Florat
+ Copyright 2003-2008 Gerhard Dietrichsteiner and Dominik Stadler
+ Copyright 2004,2005,2006 Josep Carles Collazos
+ Copyright 2006 Bart Cremers
+ Copyright 2007, 2008, 2009 Vitaliy Tamm
+ Copyright 2008 The Jajuk Team
+ Copyright 2008 Xabier Cancela
+ Copyright 2009 Zdenek Pech
 License: GPL-2+
 
 Files: src/main/java/ext/JSplashLabel.java
@@ -30,10 +30,10 @@
  src/main/java/ext/AutoCompleteDecorator.java
  src/main/java/ext/JXTrayIcon.java
  src/main/java/ext/JSplash.java
-Copyright: © 2007 The Jajuk Team,
- © 2004,2005 Gregory Kotsaftis <gregkotsaftis at yahoo.com>,
- © 2006 Fabio MARAZZATO, Yann D'ISANTO,
- © 2004, 2006, 2008 Sun Microsystems, Inc.
+Copyright: Copyright © 2007 The Jajuk Team
+ Copyright (c) 2004,2005 Gregory Kotsaftis <gregkotsaftis at yahoo.com>
+ Copyright (C) 2006  Fabio MARAZZATO, Yann D'ISANTO
+ Copyright © 2004, 2006, 2008 Sun Microsystems, Inc.
 License: LGPL-2.1+
 
 Files: src/main/java/ext/services/lastfm/*
@@ -45,9 +45,9 @@
  src/main/java/ext/services/xml/XMLBuilder.java
  src/main/java/ext/services/xml/XMLUtils.java
  src/main/java/ext/XMLUtils.java
-Copyright: © 2006-2009 Alex Aranda, Sylvain Gaudard, Thomas Beckers and contributors,
- © 2006-2007 Alex Aranda (fleax) alex at atunes.org,
- © 2003-2008 The Jajuk Team
+Copyright: Copyright (C) 2006-2009 Alex Aranda, Sylvain Gaudard, Thomas Beckers and contributors
+ Copyright (C) 2006-2007 Alex Aranda (fleax) alex at atunes.org
+ Copyright (C) 2003-2008 The Jajuk Team
 License: GPL-2+
 
 Files: src/main/resources/icons/*
@@ -79,3 +79,4 @@
 License: LGPL-2.1+
  On Debian systems, the complete text of LGPL 2.1 license can be found
  in `/usr/share/common-licenses/LGPL-2.1'.
+