Author: varun-guest Date: 2007-10-24 16:24:17 +0000 (Wed, 24 Oct 2007) New Revision: 4464
Added: trunk/jajuk/ trunk/jajuk/debian/ trunk/jajuk/debian/Jajuk.desktop trunk/jajuk/debian/MANIFEST.MF trunk/jajuk/debian/README.Debian-source trunk/jajuk/debian/ant.properties trunk/jajuk/debian/build.xml trunk/jajuk/debian/changelog trunk/jajuk/debian/compat trunk/jajuk/debian/control trunk/jajuk/debian/copyright trunk/jajuk/debian/docs trunk/jajuk/debian/install trunk/jajuk/debian/jajuk.1 trunk/jajuk/debian/jajuk.sh trunk/jajuk/debian/manpages trunk/jajuk/debian/orig-tar.exclude trunk/jajuk/debian/orig-tar.sh trunk/jajuk/debian/patches/ trunk/jajuk/debian/patches/cobra.diff trunk/jajuk/debian/patches/lastfm.diff trunk/jajuk/debian/patches/series trunk/jajuk/debian/rules trunk/jajuk/debian/watch Log: * Initial inject of Jajuk Property changes on: trunk/jajuk/debian ___________________________________________________________________ Name: mergeWithUpstream + 1 Added: trunk/jajuk/debian/Jajuk.desktop =================================================================== --- trunk/jajuk/debian/Jajuk.desktop (rev 0) +++ trunk/jajuk/debian/Jajuk.desktop 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Jajuk +Comment=Jajuk Advanced Jukebox +Exec=jajuk +Icon=jajuk-icon_64x64 +Terminal=false +Type=Application +Categories=AudioVideo Added: trunk/jajuk/debian/MANIFEST.MF =================================================================== --- trunk/jajuk/debian/MANIFEST.MF (rev 0) +++ trunk/jajuk/debian/MANIFEST.MF 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,5 @@ +Manifest-Version: 2.0 +Main-Class: org.jajuk.Main +Created-By: Jajuk team +Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-httpclient.jar commons-logging.jar entagged-tageditor.jar forms.jar jcommon.jar jdic.jar jfreechart.jar jh.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar js.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar qdwizard.jar substance.jar swingx.jar tablelayout.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar +Specification-Title: Jajuk Added: trunk/jajuk/debian/README.Debian-source =================================================================== --- trunk/jajuk/debian/README.Debian-source (rev 0) +++ trunk/jajuk/debian/README.Debian-source 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,15 @@ +jajuk +===== + +Jajuk depends on Jintellitype library but this library ONLY works on +Windows and can not be packaged for Debian. To compile Jajuk without +JIntellitype the org/jajuk/ui/action/WindowsHotKeyManager.java has +been removed from the upstream source. + +For more details see https://trac.jajuk.info/ticket/606 + +Use the rules/get-orig-source target to create the orig.tar.gz. +For more details on repackaging of upstream sources please see the +debian/orig-tar.sh file. + +-- Varun Hiremath <[EMAIL PROTECTED]> Mon, 27 Aug 2007 21:28:06 +0530 Added: trunk/jajuk/debian/ant.properties =================================================================== --- trunk/jajuk/debian/ant.properties (rev 0) +++ trunk/jajuk/debian/ant.properties 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,8 @@ +class.dir=build +source.dir=src/main/java +doc.dir=src/doc +help.dir=help +resources.dir=src/main/resources +jar.name=jajuk.jar +jar-help.name=jajuk-help.jar +jar-help_fr.name=jajuk-help_fr.jar Added: trunk/jajuk/debian/build.xml =================================================================== --- trunk/jajuk/debian/build.xml (rev 0) +++ trunk/jajuk/debian/build.xml 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project default="jar" name="Jajuk" basedir=".."> + <property file="build.properties"/> + + <target name="clean" description="Clean up"> + <delete dir="${class.dir}"/> + <delete dir="${help.dir}"/> + <delete file="${jar.name}"/> + </target> + + <target name="compile" description="Compile the sources"> + <mkdir dir="${class.dir}"/> + <javac srcdir="${source.dir}" destdir="${class.dir}" + deprecation="true" debug="true" optimize="false"/> + </target> + + <target name="javadoc" description="Creates the documentation jars"> + <mkdir dir="${help.dir}"/> + <copy todir="${help.dir}"> + <fileset dir="${doc.dir}/jajuk-hs" /> + </copy> + <copy todir="${help.dir}/default"> + <fileset dir="${doc.dir}"> + <include name="images/**" /> + <include name="icons/**" /> + </fileset> + </copy> + <copy todir="${help.dir}/fr"> + <fileset dir="${doc.dir}"> + <include name="images/**" /> + <include name="icons/**" /> + </fileset> + </copy> + <jar jarfile="${jar-help.name}" basedir="${help.dir}/default"/> + <jar jarfile="${jar-help_fr.name}" basedir="${help.dir}/fr" /> + </target> + + <target name="jar" description="Create the jars" depends="compile, javadoc"> + <mkdir dir="${class.dir}/images/included/"/> + <copy todir="${class.dir}/images/included/"> + <fileset dir="${resources.dir}/images/included" /> + </copy> + <mkdir dir="${class.dir}/icons"/> + <copy todir="${class.dir}/icons"> + <fileset dir="${resources.dir}/icons" /> + </copy> + <mkdir dir="${class.dir}/perspectives"/> + <copy todir="${class.dir}/perspectives"> + <fileset dir="${resources.dir}/perspectives" /> + </copy> + <copy todir="${class.dir}/org/jajuk/util/log/"> + <fileset file="${source.dir}/org/jajuk/util/log/jajuk-log4j-conf.xml" /> + </copy> + <copy todir="${class.dir}/org/jajuk/i18n/"> + <fileset file="${source.dir}/org/jajuk/i18n/*.properties" /> + </copy> + <jar jarfile="${jar.name}" basedir="${class.dir}" manifest="debian/MANIFEST.MF"/> + </target> + + <target name="install" depends="jar"> + <mkdir dir="${destdir}/usr/share/java/" /> + <copy file="${jar.name}" todir="${destdir}/usr/share/java/"/> + </target> +</project> Added: trunk/jajuk/debian/changelog =================================================================== --- trunk/jajuk/debian/changelog (rev 0) +++ trunk/jajuk/debian/changelog 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,5 @@ +jajuk (1.4+svn2947-1) unstable; urgency=low + + * Initial release (Closes: #423608) + + -- Varun Hiremath <[EMAIL PROTECTED]> Thu, 11 Oct 2007 07:36:30 +0530 Added: trunk/jajuk/debian/compat =================================================================== --- trunk/jajuk/debian/compat (rev 0) +++ trunk/jajuk/debian/compat 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1 @@ +5 Added: trunk/jajuk/debian/control =================================================================== --- trunk/jajuk/debian/control (rev 0) +++ trunk/jajuk/debian/control 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,20 @@ +Source: jajuk +Section: contrib/sound +Priority: optional +Maintainer: Debian Java maintainers <[EMAIL PROTECTED]> +Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL PROTECTED]> +Build-Depends: cdbs, debhelper (>= 5), quilt +Build-Depends-Indep: ant, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjgoodies-forms-java, libjcommon-java, libjdic-java, libjfreechart-java, javahelp2, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, libqdwizard-java, substance, libswingx-java, libtablelayout-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, sun-java6-jdk +Standards-Version: 3.7.2 +Homepage: http://jajuk.info/index.php/Main_Page +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jajuk + +Package: jajuk +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjgoodies-forms-java, libjcommon-java, libjdic-java, libjfreechart-java, javahelp2, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, libqdwizard-java, substance, libswingx-java, libtablelayout-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer +Description: advanced jukebox and music organizer + Jajuk is software that organizes and plays music. Jajuk is designed + to be intuitive, fast and provide multiple ways to perform the same + operation. It is a fully-featured application geared towards advanced + users with very large or scattered music collections. Added: trunk/jajuk/debian/copyright =================================================================== --- trunk/jajuk/debian/copyright (rev 0) +++ trunk/jajuk/debian/copyright 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,74 @@ +This package was debianized by Varun Hiremath <[EMAIL PROTECTED]> on +Mon, 26 Mar 2007 20:48:21 +0530. + +It was downloaded from http://www.jajuk.info/downloads.html + +Upstream Authors: Bertrand Florat <[EMAIL PROTECTED]> and The Jajuk Team + +Copyright: (C) 2003-2007 The Jajuk Team + +Translations: + (C) 2003-2007 Bertrand Florat + (C) 2003,2004 Eleftherios Spyromitros Xioufis + (C) 2003-2007 Gerhard Dietrichsteiner + (C) 2004-2006 Josep Carles Collazos + (C) 2006 Bart Cremers + +License: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +------ + +License for the codes located in 'ext' folder: +============================================= + +The file in 'ext' folder have been adapted to Jajuk by the Jajuk Team. +Jajuk Copyright (C) 2007 The Jajuk Team +------ + +Swingx (various dates) +https://swingx.dev.java.net/ + +Original Copyright: (C) 2006 Sun Microsystems, Inc. +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'. +------ + +aTunes 1.6.0 +http://www.atunes.org + +Original Copyright: (C) 2006-2007 Alex Aranda (fleax) <[EMAIL PROTECTED]> +License: GPL 2 + +On Debian systems, the complete text of the GNU General Public License +version 2 can be found in `/usr/share/common-licenses/GPL-2'. +------ + +Part of Zeus API (Splash Screen) +http://zeus-jscl.sourceforge.net/ + +Original Copyright: (C) 2004,2005 Gregory Kotsaftis <[EMAIL PROTECTED]> +Licnese: 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'. +------ + +Other codes in this folder are Public domain codes. +------ + +The Debian packaging is (C) 2007, Varun Hiremath <[EMAIL PROTECTED]> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. Added: trunk/jajuk/debian/docs =================================================================== --- trunk/jajuk/debian/docs (rev 0) +++ trunk/jajuk/debian/docs 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1 @@ + Added: trunk/jajuk/debian/install =================================================================== --- trunk/jajuk/debian/install (rev 0) +++ trunk/jajuk/debian/install 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,3 @@ +jajuk-help.jar /usr/share/java/ +jajuk-help_fr.jar /usr/share/java/ +debian/Jajuk.desktop /usr/share/applications Added: trunk/jajuk/debian/jajuk.1 =================================================================== --- trunk/jajuk/debian/jajuk.1 (rev 0) +++ trunk/jajuk/debian/jajuk.1 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,45 @@ +.TH Jajuk 1 "December 7, 2006" +.SH NAME +Jajuk \- advanced jukebox and music organizer +.SH DESCRIPTION +Jajuk is software that organizes and plays music. Jajuk is designed to +be intuitive, fast and provide multiple ways to perform the same +operation. It is a fully-featured application geared towards advanced +users with very large or scattered music collections. +.PP +.SH FEATURES +.PP +* Digital DJ: Let Jajuk make your programmation based on your own rules +.PP +* Ambience management: ask for a soft playlist in two clicks maximum! +.PP +* Configurable cross-fade +.PP +* Recursive play/repeat/shuffle/push in directories/sub-directories or +by genre/artist/ albums +.PP +* Best Of smart function to play your favourite tracks +.PP +* Novelties smart function to play your collection newest albums +.PP +* Continue smart function to continue in current album after a shuffle +selection +.PP +* Push into player queue +.PP +* Planned tracks: forsee your selection +.PP +* Various startup modes: none, last one, last one keep position, +specified, shuffle, novelties, bestof +.PP +* Intro from a track position and specified length +.PP +* Shuffle in entire collection +.PP +* Repeat, shuffle, intro, fast forward/rewind, mute... +.PP +.SH HOMEPAGE +http://jajuk.info/index.php/Main_Page +.SH AUTHOR +This manual page was written by Varun Hiremath <[EMAIL PROTECTED]>, +for the Debian project (but may be used by others). Added: trunk/jajuk/debian/jajuk.sh =================================================================== --- trunk/jajuk/debian/jajuk.sh (rev 0) +++ trunk/jajuk/debian/jajuk.sh 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,3 @@ +#!/bin/sh +cd /usr/share/java/ +/usr/lib/jvm/java-6-sun/jre/bin/java -client -Xms35M -Xmx512M -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=30 -Xincgc -XX:NewRatio=12 -jar jajuk.jar -notaskbar -test Property changes on: trunk/jajuk/debian/jajuk.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/jajuk/debian/manpages =================================================================== --- trunk/jajuk/debian/manpages (rev 0) +++ trunk/jajuk/debian/manpages 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1 @@ +debian/jajuk.1 Added: trunk/jajuk/debian/orig-tar.exclude =================================================================== --- trunk/jajuk/debian/orig-tar.exclude (rev 0) +++ trunk/jajuk/debian/orig-tar.exclude 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,2 @@ +*org/jajuk/ui/action/WindowsHotKeyManager.java +*svn-commit.tmp* Added: trunk/jajuk/debian/orig-tar.sh =================================================================== --- trunk/jajuk/debian/orig-tar.sh (rev 0) +++ trunk/jajuk/debian/orig-tar.sh 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,24 @@ +#!/bin/sh -e + +# $1 version +TAR=../jajuk_$1.orig.tar.gz +DIR=jajuk-$1.orig +VERSION=`echo $1 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'` + +# clean up the upstream tarball +mkdir $DIR +mkdir $DIR/src +(cd $DIR/src; \ +svn export https://jajuk.svn.sourceforge.net/svnroot/jajuk/tags/release-$VERSION/src/main; \ +svn export https://jajuk.svn.sourceforge.net/svnroot/jajuk/tags/release-$VERSION//src/doc ) +GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 Property changes on: trunk/jajuk/debian/orig-tar.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/jajuk/debian/patches/cobra.diff =================================================================== --- trunk/jajuk/debian/patches/cobra.diff (rev 0) +++ trunk/jajuk/debian/patches/cobra.diff 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,22 @@ +diff -urN jajuk-1.4.orig/src/org/jajuk/ui/JajukHtmlPanel.java jajuk-1.4/src/org/jajuk/ui/JajukHtmlPanel.java +--- jajuk-1.4.orig/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2007-08-04 01:22:15.000000000 +0530 ++++ jajuk-1.4/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2007-08-04 01:23:23.000000000 +0530 +@@ -25,12 +25,12 @@ + import org.jajuk.util.ITechnicalStrings; + import org.jajuk.util.Util; + import org.w3c.dom.Document; +-import org.xamjwg.html.HtmlParserContext; +-import org.xamjwg.html.gui.HtmlPanel; +-import org.xamjwg.html.parser.DocumentBuilderImpl; +-import org.xamjwg.html.parser.InputSourceImpl; +-import org.xamjwg.html.test.SimpleHtmlParserContext; +-import org.xamjwg.html.test.SimpleHtmlRendererContext; ++import org.lobobrowser.html.HtmlParserContext; ++import org.lobobrowser.html.gui.HtmlPanel; ++import org.lobobrowser.html.parser.DocumentBuilderImpl; ++import org.lobobrowser.html.parser.InputSourceImpl; ++import org.lobobrowser.html.test.SimpleHtmlParserContext; ++import org.lobobrowser.html.test.SimpleHtmlRendererContext; + + import java.io.BufferedWriter; + import java.io.File; Added: trunk/jajuk/debian/patches/lastfm.diff =================================================================== --- trunk/jajuk/debian/patches/lastfm.diff (rev 0) +++ trunk/jajuk/debian/patches/lastfm.diff 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,18 @@ +Index: jajuk-1.4+svn2947/src/main/java/org/jajuk/services/lastfm/LastFmManager.java +=================================================================== +--- jajuk-1.4+svn2947.orig/src/main/java/org/jajuk/services/lastfm/LastFmManager.java 2007-10-12 15:37:26.000000000 +0530 ++++ jajuk-1.4+svn2947/src/main/java/org/jajuk/services/lastfm/LastFmManager.java 2007-10-24 21:53:33.000000000 +0530 +@@ -58,8 +58,13 @@ + // don't dhow this message if first jajuk launch: already too many + // popups + && !org.jajuk.Main.bFirstSession) { ++ try{ + Messages.showHideableWarningMessage(Messages.getString("LastFmManager.0"), + CONF_NOT_SHOW_AGAIN_LASTFM_DISABLED); ++ } catch (Exception e) { ++ Log.error(e); ++ } ++ + } + } + Added: trunk/jajuk/debian/patches/series =================================================================== --- trunk/jajuk/debian/patches/series (rev 0) +++ trunk/jajuk/debian/patches/series 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,2 @@ +cobra.diff +lastfm.diff Added: trunk/jajuk/debian/rules =================================================================== --- trunk/jajuk/debian/rules (rev 0) +++ trunk/jajuk/debian/rules 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +JAVA_HOME := /usr/lib/jvm/java-6-sun +DEB_ANT_BUILDFILE := debian/build.xml +DEB_ANT_BUILD_TARGET := jar +DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-httpclient commons-logging entagged-tageditor forms jcommon jdic jfreechart jh jl jmactritonusspi jogg jorbis js jspeex log4j-1.2 mp3spi qdwizard substance swingx tablelayout tritonus_share vldocking vorbisspi + +install/jajuk:: + install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk + install -m 644 -D jajuk.jar $(DEB_DESTDIR)/usr/share/java/jajuk-$(DEB_UPSTREAM_VERSION).jar + dh_link /usr/share/java/jajuk-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jajuk.jar + +get-orig-source: + sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) Property changes on: trunk/jajuk/debian/rules ___________________________________________________________________ Name: svn:executable + * Added: trunk/jajuk/debian/watch =================================================================== --- trunk/jajuk/debian/watch (rev 0) +++ trunk/jajuk/debian/watch 2007-10-24 16:24:17 UTC (rev 4464) @@ -0,0 +1,4 @@ +version=3 +opts="uversionmangle=s/_/~/,dversionmangle=s/_/~/" \ +http://repository.jajuk.info/jajuk/testing/build-1.4/ \ + jajuk-sources-([\d\.]+)\.zip debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
