This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit e8415bb3ecc45841eb5422926f8aeeec43f64c06 Author: Markus Koschany <[email protected]> Date: Sat Jun 20 18:46:18 2015 +0200 Revert "Add reproducible-build.patch." This reverts commit 24171f24ffc912a986cc6558e8a0db8a72b4ea51. --- debian/patches/netbeans-include-junit.patch | 18 +++++++++--------- debian/patches/reproducible-build.patch | 25 ------------------------- debian/patches/series | 1 - 3 files changed, 9 insertions(+), 35 deletions(-) diff --git a/debian/patches/netbeans-include-junit.patch b/debian/patches/netbeans-include-junit.patch index 2797406..f34d6a4 100644 --- a/debian/patches/netbeans-include-junit.patch +++ b/debian/patches/netbeans-include-junit.patch @@ -14,16 +14,16 @@ Forwarded: not-needed --- junitlib/build.xml | 6 + junitlib/external/junit-3.8.2-license.txt | 220 +++++++++++++++++++++ - junitlib/external/junit-4.10-license.txt | 220 +++++++++++++++++++++ + junitlib/external/junit-4.10-license.txt | 220 +++++++++++++++++++++ junitlib/manifest.mf | 6 + junitlib/nbproject/project.properties | 7 + junitlib/nbproject/project.xml | 18 ++ junitlib/release/docs/junit-3.8.2-api.zip.external | 3 + - junitlib/release/docs/junit-4.10-api.zip.external | 3 + + junitlib/release/docs/junit-4.10-api.zip.external | 3 + .../release/modules/ext/junit-3.8.2.jar.external | 3 + .../netbeans/modules/junitlib/Bundle.properties | 7 + .../org/netbeans/modules/junitlib/junit-3.8.2.xml | 15 ++ - .../org/netbeans/modules/junitlib/junit-4.10.xml | 15 ++ + .../org/netbeans/modules/junitlib/junit-4.10.xml | 15 ++ .../src/org/netbeans/modules/junitlib/layer.xml | 14 ++ nbbuild/cluster.properties | 2 +- 14 files changed, 538 insertions(+), 1 deletion(-) @@ -281,7 +281,7 @@ index 0000000..75e380c +any resulting litigation. diff --git a/junitlib/external/junit-4.10-license.txt b/junitlib/external/junit-4.10-license.txt new file mode 100644 -index 0000000..c00defb +index 0000000..bbf82f5 --- /dev/null +++ b/junitlib/external/junit-4.10-license.txt @@ -0,0 +1,220 @@ @@ -519,7 +519,7 @@ index 0000000..e49c3d6 + diff --git a/junitlib/nbproject/project.properties b/junitlib/nbproject/project.properties new file mode 100644 -index 0000000..36bfb43 +index 0000000..af6fe52 --- /dev/null +++ b/junitlib/nbproject/project.properties @@ -0,0 +1,7 @@ @@ -565,7 +565,7 @@ index 0000000..c71e217 +URL:http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2-javadoc.jar diff --git a/junitlib/release/docs/junit-4.10-api.zip.external b/junitlib/release/docs/junit-4.10-api.zip.external new file mode 100644 -index 0000000..6646ca3 +index 0000000..083c169 --- /dev/null +++ b/junitlib/release/docs/junit-4.10-api.zip.external @@ -0,0 +1,3 @@ @@ -583,7 +583,7 @@ index 0000000..dd52afb +URL:http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar diff --git a/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties b/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties new file mode 100644 -index 0000000..bf31625 +index 0000000..6681d08 --- /dev/null +++ b/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties @@ -0,0 +1,7 @@ @@ -617,7 +617,7 @@ index 0000000..7a2ad09 +</library> diff --git a/junitlib/src/org/netbeans/modules/junitlib/junit-4.10.xml b/junitlib/src/org/netbeans/modules/junitlib/junit-4.10.xml new file mode 100644 -index 0000000..359ad71 +index 0000000..9a3ac3f --- /dev/null +++ b/junitlib/src/org/netbeans/modules/junitlib/junit-4.10.xml @@ -0,0 +1,15 @@ @@ -638,7 +638,7 @@ index 0000000..359ad71 +</library> diff --git a/junitlib/src/org/netbeans/modules/junitlib/layer.xml b/junitlib/src/org/netbeans/modules/junitlib/layer.xml new file mode 100644 -index 0000000..40640f8 +index 0000000..d7fcba5 --- /dev/null +++ b/junitlib/src/org/netbeans/modules/junitlib/layer.xml @@ -0,0 +1,14 @@ diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch deleted file mode 100644 index dac5b29..0000000 --- a/debian/patches/reproducible-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sat, 20 Jun 2015 16:56:00 +0200 -Subject: reproducible build - -Use a fixed timestamp for the install_time variable to make the build -reproducible. - -Forwarded: not-needed ---- - autoupdate.services/libsrc/org/netbeans/updater/UpdateTracking.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/autoupdate.services/libsrc/org/netbeans/updater/UpdateTracking.java b/autoupdate.services/libsrc/org/netbeans/updater/UpdateTracking.java -index 2d96007..78916dd 100644 ---- a/autoupdate.services/libsrc/org/netbeans/updater/UpdateTracking.java -+++ b/autoupdate.services/libsrc/org/netbeans/updater/UpdateTracking.java -@@ -1055,7 +1055,7 @@ public final class UpdateTracking { - * @param install_time New value of property install_time. - */ - void setInstall_time(long install_time) { -- this.install_time = install_time; -+ this.install_time = 1434794317901; - } - - /** Getter for property files. diff --git a/debian/patches/series b/debian/patches/series index dc9d329..2fc5a36 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,4 +27,3 @@ netbeans-updatecenters.patch netbeans-slf4j.dummy.patch netbeans-platform-o.n.bootstrap.patch netbeans-include-junit.patch -reproducible-build.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
