[opticalraytracer] 05/06: * Remove dead patches - now using jh_build, rather than ant

D Haley mycae-guest at moszumanska.debian.org
Thu May 14 22:55:09 UTC 2015


This is an automated email from the git hooks/post-receive script.

mycae-guest pushed a commit to branch master
in repository opticalraytracer.

commit 7a2d6d88f6e223fe950ccb1509986e3ca007441b
Author: D Haley <mycae at gmx.com>
Date:   Fri May 15 00:52:57 2015 +0200

    * Remove dead patches
    	- now using jh_build, rather than ant
---
 debian/patches/build-xml.patch                | 79 ---------------------------
 debian/patches/disable-ant-propertyfile.patch | 25 ---------
 debian/patches/series                         |  1 -
 3 files changed, 105 deletions(-)

diff --git a/debian/patches/build-xml.patch b/debian/patches/build-xml.patch
deleted file mode 100644
index 1583f98..0000000
--- a/debian/patches/build-xml.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: opticalraytracer-3.0/build.xml
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ opticalraytracer-3.0/build.xml	2011-03-27 20:19:54.000000000 +0100
-@@ -0,0 +1,74 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!-- You may freely edit this file. See commented blocks below for -->
-+<!-- some examples of how to customize the build. -->
-+<!-- (If you delete it and reopen the project it will be recreated.) -->
-+<!-- By default, only the Clean and Build commands use this build script. -->
-+<!-- Commands such as Run, Debug, and Test only use this build script if -->
-+<!-- the Compile on Save feature is turned off for the project. -->
-+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-+<!-- in the project's Project Properties dialog box.-->
-+<project name="OpticalRayTracer" default="default" basedir=".">
-+    <description>Builds, tests, and runs the project OpticalRayTracer.</description>
-+    <import file="nbproject/build-impl.xml"/>
-+    <!--
-+
-+    There exist several targets which are by default empty and which can be 
-+    used for execution of your tasks. These targets are usually executed 
-+    before and after some main targets. They are: 
-+
-+      -pre-init:                 called before initialization of project properties
-+      -post-init:                called after initialization of project properties
-+      -pre-compile:              called before javac compilation
-+      -post-compile:             called after javac compilation
-+      -pre-compile-single:       called before javac compilation of single file
-+      -post-compile-single:      called after javac compilation of single file
-+      -pre-compile-test:         called before javac compilation of JUnit tests
-+      -post-compile-test:        called after javac compilation of JUnit tests
-+      -pre-compile-test-single:  called before javac compilation of single JUnit test
-+      -post-compile-test-single: called after javac compilation of single JUunit test
-+      -pre-jar:                  called before JAR building
-+      -post-jar:                 called after JAR building
-+      -post-clean:               called after cleaning build products
-+
-+    (Targets beginning with '-' are not intended to be called on their own.)
-+
-+    Example of inserting an obfuscator after compilation could look like this:
-+
-+        <target name="-post-compile">
-+            <obfuscate>
-+                <fileset dir="${build.classes.dir}"/>
-+            </obfuscate>
-+        </target>
-+
-+    For list of available properties check the imported 
-+    nbproject/build-impl.xml file. 
-+
-+
-+    Another way to customize the build is by overriding existing main targets.
-+    The targets of interest are: 
-+
-+      -init-macrodef-javac:     defines macro for javac compilation
-+      -init-macrodef-junit:     defines macro for junit execution
-+      -init-macrodef-debug:     defines macro for class debugging
-+      -init-macrodef-java:      defines macro for class execution
-+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-+      run:                      execution of project 
-+      -javadoc-build:           Javadoc generation
-+      test-report:              JUnit report generation
-+
-+    An example of overriding the target for project execution could look like this:
-+
-+        <target name="run" depends="OpticalRayTracer-impl.jar">
-+            <exec dir="bin" executable="launcher.exe">
-+                <arg file="${dist.jar}"/>
-+            </exec>
-+        </target>
-+
-+    Notice that the overridden target depends on the jar target and not only on 
-+    the compile target as the regular run target does. Again, for a list of available 
-+    properties which you can use, check the target you are overriding in the
-+    nbproject/build-impl.xml file. 
-+
-+    -->
-+</project>
diff --git a/debian/patches/disable-ant-propertyfile.patch b/debian/patches/disable-ant-propertyfile.patch
deleted file mode 100644
index 9699b00..0000000
--- a/debian/patches/disable-ant-propertyfile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-* Remove netbeans propertyfile cruft -- we don't need the damned thing, its just dragging in usless deps.
-Index: opticalraytracer-3.0/nbproject/build-impl.xml
-===================================================================
---- opticalraytracer-3.0.orig/nbproject/build-impl.xml	2011-03-27 20:29:46.000000000 +0100
-+++ opticalraytracer-3.0/nbproject/build-impl.xml	2011-03-27 20:29:50.000000000 +0100
-@@ -501,9 +501,6 @@
-         <touch file="${built-jar.properties}" verbose="false"/>
-         <property file="${built-jar.properties}" prefix="already.built.jar."/>
-         <antcall target="-warn-already-built-jar"/>
--        <propertyfile file="${built-jar.properties}">
--            <entry key="${basedir}" value=""/>
--        </propertyfile>
-     </target>
-     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-     <target depends="init" name="-check-automatic-build">
-@@ -862,9 +859,6 @@
-         <touch file="${built-clean.properties}" verbose="false"/>
-         <property file="${built-clean.properties}" prefix="already.built.clean."/>
-         <antcall target="-warn-already-built-clean"/>
--        <propertyfile file="${built-clean.properties}">
--            <entry key="${basedir}" value=""/>
--        </propertyfile>
-     </target>
-     <target depends="init" name="-do-clean">
-         <delete dir="${build.dir}"/>
diff --git a/debian/patches/series b/debian/patches/series
index 0b447aa..48c39e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-build-xml.patch
 jar-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opticalraytracer.git



More information about the debian-science-commits mailing list