[syncany] 01/02: Imported Debian patch 0.4.6~alpha-1
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Sep 16 14:14:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository syncany.
commit 165135dc08d43be893caef94d537d023cf57a0dc
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Mar 2 17:13:57 2015 +0100
Imported Debian patch 0.4.6~alpha-1
---
debian/TODO | 1 +
debian/bash-completion | 1 +
debian/changelog | 5 ++
debian/compat | 1 +
debian/control | 61 ++++++++++++++
debian/copyright | 36 ++++++++
debian/docs | 2 +
debian/install | 2 +
debian/links | 28 +++++++
debian/patches/build.gradle.patch | 169 ++++++++++++++++++++++++++++++++++++++
debian/patches/no-tests.patch | 23 ++++++
debian/patches/series | 2 +
debian/rules | 27 ++++++
debian/source/format | 1 +
debian/watch | 6 ++
15 files changed, 365 insertions(+)
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..a60feb2
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1 @@
+Install bash-completion support
diff --git a/debian/bash-completion b/debian/bash-completion
new file mode 100644
index 0000000..af38844
--- /dev/null
+++ b/debian/bash-completion
@@ -0,0 +1 @@
+build/install/syncany/bash/syncany.bash-completion
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..78447b0
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+syncany (0.4.6~alpha-1) UNRELEASED; urgency=medium
+
+ * Initial release. (Closes: #766997)
+
+ -- Markus Koschany <apo at gambaru.de> Mon, 02 Mar 2015 17:13:57 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..af81b64
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,61 @@
+Source: syncany
+Section: utils
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ bash-completion,
+ debhelper (>= 9),
+ default-jdk,
+ gradle (>= 2.5),
+ libbcpkix-java,
+ libbcprov-java,
+ libcommons-codec-java,
+ libcommons-io-java,
+ libgoogle-gson-java,
+ libguava-java,
+ libhsqldb-java,
+ libhttpclient-java,
+ libjoptsimple-java,
+ libjpathwatch-java (>= 0.95-2),
+ libsemver-java,
+ libsimple-xml-java,
+ libstax-java,
+ libundertow-java
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/syncany.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/syncany.git
+Homepage: https://www.syncany.org
+
+Package: syncany
+Architecture: all
+Depends:
+ default-jre-headless | default-jre | java7-runtime-headless,
+ libbcpkix-java,
+ libbcprov-java,
+ libcommons-codec-java,
+ libcommons-io-java,
+ libgoogle-gson-java,
+ libguava-java,
+ libhsqldb-java,
+ libhttpclient-java,
+ libjoptsimple-java,
+ libjpathwatch-java (>= 0.95-2),
+ libsemver-java,
+ libsimple-xml-java,
+ libstax-java,
+ libundertow-java,
+ ${misc:Depends}
+Suggests:
+ bash-completion
+Description: secure cloud storage and filesharing application
+ Syncany allows users to backup and share certain folders of their workstations
+ using any kind of storage. Syncany provides data encryption and incredible
+ flexibility in terms of storage type and provider:
+ .
+ - Data encryption: Syncany encrypts the files locally, so that any online
+ storage can be used even for sensitive data.
+ .
+ - Arbitrary storage: Syncany uses a plug-in based storage system. It can be
+ used with any type of remote storage.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..7bc1198
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,36 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Syncany
+Source: https://www.syncany.org
+Files-Excluded:
+ *.jar
+
+Files: *
+Copyright: 2011-2015, Philipp C. Heckel and contributors
+License: GPL-3+
+Comment:
+ For a complete list of contributors see
+ /usr/share/doc/syncany/AUTHORS.md
+
+Files: syncany-util/src/main/java/org/syncany/util/Base58.java
+Copyright: 2011, Google Inc.
+License: Apache-2.0
+
+Files: gradle/innosetup/modpath.iss
+Copyright: Jared Breland <jbreland at legroom.net>
+License: LGPL-3
+
+Files: debian/*
+Copyright: 2015, Markus Koschany <apo at gambaru.de>
+License: GPL-3+
+
+License: GPL-3+
+ On Debian systems, the full text of the GNU General Public license 3
+ can be found in the file '/usr/share/common-licenses/GPL-3
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache License 2.0 can be found in the
+ file '/usr/share/common-licenses/Apache-2.0
+
+License: LGPL-3
+ On Debian systems, the full text of the GNU Lesser General Public License 3
+ can be found in the file '/usr/share/common-licenses/LGPL-3
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..72b8561
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+build/install/syncany/AUTHORS.md
+build/install/syncany/README.md
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..e23cd88
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+build/install/syncany/bin usr/share/syncany
+build/install/syncany/lib/syncany* usr/share/syncany/lib
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..5a913a7
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,28 @@
+usr/share/java/bcpkix.jar usr/share/syncany/lib/bcpkix.jar
+usr/share/java/bcprov.jar usr/share/syncany/lib/bcprov.jar
+usr/share/java/commons-codec.jar usr/share/syncany/lib/commons-codec.jar
+usr/share/java/commons-io.jar usr/share/syncany/lib/commons-io.jar
+usr/share/java/commons-logging.jar usr/share/syncany/lib/commons-logging.jar
+usr/share/java/gson.jar usr/share/syncany/lib/gson.jar
+usr/share/java/guava.jar usr/share/syncany/lib/guava.jar
+usr/share/java/hsqldb.jar usr/share/syncany/lib/hsqldb.jar
+usr/share/java/httpclient.jar usr/share/syncany/lib/httpclient.jar
+usr/share/java/httpcore.jar usr/share/syncany/lib/httpcore.jar
+usr/share/java/java-semver.jar usr/share/syncany/lib/java-semver.jar
+usr/share/java/jboss-logging.jar usr/share/syncany/lib/jboss-logging.jar
+usr/share/java/joptsimple.jar usr/share/syncany/lib/joptsimple.jar
+usr/share/java/jpathwatch.jar usr/share/syncany/lib/jpathwatch.jar
+usr/share/java/simple-xml.jar usr/share/syncany/lib/simple-xml.jar
+usr/share/java/stax-api.jar usr/share/syncany/lib/stax-api.jar
+usr/share/java/stax.jar usr/share/syncany/lib/stax.jar
+usr/share/java/tomcat8-annotations-api.jar usr/share/syncany/lib/tomcat8-annotations-api.jar
+usr/share/java/tomcat8-servlet-api.jar usr/share/syncany/lib/tomcat8-servlet-api.jar
+usr/share/java/tomcat8-websocket-api.jar usr/share/syncany/lib/tomcat8-websocket-api.jar
+usr/share/java/undertow-core.jar usr/share/syncany/lib/undertow-core.jar
+usr/share/java/undertow-servlet.jar usr/share/syncany/lib/undertow-servlet.jar
+usr/share/java/undertow-websockets-jsr.jar usr/share/syncany/lib/undertow-websockets-jsr.jar
+usr/share/java/xml-apis.jar usr/share/syncany/lib/xml-apis.jar
+usr/share/java/xnio-api.jar usr/share/syncany/lib/xnio-api.jar
+usr/share/java/xnio-nio.jar usr/share/syncany/lib/xnio-nio.jar
+usr/share/syncany/bin/sy usr/bin/sy
+usr/share/syncany/bin/syncany usr/bin/syncany
diff --git a/debian/patches/build.gradle.patch b/debian/patches/build.gradle.patch
new file mode 100644
index 0000000..87b729f
--- /dev/null
+++ b/debian/patches/build.gradle.patch
@@ -0,0 +1,169 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 15 Sep 2015 22:18:14 +0200
+Subject: build.gradle
+
+Debianize the build scripts and prevent them from downloading remote jar files
+from untrusted repositories. Use Debian's system jars instead. Disable
+sonarRunner.
+
+Forwarded: not-needed
+---
+ build.gradle | 15 ++++-----------
+ syncany-cli/build.gradle | 13 +++++++------
+ syncany-lib/build.gradle | 35 ++++++++++++++++-------------------
+ syncany-util/build.gradle | 13 +++++--------
+ 4 files changed, 32 insertions(+), 44 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 3dbfb57..3e6921c 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -15,7 +15,7 @@ project.ext {
+ applicationRevision = getRevision()
+
+ applicationVersionSnapshot = (!applicationRelease) ? "+SNAPSHOT.${asUTC(applicationDate, 'yyMMddHHmm')}.git${applicationRevision}" : ""
+- applicationVersionFull = "${applicationVersion}${applicationVersionSnapshot}"
++ applicationVersionFull = "${applicationVersion}"
+ }
+
+ // Gradle scripts and tasks ////////////////////////////////////////////////////
+@@ -23,22 +23,15 @@ 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 //////////////////////////////////////////////////////////
+
+ repositories {
+- mavenCentral()
++ maven {
++ url "file:///usr/share/maven-repo"
++ }
+ }
+
+ dependencies {
+diff --git a/syncany-cli/build.gradle b/syncany-cli/build.gradle
+index 71a8ba4..552ebb1 100644
+--- a/syncany-cli/build.gradle
++++ b/syncany-cli/build.gradle
+@@ -1,10 +1,16 @@
+ apply plugin: 'java'
+ apply plugin: 'eclipse'
+
++repositories {
++ maven {
++ url "file:///usr/share/maven-repo"
++ }
++}
++
+ dependencies {
+ compile project(":syncany-lib")
+ compile project(":syncany-util")
+- compile "net.sf.jopt-simple:jopt-simple:4.5"
++ compile "net.sf.jopt-simple:jopt-simple:debian"
+
+ testCompile "com.github.stefanbirkner:system-rules:1.5.0"
+
+@@ -13,8 +19,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..b37c3dc 100644
+--- a/syncany-lib/build.gradle
++++ b/syncany-lib/build.gradle
+@@ -6,25 +6,27 @@ configurations {
+ }
+
+ repositories {
+- mavenCentral()
++ maven {
++ url "file:///usr/share/maven-repo"
++ }
+ }
+
+ dependencies {
+ compile project(':syncany-util')
+
+- compile "commons-io:commons-io:2.4"
+- compile "org.bouncycastle:bcprov-jdk15on:1.51"
+- compile "org.bouncycastle:bcpkix-jdk15on:1.51"
+- compile "org.simpleframework:simple-xml:2.7.1"
+- compile "com.google.guava:guava:15.0"
+- compile "commons-codec:commons-codec:1.8"
+- compile "org.hsqldb:hsqldb:2.3.1"
+- compile "com.github.zafarkhaja:java-semver:0.7.2"
+- compile "org.apache.httpcomponents:httpclient:4.3.4"
+- compile "io.undertow:undertow-servlet:1.1.0.CR3"
+- compile "io.undertow:undertow-websockets-jsr:1.1.0.CR3"
+- compile "net.sf.jpathwatch:jpathwatch:0.95"
+- compile "com.google.code.gson:gson:2.2.4"
++ compile "commons-io:commons-io:debian"
++ compile "org.bouncycastle:bcprov:debian"
++ compile "org.bouncycastle:bcpkix:debian"
++ compile "org.simpleframework:simple-xml:debian"
++ compile "com.google.guava:guava:debian"
++ compile "commons-codec:commons-codec:debian"
++ compile "org.hsqldb:hsqldb:debian"
++ compile "com.github.zafarkhaja:java-semver:debian"
++ compile "org.apache.httpcomponents:httpclient:debian"
++ compile "io.undertow:undertow-servlet:debian"
++ compile "io.undertow:undertow-websockets-jsr:debian"
++ compile "net.sf.jpathwatch:jpathwatch:debian"
++ compile "com.google.code.gson:gson:debian"
+
+ testCompile project(path: ':syncany-util', configuration: 'tests')
+ testCompile "org.mockito:mockito-all:1.10.19"
+@@ -32,8 +34,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..016f876 100644
+--- a/syncany-util/build.gradle
++++ b/syncany-util/build.gradle
+@@ -5,18 +5,15 @@ configurations {
+ }
+
+ repositories {
+- mavenCentral()
++ maven {
++ url "file:///usr/share/maven-repo"
++ }
+ }
+
+ dependencies {
+- compile "commons-io:commons-io:2.4"
+- compile "org.hsqldb:hsqldb:2.3.1"
++ compile "commons-io:commons-io:debian"
++ compile "org.hsqldb:hsqldb:debian"
+
+ 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..8a4910d
--- /dev/null
+++ b/debian/patches/no-tests.patch
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 14 Sep 2015 23:46:01 +0200
+Subject: no tests
+
+Do not run the tests. Not all test dependencies are available in Debian.
+
+Forwarded: not-needed
+---
+ build.gradle | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index b7b0a02..3dbfb57 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -46,7 +46,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")
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6d2903b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+no-tests.patch
+build.gradle.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..00561b9
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+DEB_GRADLE_OPTS := --stacktrace --offline
+
+%:
+ dh $@ --parallel --with bash-completion
+
+override_dh_auto_build:
+ gradle $(DEB_GRADLE_OPTS) installApp
+ sh gradle/debian/makemanpages.sh
+ mkdir debian/man
+ cp $(CURDIR)/build/debian/syncany/debian/man/*.1 debian/man
+ ls $(CURDIR)/build/debian/syncany/debian/man/*.1 > debian/manpages
+
+override_dh_install:
+ $(RM) build/install/syncany/bin/*.bat
+ dh_install
+
+override_dh_clean:
+ dh_clean
+ $(RM) -r debian/man
+ $(RM) debian/manpages
+
+override_dh_installchangelogs:
+ dh_installchangelogs build/install/syncany/CHANGELOG.md
+
+get-orig-source:
+ uscan --verbose --repack --compression xz --download-current-version --force-download
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..58e8e5b
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,6 @@
+version=3
+opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/, \
+https://github.com/syncany/syncany/tags \
+.*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)(\d\S*)\.tar\.gz
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/syncany.git
More information about the pkg-java-commits
mailing list