r2324 - trunk/argouml/debian/patches

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


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

Removed:
   trunk/argouml/debian/patches/00list
   trunk/argouml/debian/patches/01_build_clean_javadocfix.dpatch
   trunk/argouml/debian/patches/01_build_clean_javadocfix.unpatch
   trunk/argouml/debian/patches/01_manifest.unpatch
   trunk/argouml/debian/patches/02_manifest.unpatch
   trunk/argouml/debian/patches/02_manifest_fix.dpatch
   trunk/argouml/debian/patches/02_manifest_fix.unpatch
   trunk/argouml/debian/patches/03_remove_jdepend.dpatch
   trunk/argouml/debian/patches/05b_not_the_good_gef_version.unpatch
Log:
remove unused patches

Deleted: trunk/argouml/debian/patches/00list
===================================================================
--- trunk/argouml/debian/patches/00list	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/00list	2006-08-03 11:40:39 UTC (rev 2324)
@@ -1,3 +0,0 @@
-01_build_clean_javadocfix
-02_manifest_fix
-03_remove_jdepend

Deleted: trunk/argouml/debian/patches/01_build_clean_javadocfix.dpatch
===================================================================
--- trunk/argouml/debian/patches/01_build_clean_javadocfix.dpatch	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/01_build_clean_javadocfix.dpatch	2006-08-03 11:40:39 UTC (rev 2324)
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-## 01_build_clean_javadocfix.dpatch by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/arnaud/debian/ITP/argouml/argouml/argouml-0.14/build.xml argouml-0.14/build.xml
---- /home/arnaud/debian/ITP/argouml/argouml/argouml-0.14/build.xml	2003-09-13 02:40:56.000000000 +0200
-+++ argouml-0.14/build.xml	2003-09-13 02:48:31.000000000 +0200
-@@ -900,6 +900,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/01_build_clean_javadocfix.unpatch
===================================================================
--- trunk/argouml/debian/patches/01_build_clean_javadocfix.unpatch	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/01_build_clean_javadocfix.unpatch	2006-08-03 11:40:39 UTC (rev 2324)
@@ -1,10 +0,0 @@
---- src_new/build.xml	2003-09-13 02:40:56.000000000 +0200
-+++ src_new/build.xml	2003-09-13 02:48:31.000000000 +0200
-@@ -900,6 +900,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/01_manifest.unpatch
===================================================================
--- trunk/argouml/debian/patches/01_manifest.unpatch	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/01_manifest.unpatch	2006-08-03 11:40:39 UTC (rev 2324)
@@ -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/

Deleted: trunk/argouml/debian/patches/02_manifest.unpatch
===================================================================
--- trunk/argouml/debian/patches/02_manifest.unpatch	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/02_manifest.unpatch	2006-08-03 11:40:39 UTC (rev 2324)
@@ -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/

Deleted: trunk/argouml/debian/patches/02_manifest_fix.dpatch
===================================================================
--- trunk/argouml/debian/patches/02_manifest_fix.dpatch	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/02_manifest_fix.dpatch	2006-08-03 11:40:39 UTC (rev 2324)
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-## 02_manifest_fix.dpatch by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/arnaud/debian/ITP/argouml/argouml/argouml-0.14/templates/manifest.template argouml-0.14/templates/manifest.template
---- /home/arnaud/debian/ITP/argouml/argouml/argouml-0.14/templates/manifest.template	2003-04-28 15:38:28.000000000 +0200
-+++ argouml-0.14/templates/manifest.template	2003-09-19 13:52:32.000000000 +0200
-@@ -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 jaxp.jar crimson.jar parser.jar xml4j.jar
-+Class-Path: xerces.jar nsuml.jar ocl-argo.jar gef.jar i18n.jar antlrall.jar log4j-1.2.jar jh.jar saxon.jar jaxp.jar crimson.jar parser.jar xml4j.jar
- Created-By: 1.2 (Sun Microsystems Inc.) 
- 
- Name: org/argouml/application/

