Author: drazzib Date: 2011-03-26 11:44:54 +0000 (Sat, 26 Mar 2011) New Revision: 13458
Added: trunk/jajuk/debian/patches/ trunk/jajuk/debian/patches/01_override_manifest.diff trunk/jajuk/debian/patches/series Removed: trunk/jajuk/debian/build.xml Modified: trunk/jajuk/debian/ant.properties trunk/jajuk/debian/changelog trunk/jajuk/debian/copyright trunk/jajuk/debian/orig-tar.exclude trunk/jajuk/debian/orig-tar.sh trunk/jajuk/debian/rules trunk/jajuk/debian/watch Log: * New upstream release. * d/copyright: Upgrade to latest DEP-5 r166 format and add information about public domain content. * d/{watch,orig-tar.sh,orig-tar.exclude}: Download upstream tarball from sourceforce download area. * d/{rules,ant.proprties}: Use upstream Ant build-system instead of debian/build.xml. * d/patches/01_override_manifest.diff: Override Class-Path definition for Jajuk. Modified: trunk/jajuk/debian/ant.properties =================================================================== --- trunk/jajuk/debian/ant.properties 2011-03-24 23:21:06 UTC (rev 13457) +++ trunk/jajuk/debian/ant.properties 2011-03-26 11:44:54 UTC (rev 13458) @@ -1,4 +1,2 @@ -class.dir=build -source.dir=src/main/java -resources.dir=src/main/resources -jar.name=jajuk.jar +rootdir=./build +manifest=./debian/MANIFEST.MF Deleted: trunk/jajuk/debian/build.xml =================================================================== --- trunk/jajuk/debian/build.xml 2011-03-24 23:21:06 UTC (rev 13457) +++ trunk/jajuk/debian/build.xml 2011-03-26 11:44:54 UTC (rev 13458) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="jar" name="Jajuk" basedir=".."> - <property file="build.properties"/> - - <patternset id="compiler.resources"> - <include name="**/?*.properties" /> - <include name="**/?*.xml" /> - <include name="**/?*.png" /> - <include name="**/?*.jpeg" /> - <include name="**/?*.jpg" /> - <include name="**/?*.html" /> - <include name="**/?*.xsl" /> - <include name="**/?*.css" /> - <include name="**/?*.ico" /> - </patternset> - - <target name="clean" description="Clean up"> - <delete dir="${class.dir}"/> - <delete file="${jar.name}"/> - </target> - - <target name="init" description="Set the timestamps"> - <!-- Set build date --> - <tstamp> - <format property='build.time' pattern='yyyy/MM/dd HH:mm' /> - </tstamp> - <echo message='Build time: ${build.time}' /> - <replace dir="${source.dir}/org/jajuk/util" value="${build.time}"> - <include name='Const.java' /> - <replacetoken>DATE_REPLACED_BY_ANT</replacetoken> - </replace> - <!-- Set release in code--> - <replace dir="${source.dir}/org/jajuk/util" value="${jajuk.version}"> - <include name="Const.java" /> - <replacetoken>VERSION_REPLACED_BY_ANT</replacetoken> - </replace> - - </target> - - <target name="compile" description="Compile the sources" depends="init"> - <mkdir dir="${class.dir}"/> - <javac srcdir="${source.dir}" destdir="${class.dir}" - deprecation="true" debug="true" optimize="false" encoding="utf-8"/> - <copy todir="${class.dir}"> - <fileset dir="${source.dir}"> - <patternset refid="compiler.resources" /> - </fileset> - <fileset dir="${resources.dir}"> - <patternset refid="compiler.resources" /> - </fileset> - </copy> - </target> - - <target name="jar" description="Create the jars" depends="compile"> - <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> Modified: trunk/jajuk/debian/changelog =================================================================== --- trunk/jajuk/debian/changelog 2011-03-24 23:21:06 UTC (rev 13457) +++ trunk/jajuk/debian/changelog 2011-03-26 11:44:54 UTC (rev 13458) @@ -1,3 +1,17 @@ +jajuk (1:1.9.2-1) unstable; urgency=low + + * New upstream release. + * d/copyright: Upgrade to latest DEP-5 r166 format and add information + about public domain content. + * d/{watch,orig-tar.sh,orig-tar.exclude}: Download upstream tarball from + sourceforce download area. + * d/{rules,ant.proprties}: Use upstream Ant build-system instead of + debian/build.xml. + * d/patches/01_override_manifest.diff: Override Class-Path definition for + Jajuk. + + -- Damien Raude-Morvan <draz...@debian.org> Sat, 26 Mar 2011 12:44:22 +0100 + jajuk (1:1.9.1-1) unstable; urgency=low * New upstream release. Modified: trunk/jajuk/debian/copyright =================================================================== --- trunk/jajuk/debian/copyright 2011-03-24 23:21:06 UTC (rev 13457) +++ trunk/jajuk/debian/copyright 2011-03-26 11:44:54 UTC (rev 13458) @@ -1,6 +1,6 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Jajuk -Maintainer: Bertrand Florat <bertr...@florat.net> and The Jajuk Team +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Upstream-Name: Jajuk +Upstream-Contact: Bertrand Florat <bertr...@florat.net> and The Jajuk Team Source: http://www.jajuk.info/downloads.html Files: * @@ -51,20 +51,28 @@ License: GPL-2+ Files: src/main/resources/icons/* -Copyright: Public domain, see <http://tango.freedesktop.org/Tango_Desktop_Project> -Licence: PD +Copyright: public domain +Licence: public-domain + From <http://tango.freedesktop.org/Tango_Desktop_Project> + The Tango base icon theme is released to the Public Domain. + The palette is in public domain. + Developers, feel free to ship it along with your application. + The icon naming utilities are licensed under the GPL. + Though the tango-icon-theme package is released to the Public Domain, + we ask that you still please attribute the Tango Desktop Project, + for all the hard work we've done. Thanks. License: GPL-2+ 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'. Modified: trunk/jajuk/debian/orig-tar.exclude =================================================================== --- trunk/jajuk/debian/orig-tar.exclude 2011-03-24 23:21:06 UTC (rev 13457) +++ trunk/jajuk/debian/orig-tar.exclude 2011-03-26 11:44:54 UTC (rev 13458) @@ -1,2 +1,4 @@ +lib/* +src/packaging/OSX/JavaApplicationStub +src/site/resources/specs.pdf *org/jajuk/ui/actions/WindowsHotKeyManager.java -*svn-commit.tmp* Modified: trunk/jajuk/debian/orig-tar.sh =================================================================== --- trunk/jajuk/debian/orig-tar.sh 2011-03-24 23:21:06 UTC (rev 13457) +++ trunk/jajuk/debian/orig-tar.sh 2011-03-26 11:44:54 UTC (rev 13458) @@ -1,22 +1,13 @@ #!/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'` -# trunk version -# REVISION=`echo $1 | sed -e 's/.*svn//'` -# tag version -TAG=release-$VERSION +# $2 = version +# $3 = file +TAR=../jajuk_$2.orig.tar.gz +DIR=jajuk-$2.orig # clean up the upstream tarball -mkdir $DIR -mkdir $DIR/src -(cd $DIR/src; \ -# tag version -svn export https://jajuk.svn.sourceforge.net/svnroot/jajuk/tags/$TAG/src/main) -# trunk version -# svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/trunk/jajuk/src/main) +unzip $3 +mv jajuk-src-* $DIR GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR rm -rf $DIR Added: trunk/jajuk/debian/patches/01_override_manifest.diff =================================================================== --- trunk/jajuk/debian/patches/01_override_manifest.diff (rev 0) +++ trunk/jajuk/debian/patches/01_override_manifest.diff 2011-03-26 11:44:54 UTC (rev 13458) @@ -0,0 +1,24 @@ +Description: Move MANIFEST.MF definition to a property in + src/scripts/build.xml +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2011-03-26 +Forwarded: no +--- a/src/scripts/build.xml ++++ b/src/scripts/build.xml +@@ -78,6 +78,7 @@ + <property name='distjarname' value='jajuk-java-installer-' /> + <property name='sourcesdist' value='${sourcesdir}/jajuk-sources-${version}.zip' /> + <property name='mplayerdir' value='/tmp/mplayer' /> ++ <property name='manifest' value='${srcdir}/packaging/MANIFEST.MF' /> + + <!-- This used to be the intermediate directory used to build war file, we used a persisitent + directory to use jar files in next war (each war contains current and previous jars for +@@ -260,7 +261,7 @@ + + <target name='package_jar' description='o Create Jajuk jar file' depends='startup,clean,mkdist_jar,compile'> + <echo message='Create Jajuk jar file' /> +- <jar jarfile='${distdir}/bin/${jarname}' excludes='**/package.html' manifest='${srcdir}/packaging/MANIFEST.MF' compress='true'> ++ <jar jarfile='${distdir}/bin/${jarname}' excludes='**/package.html' manifest='${manifest}' compress='true'> + <fileset dir='${distdir}/${classdir}' /> + </jar> + <delete dir='${distdir}/${classdir}' /> Added: trunk/jajuk/debian/patches/series =================================================================== --- trunk/jajuk/debian/patches/series (rev 0) +++ trunk/jajuk/debian/patches/series 2011-03-26 11:44:54 UTC (rev 13458) @@ -0,0 +1 @@ +01_override_manifest.diff Modified: trunk/jajuk/debian/rules =================================================================== --- trunk/jajuk/debian/rules 2011-03-24 23:21:06 UTC (rev 13457) +++ trunk/jajuk/debian/rules 2011-03-26 11:44:54 UTC (rev 13458) @@ -3,19 +3,18 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/~svn.*//g" | sed "s/~//g") JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_BUILD_TARGET := jar -Djajuk.version="$(VERSION)" +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 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 + install -m 644 -D build/jajuk/bin/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 install -m 644 -D src/main/resources/icons/16x16/jajuk-icon_16x16.png \ $(DEB_DESTDIR)/usr/share/pixmaps/jajuk.png dh_install debian/jajuk.desktop /usr/share/applications/ get-orig-source: - sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) + uscan --force-download Modified: trunk/jajuk/debian/watch =================================================================== --- trunk/jajuk/debian/watch 2011-03-24 23:21:06 UTC (rev 13457) +++ trunk/jajuk/debian/watch 2011-03-26 11:44:54 UTC (rev 13458) @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/_/\./g;s/RC/~RC/g,dversionmangle=s/[+~]svn.*//" \ -http://jajuk.svn.sourceforge.net/viewvc/jajuk/tags/ release-([0-9_RC].*)/ debian debian/orig-tar.sh +opts="uversionmangle=s/RC/~RC/g" \ +http://sf.net/jajuk/jajuk-sources-(.+)\.zip debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits