r2323 - in trunk/argouml/debian: . patches

Arnaud Vandyck avdyk at costa.debian.org
Thu Aug 3 11:40:02 UTC 2006 

Author: avdyk
Date: 2006-08-03 11:40:01 +0000 (Thu, 03 Aug 2006)
New Revision: 2323

Added:
   trunk/argouml/debian/README.Debian
   trunk/argouml/debian/patches/01_manifest.unpatch
   trunk/argouml/debian/patches/02_manifest.unpatch
   trunk/argouml/debian/patches/05b_not_the_good_gef_version.unpatch
Removed:
   trunk/argouml/debian/patches/01_manifest.patch
   trunk/argouml/debian/patches/02_manifest.patch
   trunk/argouml/debian/patches/05b_not_the_good_gef_version.patch
Modified:
   trunk/argouml/debian/ant.properties
   trunk/argouml/debian/argouml.sh
   trunk/argouml/debian/changelog
   trunk/argouml/debian/control
   trunk/argouml/debian/rules
Log:
head -n12 debian/changelog

Added: trunk/argouml/debian/README.Debian
===================================================================
--- trunk/argouml/debian/README.Debian	2006-08-03 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/README.Debian	2006-08-03 11:40:01 UTC (rev 2323)
@@ -0,0 +1,14 @@
+argouml
+-------
+
+Building the source for Debian:
+-------------------------------
+
+I moved 'src/model' to 'src_new/model'.
+I moved 'src/i18n' to 'src_new/i18n'.
+I added a 'manuals' directory with:
+  o argomanual-0.20.pdf
+  o cookbook-0.20.pdf
+  o quickguide-0.20.pdf
+
+ -- Arnaud Vandyck <avdyk at debian.org>, Sun, 23 Jul 2006 20:11:09 +0200

Modified: trunk/argouml/debian/ant.properties
===================================================================
--- trunk/argouml/debian/ant.properties	2006-08-03 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/ant.properties	2006-08-03 11:40:01 UTC (rev 2323)
@@ -3,3 +3,4 @@
 #skip.dependency.check=true
 skip.dependency.check=false
 debug=false
+log4j.jar.path=/usr/share/java/log4j-1.2.jar

Modified: trunk/argouml/debian/argouml.sh
===================================================================
--- trunk/argouml/debian/argouml.sh	2006-08-03 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/argouml.sh	2006-08-03 11:40:01 UTC (rev 2323)
@@ -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/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 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"
 
 # 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 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/changelog	2006-08-03 11:40:01 UTC (rev 2323)