Deleted: trunk/argouml/debian/patches/02_manifest_fix.unpatch
===================================================================
--- trunk/argouml/debian/patches/02_manifest_fix.unpatch	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/02_manifest_fix.unpatch	2006-08-03 11:40:39 UTC (rev 2324)
@@ -1,10 +0,0 @@
---- src_new/templates/manifest.template.orig	2003-12-23 21:35:33.000000000 +0100
-+++ src_new/templates/manifest.template	2004-01-31 23:46:56.425284896 +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 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 log4j1.2.jar jh.jar saxon.jar toolbar.jar jaxp.jar crimson.jar parser.jar xml4j.jar jmi.jar
- Created-By: 1.2 (Sun Microsystems Inc.) 
- 
- Name: org/argouml/application/

Deleted: trunk/argouml/debian/patches/03_remove_jdepend.dpatch
===================================================================
--- trunk/argouml/debian/patches/03_remove_jdepend.dpatch	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/03_remove_jdepend.dpatch	2006-08-03 11:40:39 UTC (rev 2324)
@@ -1,91 +0,0 @@
-#!/bin/sh -e
-## 03_remove_jdepend.dpatch by Arnaud Vandyck <arnaud at ressource-toi.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /tmp/argouml/argouml-0.14/build.xml argouml-0.14/build.xml
---- /tmp/argouml/argouml-0.14/build.xml	2004-01-30 23:56:35.000000000 +0100
-+++ argouml-0.14/build.xml	2004-01-30 23:57:42.000000000 +0100
-@@ -267,7 +267,6 @@
-     <path id="ant.optional.classpath">
-       <pathelement location="${ant.home}/optional.jar" />
-       <pathelement location="${junit.jar.path}" />
--      <pathelement location="${jdepend.jar.path}" />
-       <pathelement location="${xerces.jar.path}" />
-       <pathelement location="${xalan.jar.path}" />
-       <pathelement location="${bsf.jar.path}" />
-@@ -288,13 +287,6 @@
-       </classpath>
-     </taskdef>
- 
--    <taskdef name="jdepend"
--             classname="org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask">
--      <classpath>
--	 <path refid="ant.optional.classpath"/>
--      </classpath>
--    </taskdef>
--
-     <!-- End of support section for ant optional tasks                  -->
- 
-     <property name="Name" value="ArgoUML"/>
-@@ -368,7 +360,6 @@
-    prepare-docs --> writes the documentation to ${argo.javadocs.dir}
-    clean        --> cleans up the ${build.dir} directory
-    distclean    --> cleans up the distribution directory, ${dist.dir}
--   jdepend      --> obtain design quality metrics by applying JDepend
-    usage        --> show this message (default)
- 
-  See the comments inside the build.xml file for more details.
-@@ -1190,32 +1181,6 @@
-   </target>
- 
- 
--  <!-- =================================================================== -->
--  <!-- Perform JDepend to find about the structure in ArgoUML.             -->
--  <!-- =================================================================== -->
--  <target name="jdepend" depends="init">
--    <echo>
--CC - Concrete Class Count 
--AC - Abstract Class (and Interface) Count 
--Ca - Afferent Couplings (Ca) 
--Ce - Efferent Couplings (Ce) 
--A - Abstractness (0-1) 
--I - Instability (0-1) 
--D - Distance from the Main Sequence (0-1) 
--Cyclic - If the package contains a dependency cycle 
--
--For details see http://www.clarkware.com/software/JDepend.html.
--    </echo>
--    <java classname="jdepend.swingui.JDepend" 
--          fork="true"
--          failonerror="true">
--      <arg value="."/> 
--      <classpath>
--	<path refid="ant.optional.classpath"/>
--      </classpath>
--    </java>
--  </target>
--
- 
-   <!-- =================================================================== -->
-   <!-- Perform javasrc to find about the structure in ArgoUML.             -->

Deleted: trunk/argouml/debian/patches/05b_not_the_good_gef_version.unpatch
===================================================================
--- trunk/argouml/debian/patches/05b_not_the_good_gef_version.unpatch	2006-08-03 11:40:01 UTC (rev 2323)
+++ trunk/argouml/debian/patches/05b_not_the_good_gef_version.unpatch	2006-08-03 11:40:39 UTC (rev 2324)
@@ -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 */ 




More information about the pkg-java-commits mailing list