[pkg-java] r5095 - in trunk/libjcalendar-java/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Sun Dec 16 23:15:54 UTC 2007
Author: twerner
Date: 2007-12-16 23:15:54 +0000 (Sun, 16 Dec 2007)
New Revision: 5095
Modified:
trunk/libjcalendar-java/debian/changelog
trunk/libjcalendar-java/debian/compat
trunk/libjcalendar-java/debian/control
trunk/libjcalendar-java/debian/install
trunk/libjcalendar-java/debian/links
trunk/libjcalendar-java/debian/patches/01_build_xml_rm_looks.patch
trunk/libjcalendar-java/debian/patches/02_build_xml_jar_versioned.patch
trunk/libjcalendar-java/debian/patches/03_demo_html_applet.patch
trunk/libjcalendar-java/debian/rules
Log:
merge changes from sid
Modified: trunk/libjcalendar-java/debian/changelog
===================================================================
--- trunk/libjcalendar-java/debian/changelog 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/changelog 2007-12-16 23:15:54 UTC (rev 5095)
@@ -1,3 +1,13 @@
+libjcalendar-java (1.3.2-0.1) unstable; urgency=low
+
+ * NMU
+ * New Upstream Version (Closes: #424981)
+ * Switch to kaffe and move the package to main. (Closes: #424982)
+ * Switch to debhelper 5.
+ * Rename Build-Depends-Indep to Build-Depends.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 26 May 2007 17:33:26 +0200
+
libjcalendar-java (1.2.2-8) unstable; urgency=low
* Putting under common Java Maintenance.
Modified: trunk/libjcalendar-java/debian/compat
===================================================================
--- trunk/libjcalendar-java/debian/compat 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/compat 2007-12-16 23:15:54 UTC (rev 5095)
@@ -1 +1 @@
-4
+5
Modified: trunk/libjcalendar-java/debian/control
===================================================================
--- trunk/libjcalendar-java/debian/control 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/control 2007-12-16 23:15:54 UTC (rev 5095)
@@ -2,13 +2,13 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
-Build-Depends-Indep: debhelper (>= 4.1.0), cdbs (>= 0.4.8), kaffe (>= 1.1.6.91) | sun-j2sdk1.4 | blackdown-j2sdk1.4, ant, gjdoc
+Build-Depends-Indep: debhelper (>= 5), cdbs (>= 0.4.8), kaffe (>= 1.1.6.91) | sun-j2sdk1.4 | blackdown-j2sdk1.4, ant, gjdoc
Standards-Version: 3.6.2.0
-Section: contrib/libs
+Section: libs
Package: libjcalendar-java
Architecture: all
-Depends: sun-j2re1.4 | j2re1.4 | j2re1.5
+Depends: j2re1.4 | j2re1.5 | java2-runtime
Suggests: java-virtual-machine, libjcalendar-java-doc
Description: Java date chooser bean for graphically picking a date
JCalendar is composed of several other Java beans, a JDayChooser, a
Modified: trunk/libjcalendar-java/debian/install
===================================================================
--- trunk/libjcalendar-java/debian/install 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/install 2007-12-16 23:15:54 UTC (rev 5095)
@@ -1 +1 @@
-lib/jcalendar-1.2.2.jar usr/share/java
+lib/jcalendar-*.jar usr/share/java
Modified: trunk/libjcalendar-java/debian/links
===================================================================
--- trunk/libjcalendar-java/debian/links 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/links 2007-12-16 23:15:54 UTC (rev 5095)
@@ -1 +1 @@
-usr/share/java/jcalendar-1.2.2.jar usr/share/java/jcalendar.jar
+usr/share/java/jcalendar-1.3.2.jar usr/share/java/jcalendar.jar
Modified: trunk/libjcalendar-java/debian/patches/01_build_xml_rm_looks.patch
===================================================================
--- trunk/libjcalendar-java/debian/patches/01_build_xml_rm_looks.patch 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/patches/01_build_xml_rm_looks.patch 2007-12-16 23:15:54 UTC (rev 5095)
@@ -1,29 +1,30 @@
---- src/build.xml 2004-09-24 07:20:52.000000000 +0200
-+++ src/build.xml 2005-05-14 16:02:27.347648232 +0200
+diff -Nur libjcalendar-java/src/build.xml libjcalendar-java.new/src/build.xml
+--- libjcalendar-java/src/build.xml 2007-05-26 17:18:06.000000000 +0200
++++ libjcalendar-java.new/src/build.xml 2007-05-26 17:20:17.000000000 +0200
@@ -69,7 +69,7 @@
</copy>
<javac srcdir="${src.dir}"
destdir="${build.dir}"
-- classpath="${classpath};lib/looks-1.2.2.jar"
+- classpath="${classpath};lib/looks-1.3.2.jar"
+ classpath="${classpath}"
debug="off"
deprecation="on"
optimize="on"
-@@ -98,7 +98,7 @@
+@@ -99,7 +99,7 @@
<mkdir dir="${javadoc.dir}" />
<javadoc packagenames="${packages}"
sourcepath="${basedir}/${src.dir}"
-- classpath=".;lib/looks-1.2.2.jar"
+- classpath=".;lib/looks-1.3.2.jar"
+ classpath="."
destdir="${javadoc.dir}"
author="true"
version="true"
-@@ -177,7 +177,7 @@
+@@ -178,7 +178,7 @@
<target name="runDemo" depends="jar">
<echo message="Running JCalendar demo ..." />
-- <java classpath="lib/jcalendar.jar;lib/looks-1.2.2.jar"
+- <java classpath="lib/jcalendar.jar;lib/looks-1.3.2.jar"
+ <java classpath="lib/jcalendar.jar"
- classname="com.toedter.calendar.JCalendarDemo"
+ classname="com.toedter.calendar.demo.JCalendarDemo"
fork="yes"
>
Modified: trunk/libjcalendar-java/debian/patches/02_build_xml_jar_versioned.patch
===================================================================
--- trunk/libjcalendar-java/debian/patches/02_build_xml_jar_versioned.patch 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/patches/02_build_xml_jar_versioned.patch 2007-12-16 23:15:54 UTC (rev 5095)
@@ -1,20 +1,12 @@
---- src/build.xml 2005-05-21 20:26:26.000000000 +0200
-+++ src/build.xml 2005-06-08 10:29:50.000000000 +0200
-@@ -82,7 +82,7 @@
+diff -Nur libjcalendar-java/src/build.xml libjcalendar-java.new/src/build.xml
+--- libjcalendar-java/src/build.xml 2007-05-26 17:21:24.000000000 +0200
++++ libjcalendar-java.new/src/build.xml 2007-05-26 17:22:04.000000000 +0200
+@@ -178,7 +178,7 @@
- <target name="jar" depends="compile">
- <mkdir dir="${lib.dir}" />
-- <jar jarfile="${lib.dir}/jcalendar.jar"
-+ <jar jarfile="${lib.dir}/jcalendar-${version}.jar"
- compress="no"
- basedir="${build.dir}"
- includes="com/**"
-@@ -177,7 +177,7 @@
-
<target name="runDemo" depends="jar">
<echo message="Running JCalendar demo ..." />
- <java classpath="lib/jcalendar.jar"
+ <java classpath="lib/jcalendar-${version}.jar"
- classname="com.toedter.calendar.JCalendarDemo"
+ classname="com.toedter.calendar.demo.JCalendarDemo"
fork="yes"
>
Modified: trunk/libjcalendar-java/debian/patches/03_demo_html_applet.patch
===================================================================
--- trunk/libjcalendar-java/debian/patches/03_demo_html_applet.patch 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/patches/03_demo_html_applet.patch 2007-12-16 23:15:54 UTC (rev 5095)
@@ -1,11 +1,12 @@
---- doc/demo.html 2004-09-24 07:20:52.000000000 +0200
-+++ doc/demo.html 2005-05-14 17:17:19.212780936 +0200
+diff -Nur libjcalendar-java/doc/demo.html libjcalendar-java.new/doc/demo.html
+--- libjcalendar-java/doc/demo.html 2007-05-26 17:02:33.000000000 +0200
++++ libjcalendar-java.new/doc/demo.html 2007-05-26 17:23:32.000000000 +0200
@@ -19,7 +19,7 @@
<tr>
<td bgcolor="#FFFFFF" >
<center>
-- <applet code="com.toedter.calendar.JCalendarDemo" archive="../lib/jcalendar.jar,../lib/looks-1.2.2.jar" width=373 height=476>
-+ <applet code="com.toedter.calendar.JCalendarDemo" archive="/usr/share/java/jcalendar.jar" width="373" height="476">
+- <applet code="com.toedter.calendar.demo.JCalendarDemo" archive="../lib/jcalendar-1.3.2.jar,../lib/looks-2.0.1.jar" width=373 height=560>
++ <applet code="com.toedter.calendar.demo.JCalendarDemo" archive="/usr/share/java/jcalendar.jar" width=373 height=560>
</applet>
</center>
</td>
Modified: trunk/libjcalendar-java/debian/rules
===================================================================
--- trunk/libjcalendar-java/debian/rules 2007-12-16 23:12:03 UTC (rev 5094)
+++ trunk/libjcalendar-java/debian/rules 2007-12-16 23:15:54 UTC (rev 5095)
@@ -1,19 +1,13 @@
#!/usr/bin/make -f
-# debian/rules for Commons Fileupload (uses CDBS)
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME_DIRS := /usr/lib/kaffe /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar gnu-classpath-tools-gjdoc com-sun-javadoc com-sun-tools-doclets-Taglet
-DEB_ANT_BUILD_TARGET := jar javadocs
+JAVA_HOME := /usr/lib/kaffe
+DEB_ANT_BUILD_TARGET := dist
DEB_BUILDDIR := src
-LIBRARY=jcalendar
-VERSION=1.2.2
-
clean::
- -rm -fr lib
+ $(RM) -r lib jcalendar*.zip*
More information about the pkg-java-commits
mailing list