@@ -1,3 +1,25 @@
+argouml (0.20-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:
+    #335294, #353464).
+  * Added IBM's 1.4 and 1.5 jdk's to the search path (closes: #368244).
+  * Dropped the jdk/jre 1.3 compatibility. ArgoUML will not work with
+    jdk1.3 (closes: #289241).
+  * Updated to standards-version 3.7.2: debhelper and cdbs are now in
+    Build-Depends.
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Sun, 23 Jul 2006 19:52:23 +0200
+
+argouml (0.19.6-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Replaced usage of base64-decode (package mime-codecs) by a Perl one-liner
+    and removed build-dependency on mime-codecs (patch from Andreas Jochens)
+    (closes: #360542)
+
+ -- Nicolas Duboc <nduboc at debian.org>  Fri, 21 Apr 2006 13:36:58 +0200
+
 argouml (0.19.6-2) unstable; urgency=low
 
   * added dependency against libgnujmi-java and libswidgets-java

Modified: trunk/argouml/debian/control
===================================================================
--- trunk/argouml/debian/control	2006-08-03 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/control	2006-08-03 11:40:01 UTC (rev 2323)
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: kaffe | java2-compiler, cdbs (>= 0.4.5.3), debhelper (>> 4.0.0), libxerces-java, antlr, liblog4j1.2-java, libgef-java (>= 0.10.2), libnsuml-java, libocl-argo-java, jikes, ant (>=1.5), ant-optional, libjdepend-java, junit, libi18n-java (>= 0.1.3), libtoolbar-java (>= 0.4), mime-codecs, libgnujmi-java, libswidgets-java
-Standards-Version: 3.6.2
+Build-Depends: cdbs (>= 0.4.5.3), debhelper (>> 4.0.0)
+Build-Depends-Indep: java-gcj-compat-dev | java2-compiler, libxerces-java, antlr, liblog4j1.2-java, libgef-java (>= 0.10.2), libnsuml-java, libocl-argo-java, jikes, ant (>=1.5), ant-optional, libjdepend-java, junit, libi18n-java (>= 0.1.3), libtoolbar-java (>= 0.4), libgnujmi-java, libswidgets-java
+Standards-Version: 3.7.2
 
 Package: argouml
 Architecture: all
-Depends: j2re1.3 | j2re1.4 | java2-runtime, libxerces-java, antlr, liblog4j1.2-java, libgef-java (>= 0.10.2), libnsuml-java, libocl-argo-java, libi18n-java (>= 0.1.3), libtoolbar-java (>= 0.4), libgnujmi-java, libswidgets-java
+Depends: j2re1.4-sun | java2-runtime, libxerces-java, antlr, liblog4j1.2-java, libgef-java (>= 0.10.2), libnsuml-java, libocl-argo-java, libi18n-java (>= 0.1.3), libtoolbar-java (>= 0.4), libgnujmi-java, libswidgets-java
 Suggests: argouml-doc
 Description: modelling tool to help you do your design using UML
  ArgoUML provides the following features:

Deleted: trunk/argouml/debian/patches/01_manifest.patch
===================================================================
--- trunk/argouml/debian/patches/01_manifest.patch	2006-08-03 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/patches/01_manifest.patch	2006-08-03 11:40:01 UTC (rev 2323)
@@ -1,10 +0,0 @@
---- src_new/templates/manifest.template.orig	2003-09-08 22:56:16.000000000 +0200
-+++ src_new/templates/manifest.template	2004-02-01 02:02:46.192331984 +0100
-@@ -1,6 +1,6 @@
- Manifest-Version: 2.0
- Main-Class: org.argouml.application.Main
--Class-Path: xerces.jar nsuml.jar ocl-argo.jar gef.jar i18n.jar antlrall.jar log4j.jar jh.jar saxon.jar toolbar.jar toolbutton.jar jaxp.jar crimson.jar parser.jar xml4j.jar jmi.jar
-+Class-Path: xerces.jar nsuml.jar ocl-argo.jar gef.jar i18n.jar antlrall.jar log4j-1.2.jar jh.jar saxon.jar toolbar.jar toolbutton.jar jaxp.jar crimson.jar parser.jar xml4j.jar jmi.jar
- Created-By: 1.2 (Sun Microsystems Inc.) 
- 
- Name: org/argouml/application/

Copied: trunk/argouml/debian/patches/01_manifest.unpatch (from rev 2141, trunk/argouml/debian/patches/01_manifest.patch)

Deleted: trunk/argouml/debian/patches/02_manifest.patch
===================================================================
--- trunk/argouml/debian/patches/02_manifest.patch	2006-08-03 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/patches/02_manifest.patch	2006-08-03 11:40:01 UTC (rev 2323)
@@ -1,10 +0,0 @@
---- src_new/templates/manifest.template.orig	2005-10-14 09:41:12.000000000 +0200
-+++ src_new/templates/manifest.template	2005-10-14 09:41:57.000000000 +0200
-@@ -1,6 +1,6 @@
- Manifest-Version: 2.0
- Main-Class: org.argouml.application.Main
--Class-Path: argouml-model.jar nsuml.jar ocl-argo.jar gef.jar antlrall.jar log4j.jar toolbar.jar swidgets.jar commons-logging.jar ext/argouml-i18n-nb.jar ext/argouml-i18n-zh.jar
-+Class-Path: argouml-model.jar nsuml.jar ocl-argo.jar gef.jar antlrall.jar log4j-1.2.jar toolbar.jar swidgets.jar commons-logging.jar ext/argouml-i18n-nb.jar ext/argouml-i18n-zh.jar
- Created-By: 1.2 (Sun Microsystems Inc.) 
- 
- Name: org/argouml/application/

Copied: trunk/argouml/debian/patches/02_manifest.unpatch (from rev 2141, trunk/argouml/debian/patches/02_manifest.patch)

Deleted: trunk/argouml/debian/patches/05b_not_the_good_gef_version.patch
===================================================================
--- trunk/argouml/debian/patches/05b_not_the_good_gef_version.patch	2006-08-03 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/patches/05b_not_the_good_gef_version.patch	2006-08-03 11:40:01 UTC (rev 2323)
@@ -1,20 +0,0 @@
---- src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java~	2005-09-01 20:39:49.000000000 +0200
-+++ src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java	2005-10-13 18:46:55.000000000 +0200
-@@ -196,8 +196,8 @@
- 	try {
- 	    fo = new FileOutputStream( theFile );
- 	    cmd.setStream(fo);
--	    cmd.setScale(Configuration.getInteger(
--	            SaveGraphicsManager.KEY_GRAPHICS_RESOLUTION, 1));
-+      //	    cmd.setScale(Configuration.getInteger(
-+      //	            SaveGraphicsManager.KEY_GRAPHICS_RESOLUTION, 1));
- 	    cmd.doIt();
- 	} finally {
- 	    if (fo != null) {
-@@ -231,4 +231,4 @@
- 	return chooser;
-     }
- 
--} /* end class ActionSaveAllGraphics */ 
-\ No newline at end of file
-+} /* end class ActionSaveAllGraphics */ 

Copied: trunk/argouml/debian/patches/05b_not_the_good_gef_version.unpatch (from rev 2141, trunk/argouml/debian/patches/05b_not_the_good_gef_version.patch)

Modified: trunk/argouml/debian/rules
===================================================================
--- trunk/argouml/debian/rules	2006-08-03 08:46:25 UTC (rev 2322)
+++ trunk/argouml/debian/rules	2006-08-03 11:40:01 UTC (rev 2323)
@@ -5,15 +5,14 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS := /usr/lib/kaffe 
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar ant-optional log4j-1.2 xercesImpl \
-						xml-apis antlrall nsuml gef ocl-argo jdepend junit i18n toolbar jmi \
+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_ANT_COMPILER := jikes
 DEB_BUILDDIR := src_new
+#DEB_ANT_BUILDFILE := 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 '-')
@@ -22,7 +21,7 @@
 	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 755 $(CURDIR)/debian/argouml.sh $(CURDIR)/debian/argouml/usr/bin/argouml
-	base64-decode < debian/argologo32x32.xpm.asc > $(CURDIR)/debian/argouml/usr/share/pixmaps/argouml_icon.xpm
+	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/* \
 	 $(CURDIR)/debian/argouml-doc/usr/share/doc/argouml-doc/apidoc

More information about the pkg-java-commits mailing list