This is an automated email from the git hooks/post-receive script. komal-guest pushed a commit to branch master in repository groovy2.
commit 78d085eba38c3e0c1674e37cc091ecb9b8d90613 Author: komal <[email protected]> Date: Tue Jun 23 00:23:47 2015 +0530 Add header to patches --- debian/patches/01_fix_doc_gradle.diff | 6 ++++++ debian/patches/02_fix_gradle_build.diff | 6 ++++++ debian/patches/change_bsf_dependencies_version.diff | 6 ++++++ debian/patches/change_junit_version.diff | 6 ++++++ debian/patches/change_servlet_dependency_version.diff | 6 ++++++ debian/patches/change_testng_dependency_version.diff | 16 +++++++++++----- debian/patches/fix_for_gradle-1.12 | 14 -------------- debian/patches/series | 2 +- 8 files changed, 42 insertions(+), 20 deletions(-) diff --git a/debian/patches/01_fix_doc_gradle.diff b/debian/patches/01_fix_doc_gradle.diff index 6840ab2..1604ea5 100644 --- a/debian/patches/01_fix_doc_gradle.diff +++ b/debian/patches/01_fix_doc_gradle.diff @@ -1,3 +1,9 @@ +Description: Remove code of asciidoctor-gradle-plugin +Author: Komal Sukhani <[email protected]> +Forwarded: no +Last-Update: 2015-06-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: debian-groovy2/gradle/docs.gradle =================================================================== --- debian-groovy2.orig/gradle/docs.gradle diff --git a/debian/patches/02_fix_gradle_build.diff b/debian/patches/02_fix_gradle_build.diff index b7b5463..2eecc74 100644 --- a/debian/patches/02_fix_gradle_build.diff +++ b/debian/patches/02_fix_gradle_build.diff @@ -1,3 +1,9 @@ +Description: Build groovy using packages available in Debian +Author: Komal Sukhani <[email protected]> +Forwarded: no +Last-Update: 2015-06-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: groovy2-2.4.3/build.gradle =================================================================== --- groovy2-2.4.3.orig/build.gradle diff --git a/debian/patches/change_bsf_dependencies_version.diff b/debian/patches/change_bsf_dependencies_version.diff index dd1f1e0..2ae045c 100644 --- a/debian/patches/change_bsf_dependencies_version.diff +++ b/debian/patches/change_bsf_dependencies_version.diff @@ -1,3 +1,9 @@ +Description: Change version of dependencies to one available in Debian +Author: Komal Sukhani <[email protected]> +Forwarded: no +Last-Update: 2015-06-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: debian-groovy2/subprojects/groovy-bsf/build.gradle =================================================================== --- debian-groovy2.orig/subprojects/groovy-bsf/build.gradle diff --git a/debian/patches/change_junit_version.diff b/debian/patches/change_junit_version.diff index e627b4f..55ffce7 100644 --- a/debian/patches/change_junit_version.diff +++ b/debian/patches/change_junit_version.diff @@ -1,3 +1,9 @@ +Description: Change version of junit to one available in Debian +Author: Komal Sukhani <[email protected]> +Forwarded: no +Last-Update: 2015-06-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/subprojects/groovy-test/build.gradle +++ b/subprojects/groovy-test/build.gradle @@ -1,7 +1,7 @@ diff --git a/debian/patches/change_servlet_dependency_version.diff b/debian/patches/change_servlet_dependency_version.diff index 098ca27..80aa97e 100644 --- a/debian/patches/change_servlet_dependency_version.diff +++ b/debian/patches/change_servlet_dependency_version.diff @@ -1,3 +1,9 @@ +Description: Change version of dependencies to one available in Debian +Author: Komal Sukhani <[email protected]> +Forwarded: no +Last-Update: 2015-06-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/subprojects/groovy-servlet/build.gradle +++ b/subprojects/groovy-servlet/build.gradle @@ -1,8 +1,8 @@ diff --git a/debian/patches/change_testng_dependency_version.diff b/debian/patches/change_testng_dependency_version.diff index 45a263e..b1b9fbc 100644 --- a/debian/patches/change_testng_dependency_version.diff +++ b/debian/patches/change_testng_dependency_version.diff @@ -1,17 +1,23 @@ -Index: debian-groovy2/subprojects/groovy-testng/build.gradle +Description: Change version of dependencies to one available in Debian +Author: Komal Sukhani <[email protected]> +Forwarded: no +Last-Update: 2015-06-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: alioth-groovy2/subprojects/groovy-testng/build.gradle =================================================================== ---- debian-groovy2.orig/subprojects/groovy-testng/build.gradle -+++ debian-groovy2/subprojects/groovy-testng/build.gradle +--- alioth-groovy2.orig/subprojects/groovy-testng/build.gradle ++++ alioth-groovy2/subprojects/groovy-testng/build.gradle @@ -1,10 +1,10 @@ dependencies { compile rootProject - runtime('org.testng:testng:6.8.13') { -+ runtime('org.testng:testng:6.9.4') { ++ runtime('org.testng:testng:6.x') { // exclude 'optional' beanshell even though testng's pom doesn't say optional exclude(group: 'org.beanshell', module: 'bsh') // and an older version of jcommander exclude(group: 'com.beust', module: 'jcommander') } - compile('com.beust:jcommander:1.47') -+ compile('com.beust:jcommander:1.35') ++ compile('com.beust:jcommander:1.x') } diff --git a/debian/patches/fix_for_gradle-1.12 b/debian/patches/fix_for_gradle-1.12 deleted file mode 100644 index 7a8b791..0000000 --- a/debian/patches/fix_for_gradle-1.12 +++ /dev/null @@ -1,14 +0,0 @@ -Index: debian-groovy2/gradle/quality.gradle -=================================================================== ---- debian-groovy2.orig/gradle/quality.gradle 2015-06-06 13:24:16.403972433 +0530 -+++ debian-groovy2/gradle/quality.gradle 2015-06-06 13:27:52.359978033 +0530 -@@ -46,8 +46,7 @@ - codenarcClasspath = rootProject.sourceSets.main.output + - project(':groovy-templates').sourceSets.main.output + - project(':groovy-xml').sourceSets.main.output + -- configurations.compile + -- files(configurations.codenarc.findAll { !(it.name =~ /groovy|junit/)}) -+ configurations.compile - } - - tasks.withType(Checkstyle) { diff --git a/debian/patches/series b/debian/patches/series index 809cf51..e234e12 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,7 +6,7 @@ -fix_for_gradle-1.12 +fix_for_gradle-1.12.diff change_bsf_dependencies_version.diff change_servlet_dependency_version.diff change_junit_version.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
