[ivyplusplus] 01/03: Restore status of patches from 91cbf76fb23163f4a6c97f9db111c02a89792101
Andreas Tille
tille at debian.org
Sat Feb 6 21:25:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ivyplusplus.
commit c304f33c8504aa88ce2e27ec81e58d36b193d4af
Author: Andreas Tille <tille at debian.org>
Date: Sat Feb 6 22:15:55 2016 +0100
Restore status of patches from 91cbf76fb23163f4a6c97f9db111c02a89792101
---
debian/patches/ignore-ide-specific-tasks | 107 ---------------------
...e_excluded_classes_from_ant_plugin_config.patch | 18 ++++
debian/patches/series | 2 +-
3 files changed, 19 insertions(+), 108 deletions(-)
diff --git a/debian/patches/ignore-ide-specific-tasks b/debian/patches/ignore-ide-specific-tasks
deleted file mode 100644
index 451b4c8..0000000
--- a/debian/patches/ignore-ide-specific-tasks
+++ /dev/null
@@ -1,107 +0,0 @@
---- a/src/com/zwitserloot/ivyplusplus/antlib.xml
-+++ b/src/com/zwitserloot/ivyplusplus/antlib.xml
-@@ -1,17 +1,17 @@
- <?xml version="1.0"?>
- <!--
- Copyright © 2010-2011 Reinier Zwitserloot.
--
-+
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
--
-+
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
--
-+
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-@@ -22,16 +22,16 @@
- -->
- <antlib xmlns:current="ant:current">
- <!-- insert here -->
-- <typedef name="eclipsegen" classname="com.zwitserloot.ivyplusplus.eclipse.BuildEclipseProject" />
-- <typedef name="intellijgen" classname="com.zwitserloot.ivyplusplus.intellij.BuildIntellijProject" />
-- <typedef name="eclipse-gen" classname="com.zwitserloot.ivyplusplus.eclipse.BuildEclipseProject" />
-- <typedef name="intellij-gen" classname="com.zwitserloot.ivyplusplus.intellij.BuildIntellijProject" />
-+ <!-- <typedef name="eclipsegen" classname="com.zwitserloot.ivyplusplus.eclipse.BuildEclipseProject" /> -->
-+ <!-- <typedef name="intellijgen" classname="com.zwitserloot.ivyplusplus.intellij.BuildIntellijProject" /> -->
-+ <!-- <typedef name="eclipse-gen" classname="com.zwitserloot.ivyplusplus.eclipse.BuildEclipseProject" /> -->
-+ <!-- <typedef name="intellij-gen" classname="com.zwitserloot.ivyplusplus.intellij.BuildIntellijProject" /> -->
- <typedef name="compile" classname="com.zwitserloot.ivyplusplus.Compile" />
- <typedef name="ensureippversion" classname="com.zwitserloot.ivyplusplus.EnsureVersion" />
- <typedef name="ensure-ipp-version" classname="com.zwitserloot.ivyplusplus.EnsureVersion" />
- <typedef name="create-artifact-bundle" classname="com.zwitserloot.ivyplusplus.mavencentral.CreateArtifactBundle" />
- <typedef name="cachedunjar" classname="com.zwitserloot.ivyplusplus.CachedUnjar" />
--
-+
- <macrodef name="show-html" description="Shows an HTML page.">
- <attribute name="file" />
- <attribute name="tempdir" default="build/showhtml" />
-@@ -55,7 +55,7 @@
- </java>
- </sequential>
- </macrodef>
--
-+
- <macrodef name="show-dep-report" description="Shows an HTML page with dependency info. Make sure ivy is configured before executing this task.">
- <attribute name="todir" default="build/report" />
- <sequential>
-@@ -79,7 +79,7 @@
- </java>
- </sequential>
- </macrodef>
--
-+
- <macrodef name="loadversion" description="Loads a version contained in a text file into the stated property.">
- <attribute name="file" />
- <attribute name="property" default="version" />
-@@ -92,7 +92,7 @@
- </loadresource>
- </sequential>
- </macrodef>
--
-+
- <macrodef name="git">
- <attribute name="command" />
- <attribute name="dir" default="" />
-@@ -115,7 +115,7 @@
- </fail>
- </sequential>
- </macrodef>
--
-+
- <macrodef name="git-clone">
- <attribute name="repository" />
- <attribute name="dest" />
-@@ -128,14 +128,14 @@
- </git>
- </sequential>
- </macrodef>
--
-+
- <macrodef name="git-pull">
- <attribute name="gitdir" default="." />
- <sequential>
- <git command="pull" dir="@{gitdir}" />
- </sequential>
- </macrodef>
--
-+
- <macrodef name="make-maven-repo">
- <attribute name="url" />
- <attribute name="group" />
-@@ -172,7 +172,7 @@
- <contains string="${mvn.oldversions.@{group}.@{artifact}}" substring="${version.tagged}" />
- </condition>
- </fail>
--
-+
- <delete dir="@{tmpdir}" quiet="true" />
- <property name="mvn.dir.@{group}.@{artifact}" value="@{tmpdir}/${mvn.group.path.@{group}}/@{artifact}" />
- <property name="mvn.bin.@{group}.@{artifact}" value="${mvn.dir.@{group}.@{artifact}}/@{version}" />
diff --git a/debian/patches/remove_excluded_classes_from_ant_plugin_config.patch b/debian/patches/remove_excluded_classes_from_ant_plugin_config.patch
new file mode 100644
index 0000000..99625b1
--- /dev/null
+++ b/debian/patches/remove_excluded_classes_from_ant_plugin_config.patch
@@ -0,0 +1,18 @@
+--- a/src/com/zwitserloot/ivyplusplus/antlib.xml
++++ b/src/com/zwitserloot/ivyplusplus/antlib.xml
+@@ -22,15 +22,9 @@
+ -->
+ <antlib xmlns:current="ant:current">
+ <!-- insert here -->
+- <typedef name="eclipsegen" classname="com.zwitserloot.ivyplusplus.eclipse.BuildEclipseProject" />
+- <typedef name="intellijgen" classname="com.zwitserloot.ivyplusplus.intellij.BuildIntellijProject" />
+- <typedef name="eclipse-gen" classname="com.zwitserloot.ivyplusplus.eclipse.BuildEclipseProject" />
+- <typedef name="intellij-gen" classname="com.zwitserloot.ivyplusplus.intellij.BuildIntellijProject" />
+ <typedef name="compile" classname="com.zwitserloot.ivyplusplus.Compile" />
+ <typedef name="ensureippversion" classname="com.zwitserloot.ivyplusplus.EnsureVersion" />
+ <typedef name="ensure-ipp-version" classname="com.zwitserloot.ivyplusplus.EnsureVersion" />
+- <typedef name="create-artifact-bundle" classname="com.zwitserloot.ivyplusplus.mavencentral.CreateArtifactBundle" />
+- <typedef name="cachedunjar" classname="com.zwitserloot.ivyplusplus.CachedUnjar" />
+
+ <macrodef name="show-html" description="Shows an HTML page.">
+ <attribute name="file" />
diff --git a/debian/patches/series b/debian/patches/series
index 6b9b26c..2cb0261 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-ignore-ide-specific-tasks
expand_data_decorator_into_java_constructor.patch
expand_getter_setter_into_plain_java.patch
+remove_excluded_classes_from_ant_plugin_config.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ivyplusplus.git
More information about the pkg-java-commits
mailing list