This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 29a8e53a258aeec187b0c741a22e258fb1f37d5b Author: Markus Koschany <[email protected]> Date: Tue Jan 5 12:47:36 2016 +0100 Drop netbeans-html.parser-nocopy.patch, obsolete since we ship html5doc.zip now. --- debian/patches/netbeans-html.parser-nocopy.patch | 24 ------------------------ debian/patches/series | 1 - 2 files changed, 25 deletions(-) diff --git a/debian/patches/netbeans-html.parser-nocopy.patch b/debian/patches/netbeans-html.parser-nocopy.patch deleted file mode 100644 index b7de74f..0000000 --- a/debian/patches/netbeans-html.parser-nocopy.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sat, 2 Jan 2016 18:05:17 +0100 -Subject: netbeans html.parser nocopy - -Fix FTBFS since we don't ship html5doc.zip. - -Forwarded: not-needed ---- - html.parser/nbproject/project.properties | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/html.parser/nbproject/project.properties b/html.parser/nbproject/project.properties -index c15bdc4..6a976f8 100644 ---- a/html.parser/nbproject/project.properties -+++ b/html.parser/nbproject/project.properties -@@ -44,7 +44,7 @@ javac.compilerargs=-Xlint -Xlint:-serial - javac.source=1.6 - - release.external/htmlparser-1.2.1.jar=modules/ext/html5-parser.jar --release.external/html5doc.zip=docs/html5doc.zip -+#release.external/html5doc.zip=docs/html5doc.zip - release.external/icu4j-4_4_2.jar=modules/ext/icu4j-4_4_2.jar - - jnlp.indirect.jars=docs/html5doc.zip diff --git a/debian/patches/series b/debian/patches/series index 3ec25e8..96d8cbb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,4 +33,3 @@ netbeans-CommandLineParser.patch netbeans-ide-launcher.patch netbeans-xsl-httpserver.patch netbeans-slf4j.dummy.patch -netbeans-html.parser-nocopy.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
