[syncany] 04/10: Refresh all patches for new release.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository syncany.

commit f7deb620daeb1aaaf7b5d84ed7443caefc8098df
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jan 25 00:22:06 2017 +0100

    Refresh all patches for new release.
---
 debian/patches/applicationVersion.patch |  2 +-
 debian/patches/build.patch              | 73 +++++++++++++++++++++++++++++++++
 debian/patches/no-tests.patch           | 26 ++++++++++++
 debian/patches/series                   |  2 +
 4 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/debian/patches/applicationVersion.patch b/debian/patches/applicationVersion.patch
index 80977cd..53db83e 100644
--- a/debian/patches/applicationVersion.patch
+++ b/debian/patches/applicationVersion.patch
@@ -7,7 +7,7 @@ Subject: applicationVersion
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build.gradle b/build.gradle
-index 0b79219..1792ac6 100644
+index 662253c..12683c4 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -15,7 +15,7 @@ project.ext {
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..01c5925
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,73 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 25 Jan 2017 00:20:11 +0100
+Subject: build
+
+Forwarded: not-needed
+---
+ build.gradle              | 11 -----------
+ syncany-cli/build.gradle  |  5 -----
+ syncany-lib/build.gradle  |  5 -----
+ syncany-util/build.gradle |  5 -----
+ 4 files changed, 26 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 12683c4..132a691 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -23,17 +23,6 @@ project.ext {
+ apply from: 'gradle/gradle/application.java.gradle'
+ apply from: 'gradle/gradle/application.distribution.gradle'
+ 
+-apply from: 'gradle/gradle/packaging.innosetup.gradle'
+-apply from: 'gradle/gradle/packaging.debian.gradle'
+-
+-apply from: 'gradle/gradle/reports.coverage.gradle'
+-apply from: 'gradle/gradle/reports.tests.gradle'
+-apply from: 'gradle/gradle/reports.javadoc.gradle'
+-apply from: 'gradle/gradle/reports.sonarqube.gradle'
+-
+-apply from: 'gradle/gradle/development.eclipse.gradle'
+-apply from: 'gradle/gradle/development.fakeinstall.gradle'
+-apply from: 'gradle/gradle/development.misc.gradle'
+ 
+ // Projects settings  //////////////////////////////////////////////////////////
+ 
+diff --git a/syncany-cli/build.gradle b/syncany-cli/build.gradle
+index 71a8ba4..9e8fcb3 100644
+--- a/syncany-cli/build.gradle
++++ b/syncany-cli/build.gradle
+@@ -13,8 +13,3 @@ dependencies {
+ 	testCompile		"junit:junit:4.9"   	      
+ }
+ 
+-sonarRunner {
+-	sonarProperties {
+-			properties["sonar.tests"] += "src/test/integration/java"
+-	}
+-}
+diff --git a/syncany-lib/build.gradle b/syncany-lib/build.gradle
+index bfaa238..8e15b66 100644
+--- a/syncany-lib/build.gradle
++++ b/syncany-lib/build.gradle
+@@ -32,8 +32,3 @@ dependencies {
+ 	testCompile		"net.sourceforge.htmlunit:htmlunit:2.15"
+ }
+ 
+-sonarRunner {
+-	sonarProperties {
+-			properties["sonar.tests"] += "src/test/integration/java"
+-	}
+-}
+diff --git a/syncany-util/build.gradle b/syncany-util/build.gradle
+index 267330c..8653d02 100644
+--- a/syncany-util/build.gradle
++++ b/syncany-util/build.gradle
+@@ -15,8 +15,3 @@ dependencies {
+ 	testCompile		"junit:junit:4.9"   	      
+ }
+ 
+-sonarRunner {
+-	sonarProperties {
+-			properties["sonar.tests"] += "src/test/integration/java"
+-	}
+-}
diff --git a/debian/patches/no-tests.patch b/debian/patches/no-tests.patch
new file mode 100644
index 0000000..173f0b4
--- /dev/null
+++ b/debian/patches/no-tests.patch
@@ -0,0 +1,26 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 25 Jan 2017 00:20:56 +0100
+Subject: no-tests
+
+Do not run the tests. Not all test dependencies are available in Debian.
+
+Forwarded: not-needed
+---
+ build.gradle | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 132a691..9cc5283 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -35,10 +35,4 @@ dependencies {
+ 	compile			project(":syncany-cli")
+ 	compile			project(":syncany-util")
+ 
+-	testCompile		project(path: ":syncany-lib", configuration: "tests")
+-	testCompile		project(path: ":syncany-cli", configuration: "tests")
+-	testCompile		project(path: ":syncany-util", configuration: "tests")
+-	
+-	testRuntime "org.slf4j:slf4j-log4j12:1.7.5"
+-	testRuntime "log4j:log4j:1.2.7"
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e90a138..3cd474b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 applicationVersion.patch
+build.patch
+no-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/syncany.git