[pkg-java] r6512 - in trunk/jajuk/debian: . patches
varun at alioth.debian.org
varun at alioth.debian.org
Sat May 31 21:36:48 UTC 2008
Author: varun
Date: 2008-05-31 21:36:48 +0000 (Sat, 31 May 2008)
New Revision: 6512
Removed:
trunk/jajuk/debian/patches/swingx.diff
Modified:
trunk/jajuk/debian/build.xml
trunk/jajuk/debian/changelog
trunk/jajuk/debian/orig-tar.sh
trunk/jajuk/debian/patches/cobra.diff
trunk/jajuk/debian/patches/series
Log:
* New upstream release
* Fix debian/build.xml files, make sure all xml files are installed
Modified: trunk/jajuk/debian/build.xml
===================================================================
--- trunk/jajuk/debian/build.xml 2008-05-31 20:44:19 UTC (rev 6511)
+++ trunk/jajuk/debian/build.xml 2008-05-31 21:36:48 UTC (rev 6512)
@@ -3,6 +3,18 @@
<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 dir="${help.dir}"/>
@@ -33,6 +45,14 @@
<mkdir dir="${class.dir}"/>
<javac srcdir="${source.dir}" destdir="${class.dir}"
deprecation="true" debug="true" optimize="false"/>
+ <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="javadoc" description="Creates the documentation jars">
@@ -57,24 +77,6 @@
</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>
Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog 2008-05-31 20:44:19 UTC (rev 6511)
+++ trunk/jajuk/debian/changelog 2008-05-31 21:36:48 UTC (rev 6512)
@@ -1,3 +1,10 @@
+jajuk (1.6+svn3925-1) unstable; urgency=low
+
+ * New upstream release
+ * Fix debian/build.xml files, make sure all xml files are installed
+
+ -- Varun Hiremath <varun at debian.org> Sun, 01 Jun 2008 02:35:56 +0530
+
jajuk (1.5.3+svn3684-1) unstable; urgency=low
* New upstream release
Modified: trunk/jajuk/debian/orig-tar.sh
===================================================================
--- trunk/jajuk/debian/orig-tar.sh 2008-05-31 20:44:19 UTC (rev 6511)
+++ trunk/jajuk/debian/orig-tar.sh 2008-05-31 21:36:48 UTC (rev 6512)
@@ -10,8 +10,8 @@
mkdir $DIR
mkdir $DIR/src
(cd $DIR/src; \
-svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_5/src/main; \
-svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_5/src/doc )
+svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_6/src/main; \
+svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_6/src/doc )
GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
rm -rf $DIR
Modified: trunk/jajuk/debian/patches/cobra.diff
===================================================================
--- trunk/jajuk/debian/patches/cobra.diff 2008-05-31 20:44:19 UTC (rev 6511)
+++ trunk/jajuk/debian/patches/cobra.diff 2008-05-31 21:36:48 UTC (rev 6512)
@@ -1,8 +1,8 @@
-Index: jajuk-1.5+svn3461/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
+Index: jajuk-1.6+svn3925/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java
===================================================================
---- jajuk-1.5+svn3461.orig/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2008-03-13 01:53:50.000000000 +0530
-+++ jajuk-1.5+svn3461/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2008-03-13 01:54:23.000000000 +0530
-@@ -37,12 +37,12 @@
+--- jajuk-1.6+svn3925.orig/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2008-05-11 23:01:16.000000000 +0530
++++ jajuk-1.6+svn3925/src/main/java/org/jajuk/ui/widgets/JajukHtmlPanel.java 2008-05-13 21:28:17.000000000 +0530
+@@ -38,12 +38,12 @@
import org.jajuk.util.Messages;
import org.jajuk.util.Util;
import org.w3c.dom.Document;
@@ -21,7 +21,7 @@
/**
* Type description
-@@ -53,7 +53,7 @@
+@@ -54,7 +54,7 @@
private SimpleHtmlRendererContext rcontext;
@@ -30,7 +30,7 @@
private DocumentBuilderImpl dbi;
-@@ -65,7 +65,7 @@
+@@ -66,7 +66,7 @@
// Disable Cobra traces
Logger.getLogger("").setLevel(Level.OFF);
rcontext = new SimpleHtmlRendererContext(this);
Modified: trunk/jajuk/debian/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series 2008-05-31 20:44:19 UTC (rev 6511)
+++ trunk/jajuk/debian/patches/series 2008-05-31 21:36:48 UTC (rev 6512)
@@ -1,2 +1 @@
-swingx.diff
cobra.diff
Deleted: trunk/jajuk/debian/patches/swingx.diff
===================================================================
--- trunk/jajuk/debian/patches/swingx.diff 2008-05-31 20:44:19 UTC (rev 6511)
+++ trunk/jajuk/debian/patches/swingx.diff 2008-05-31 21:36:48 UTC (rev 6512)
@@ -1,64 +0,0 @@
-Index: jajuk-1.5+svn3461/src/main/java/org/jajuk/ui/views/PlaylistEditorView.java
-===================================================================
---- jajuk-1.5+svn3461.orig/src/main/java/org/jajuk/ui/views/PlaylistEditorView.java 2008-01-28 03:08:22.000000000 +0530
-+++ jajuk-1.5+svn3461/src/main/java/org/jajuk/ui/views/PlaylistEditorView.java 2008-03-13 01:30:25.000000000 +0530
-@@ -89,7 +89,7 @@
- import org.jajuk.util.Util;
- import org.jajuk.util.error.JajukException;
- import org.jajuk.util.log.Log;
--import org.jdesktop.swingx.decorator.AlternateRowHighlighter;
-+import org.jdesktop.swingx.decorator.Highlighter;
- import org.jdesktop.swingx.decorator.ColorHighlighter;
-
- /**
-@@ -469,7 +469,7 @@
-
- ColorHighlighter colorHighlighter = new ColorHighlighter(Color.ORANGE, null,
- new PlayHighlighterPredicate(model));
-- AlternateRowHighlighter alternate = Util.getAlternateHighlighter();
-+ Highlighter alternate = Util.getAlternateHighlighter();
- jtable.setHighlighters(alternate, colorHighlighter);
- // register events
- ObservationManager.register(this);
-@@ -1057,4 +1057,4 @@
- */
- public void mouseClicked(MouseEvent e) {
- }
--}
-\ No newline at end of file
-+}
-Index: jajuk-1.5+svn3461/src/main/java/org/jajuk/util/Util.java
-===================================================================
---- jajuk-1.5+svn3461.orig/src/main/java/org/jajuk/util/Util.java 2008-02-04 02:22:22.000000000 +0530
-+++ jajuk-1.5+svn3461/src/main/java/org/jajuk/util/Util.java 2008-03-13 01:32:01.000000000 +0530
-@@ -108,7 +108,8 @@
- import org.jajuk.util.filters.DirectoryFilter;
- import org.jajuk.util.filters.KnownTypeFilter;
- import org.jajuk.util.log.Log;
--import org.jdesktop.swingx.decorator.AlternateRowHighlighter;
-+import org.jdesktop.swingx.decorator.Highlighter;
-+import org.jdesktop.swingx.decorator.HighlighterFactory;
- import org.jvnet.substance.SubstanceLookAndFeel;
- import org.jvnet.substance.color.ColorScheme;
- import org.jvnet.substance.theme.SubstanceTheme;
-@@ -2327,17 +2328,17 @@
- /**
- * @return a theme-dependent alternate row highlighter used in tables or trees
- */
-- public static AlternateRowHighlighter getAlternateHighlighter() {
-+ public static Highlighter getAlternateHighlighter() {
- SubstanceTheme theme = SubstanceLookAndFeel.getTheme();
- ColorScheme scheme = theme.getColorScheme();
- Color color1 = null;
-- Color color2 = null;
-+ Color color2 = Color.ORANGE;
- if (theme.getKind().equals(SubstanceTheme.ThemeKind.DARK)) {
- color1 = scheme.getDarkColor();
- } else {
- color1 = new Color(230, 235, 240);
- }
-- return new AlternateRowHighlighter(color1, null, null);
-+ return HighlighterFactory.createAlternateStriping(color1, color2);
- }
-
- /**
More information about the pkg-java-commits
mailing list