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

Fri Aug 3 03:10:59 UTC 2012

Author: nomadium-guest
Date: 2012-08-03 03:10:59 +0000 (Fri, 03 Aug 2012)
New Revision: 16265

Modified:
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/control
   trunk/jajuk/debian/copyright
   trunk/jajuk/debian/rules
Log:
[ 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:
  - 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).


Modified: trunk/jajuk/debian/changelog
===================================================================

--- trunk/jajuk/debian/changelog	2012-08-01 09:11:24 UTC (rev 16264)
+++ trunk/jajuk/debian/changelog	2012-08-03 03:10:59 UTC (rev 16265)
@@ -1,3 +1,18 @@
+jajuk (1:1.9.6-2) UNRELEASED; 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:
+    - 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).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 02 Aug 2012 22:16:22 -0430
+
 jajuk (1:1.9.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control	2012-08-01 09:11:24 UTC (rev 16264)
+++ trunk/jajuk/debian/control	2012-08-03 03:10:59 UTC (rev 16265)
@@ -39,9 +39,9 @@
                      libvorbisspi-java,
                      libxstream-java,
                      mplayer,
-                     openjdk-6-jdk,
+                     default-jdk,
                      substance (>= 5.2)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://jajuk.info/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jajuk
@@ -84,7 +84,7 @@
          libvorbisspi-java,
          libxstream-java,
          mplayer,
-         openjdk-6-jre | java6-runtime | java7-runtime,
+         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-01 09:11:24 UTC (rev 16264)
+++ trunk/jajuk/debian/copyright	2012-08-03 03:10:59 UTC (rev 16265)
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Jajuk
 Upstream-Contact: Bertrand Florat <bertrand at florat.net> and The Jajuk Team
 Source: http://www.jajuk.info/downloads.html
@@ -8,19 +8,19 @@
 License: GPL-2+
 
 Files: debian/*
-Copyright: © 2007-2009, Varun Hiremath <varunhiremath at gmail.com>
-Copyright: © 2009-2010, Damien Raude-Morvan <drazzib at debian.org>
+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
-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
+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
 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
-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.
+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.
 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: (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
+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
 License: GPL-2+
 
 Files: src/main/resources/icons/*

Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules	2012-08-01 09:11:24 UTC (rev 16264)
+++ trunk/jajuk/debian/rules	2012-08-03 03:10:59 UTC (rev 16265)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
+JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
 DEB_ANT_BUILDFILE	:= src/scripts/build.xml
 DEB_ANT_BUILD_TARGET	:= package_jar
 DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-httpclient commons-logging entagged-tageditor jaudiotagger jcommon jfreechart jl jmactritonusspi jogg jorbis jspeex log4j-1.2 mp3spi substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout jhlabs-filters lastfm commons-lang commons-io xstream simple-validation guava


