Author: avdyk
Date: 2006-08-03 14:58:48 +0000 (Thu, 03 Aug 2006)
New Revision: 2331
Added:
trunk/argouml/debian/patches/06_build_xml_dont_build_model-mdr.patch
trunk/argouml/debian/patches/07_template_manifest_mf_classpath.patch
Removed:
trunk/argouml/debian/patches/01_build_clean_javadocfix.UNPATCH
trunk/argouml/debian/patches/03_default_properties_argo_tests_src.patch
Modified:
trunk/argouml/debian/ant.properties
trunk/argouml/debian/argouml.sh
trunk/argouml/debian/changelog
trunk/argouml/debian/docs
trunk/argouml/debian/patches/04_src_model_build_xml.patch
trunk/argouml/debian/patches/05a_not_the_good_gef_version.patch
trunk/argouml/debian/rules
Log:
argouml now builds fine for me... but does not start
Modified: trunk/argouml/debian/ant.properties
===================================================================
--- trunk/argouml/debian/ant.properties 2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/ant.properties 2006-08-03 14:58:48 UTC (rev 2331)
@@ -1,5 +1,6 @@
argo.root.dir=..
-argo.src.dir=.
+argo.tests.src=tests
+#argo.src.dir=.
#skip.dependency.check=true
skip.dependency.check=false
debug=false
Modified: trunk/argouml/debian/argouml.sh
===================================================================
--- trunk/argouml/debian/argouml.sh 2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/argouml.sh 2006-08-03 14:58:48 UTC (rev 2331)
@@ -3,7 +3,7 @@
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="$JAVA_HOME /usr/lib/j2re1.5-sun and /usr/lib/j2sdk1.5-sun
/usr/lib/j2sdk1.4-sun /usr/lib/j2re1.4-sun /usr/lib/j2sdk1.5-ibm
/usr/lib/j2sdk1.4-ibm /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3
/usr/lib/j2sdk1.3"
+JDK_DIRS="$JAVA_HOME /usr/lib/j2re1.5-sun /usr/lib/j2sdk1.5-sun
/usr/lib/j2sdk1.4-sun /usr/lib/j2re1.4-sun /usr/lib/j2sdk1.5-ibm
/usr/lib/j2sdk1.4-ibm /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3
/usr/lib/j2sdk1.3"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do
Modified: trunk/argouml/debian/changelog
===================================================================
--- trunk/argouml/debian/changelog 2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/changelog 2006-08-03 14:58:48 UTC (rev 2331)
@@ -1,4 +1,4 @@
-argouml (0.20-1) unstable; urgency=low
+argouml (0.21.22beta3-1) unstable; urgency=low
* New upstream release (closes: #342200, #217878).
* Added Sun's 1.4 and 1.5 jdk and jre to the search path (closes:
@@ -8,8 +8,9 @@
jdk1.3 (closes: #289241).
* Updated to standards-version 3.7.2: debhelper and cdbs are now in
Build-Depends.
+ * Changed a lot of path because upstream added an 'argouml' directory
- -- Arnaud Vandyck <[EMAIL PROTECTED]> Sun, 23 Jul 2006 19:52:23 +0200
+ -- Arnaud Vandyck <[EMAIL PROTECTED]> Thu, 3 Aug 2006 16:23:22 +0200
argouml (0.19.6-2.1) unstable; urgency=low
Modified: trunk/argouml/debian/docs
===================================================================
--- trunk/argouml/debian/docs 2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/docs 2006-08-03 14:58:48 UTC (rev 2331)
@@ -1 +1 @@
-src_new/README.txt
+argouml/src_new/README.txt
Deleted: trunk/argouml/debian/patches/01_build_clean_javadocfix.UNPATCH
===================================================================
--- trunk/argouml/debian/patches/01_build_clean_javadocfix.UNPATCH
2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/patches/01_build_clean_javadocfix.UNPATCH
2006-08-03 14:58:48 UTC (rev 2331)
@@ -1,10 +0,0 @@
---- src_new/build.xml.orig 2004-03-01 16:09:28.105551272 +0100
-+++ src_new/build.xml 2004-03-01 16:09:36.732239816 +0100
-@@ -642,6 +642,7 @@
- <delete dir="${argo.build.dir}/src_new"/>
- <delete dir="${argo.build.dir}/classes"/>
- <delete dir="${argo.build.dir}/bin"/>
-+ <delete dir="${argo.javadocs.dir}"/>
- <delete file="${argo.src.dir}/${version.package}/ArgoVersion.java"/>
-
- <!-- TODO: Some of these are obsolete -->
Deleted: trunk/argouml/debian/patches/03_default_properties_argo_tests_src.patch
===================================================================
--- trunk/argouml/debian/patches/03_default_properties_argo_tests_src.patch
2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/patches/03_default_properties_argo_tests_src.patch
2006-08-03 14:58:48 UTC (rev 2331)
@@ -1,11 +0,0 @@
---- src_new/default.properties.orig 2005-10-13 17:26:23.000000000 +0200
-+++ src_new/default.properties 2005-10-13 17:26:40.000000000 +0200
-@@ -32,7 +32,7 @@
- argo.tools.dir=${argo.root.dir}/tools
- argo.tools.lib=${argo.tools.dir}/lib
- #
--argo.tests.src=${argo.root.dir}/tests
-+argo.tests.src=${argo.src.dir}/tests
- argo.tests.dir=${argo.build.dir}/tests
- argo.tests.classes=${argo.tests.dir}/classes
- argo.tests.reports=${argo.tests.dir}/reports
Modified: trunk/argouml/debian/patches/04_src_model_build_xml.patch
===================================================================
--- trunk/argouml/debian/patches/04_src_model_build_xml.patch 2006-08-03
14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/patches/04_src_model_build_xml.patch 2006-08-03
14:58:48 UTC (rev 2331)
@@ -1,6 +1,5 @@
-diff -ruN src/model.orig/build.xml src/model/build.xml
---- src/model.orig/build.xml 1970-01-01 01:00:00.000000000 +0100
-+++ src/model/build.xml 2005-10-13 17:50:12.000000000 +0200
+--- ./argouml/src/model/build.xml~ 1970-01-01 01:00:00.000000000 +0100
++++ ./argouml/src/model/build.xml 2005-10-13 17:50:12.000000000 +0200
@@ -0,0 +1,13 @@
+<project default="install">
+
Modified: trunk/argouml/debian/patches/05a_not_the_good_gef_version.patch
===================================================================
--- trunk/argouml/debian/patches/05a_not_the_good_gef_version.patch
2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/patches/05a_not_the_good_gef_version.patch
2006-08-03 14:58:48 UTC (rev 2331)
@@ -1,5 +1,5 @@
---- src_new/org/argouml/uml/ui/ActionSaveGraphics.java~ 2005-09-01
20:39:49.000000000 +0200
-+++ src_new/org/argouml/uml/ui/ActionSaveGraphics.java 2005-10-13
18:46:36.000000000 +0200
+--- argouml/src_new/org/argouml/uml/ui/ActionSaveGraphics.java~
2005-09-01 20:39:49.000000000 +0200
++++ argouml/src_new/org/argouml/uml/ui/ActionSaveGraphics.java 2005-10-13
18:46:36.000000000 +0200
@@ -195,8 +195,8 @@
}
FileOutputStream fo = new FileOutputStream(theFile);
Added: trunk/argouml/debian/patches/06_build_xml_dont_build_model-mdr.patch
===================================================================
--- trunk/argouml/debian/patches/06_build_xml_dont_build_model-mdr.patch
2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/patches/06_build_xml_dont_build_model-mdr.patch
2006-08-03 14:58:48 UTC (rev 2331)
@@ -0,0 +1,19 @@
+--- argouml/src_new/build.xml~ 2006-06-18 20:23:58.000000000 +0000
++++ argouml/src_new/build.xml 2006-08-03 13:04:10.000000000 +0000
+@@ -798,13 +798,13 @@
+ <target name="build-mdr" depends="init,build-model">
+ <!-- We build unconditionally because only the MDR build itself knows if
+ everything is up to date -->
+- <echo message="=== Calling MDR build ==="/>
+- <copy file="${log4j.jar.path}" tofile="${argo.build.dir}/log4j.jar"/>
++ <echo message="=== Don't build MDR ==="/>
++ <!-- copy file="${log4j.jar.path}" tofile="${argo.build.dir}/log4j.jar"/>
+ <ant dir="${argo.mdr.dir}" target="install" inheritAll="false" >
+ <propertyset dynamic="false">
+ <propertyset refid="absolute-properties"/>
+ </propertyset>
+- </ant>
++ </ant -->
+ </target>
+
+ <!-- =================================================================== -->
Added: trunk/argouml/debian/patches/07_template_manifest_mf_classpath.patch
===================================================================
--- trunk/argouml/debian/patches/07_template_manifest_mf_classpath.patch
2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/patches/07_template_manifest_mf_classpath.patch
2006-08-03 14:58:48 UTC (rev 2331)
@@ -0,0 +1,10 @@
+--- argouml/src_new/templates/manifest.template~ 2006-06-25
20:15:34.000000000 +0000
++++ argouml/src_new/templates/manifest.template 2006-08-03
14:40:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ Manifest-Version: 2.0
+ Main-Class: org.argouml.application.Main
+-Class-Path: argouml-model.jar ocl-argo.jar gef.jar antlrall.jar log4j.jar
toolbar.jar swidgets.jar commons-logging.jar ext/argouml-i18n-de.jar
ext/argouml-i18n-en_GB.jar ext/argouml-i18n-es.jar ext/argouml-i18n-fr.jar
ext/argouml-i18n-it.jar ext/argouml-i18n-nb.jar ext/argouml-i18n-pt.jar
ext/argouml-i18n-ru.jar ext/argouml-i18n-sv.jar ext/argouml-i18n-zh.jar
argouml-mdr.jar java-interfaces.jar jmi.jar jmiutils.jar mdrapi.jar mof.jar
nbmdr.jar openide-util.jar ext/dev.jar
++Class-Path: argouml-model.jar ocl-argo.jar gef.jar antlrall.jar log4j-1.2.jar
toolbar.jar swidgets.jar commons-logging.jar ext/argouml-i18n-de.jar
ext/argouml-i18n-en_GB.jar ext/argouml-i18n-es.jar ext/argouml-i18n-fr.jar
ext/argouml-i18n-it.jar ext/argouml-i18n-nb.jar ext/argouml-i18n-pt.jar
ext/argouml-i18n-ru.jar ext/argouml-i18n-sv.jar ext/argouml-i18n-zh.jar
argouml-mdr.jar java-interfaces.jar jmi.jar jmiutils.jar mdrapi.jar mof.jar
nbmdr.jar openide-util.jar ext/dev.jar
+ Created-By: 1.2 (Sun Microsystems Inc.)
+
+ Name: org/argouml/application/
Modified: trunk/argouml/debian/rules
===================================================================
--- trunk/argouml/debian/rules 2006-08-03 14:27:06 UTC (rev 2330)
+++ trunk/argouml/debian/rules 2006-08-03 14:58:48 UTC (rev 2331)
@@ -1,31 +1,30 @@
#!/usr/bin/make -f
-# debian/rules for Commons Beanutils (uses CDBS)
+# debian/rules for Argouml (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/j2sdk1.5-ibm /usr/lib/jvm/java-gcj
-DEB_JARS := ant-optional log4j-1.2 xercesImpl \
- xml-apis antlrall nsuml gef
ocl-argo \
- jdepend junit i18n toolbar jmi \
- swidgets
+DEB_JARS := ant-optional log4j-1.2 gef ocl-argo antlrall \
+ jdepend junit i18n toolbar jmi
swidgets
+# xml-apis nsuml xercesImpl
-DEB_BUILDDIR := src_new
-#DEB_ANT_BUILDFILE := src_new/build.xml
+DEB_BUILDDIR := argouml/src_new
+#DEB_ANT_BUILDFILE := argouml/src_new/build.xml
DEB_ANT_BUILD_TARGET := jar #prepare-docs
VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' |
cut -f 1 -d '-')
install/argouml::
- install -m 644 $(CURDIR)/build/argouml.jar
$(CURDIR)/debian/argouml/usr/share/java/
- install -m 644 $(CURDIR)/build/argouml-model.jar
$(CURDIR)/debian/argouml/usr/share/java/
+ install -m 644 $(CURDIR)/argouml/build/argouml.jar
$(CURDIR)/debian/argouml/usr/share/java/
+ install -m 644 $(CURDIR)/argouml/build/argouml-model.jar
$(CURDIR)/debian/argouml/usr/share/java/
install -m 755 $(CURDIR)/debian/argouml.sh
$(CURDIR)/debian/argouml/usr/bin/argouml
perl -MMIME::Base64 -e 'print decode_base64(join("", <>))' <
debian/argologo32x32.xpm.asc >
$(CURDIR)/debian/argouml/usr/share/pixmaps/argouml_icon.xpm
-mkdir $(CURDIR)/debian/argouml-doc/usr/share/doc/argouml-doc/apidoc
- -cp -R $(CURDIR)/build/javadocs/* \
+ -cp -R $(CURDIR)/argouml/build/javadocs/* \
$(CURDIR)/debian/argouml-doc/usr/share/doc/argouml-doc/apidoc
clean::
- -rm -r build
+ -rm -r argouml/build
-rm src/model/build.xml
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
