[maven-scm] 06/07: Replaced the patch disabling the vss provider with a Maven rule

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Aug 6 15:20:07 UTC 2015


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

ebourg-guest pushed a commit to branch master
in repository maven-scm.

commit 3780b64badeef8871dd3e58491693b90dcee615e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 6 17:14:13 2015 +0200

    Replaced the patch disabling the vss provider with a Maven rule
---
 debian/changelog                                  |  1 +
 debian/libmaven-scm-java.poms                     |  1 +
 debian/patches/0001-do-not-build-vss-module.patch | 21 ---------------------
 debian/patches/series                             |  1 -
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b484a00..19a1605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven-scm (1.3-6) UNRELEASED; urgency=medium
   * Moved the providers to a separate package (libmaven-scm-providers-java)
     to reduce the dependencies of libmaven-scm-java.
   * No longer build the unused maven-scm-client and maven-scm-plugin modules
+  * Replaced the patch disabling the vss provider with a Maven rule
   * Moved the package to Git
   * Standards-Version updated to 3.9.6 (no changes)
   * Reworded the package description
diff --git a/debian/libmaven-scm-java.poms b/debian/libmaven-scm-java.poms
index 15bdcad..e1a9eaa 100644
--- a/debian/libmaven-scm-java.poms
+++ b/debian/libmaven-scm-java.poms
@@ -54,5 +54,6 @@ maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml --
 maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml --has-package-version --package=libmaven-scm-providers-java
 maven-scm-providers/maven-scm-provider-synergy/pom.xml --has-package-version --package=libmaven-scm-providers-java
 maven-scm-providers/maven-scm-provider-tfs/pom.xml --has-package-version --package=libmaven-scm-providers-java
+maven-scm-providers/maven-scm-provider-vss/pom.xml --ignore
 maven-scm-client/pom.xml --ignore
 maven-scm-plugin/pom.xml --ignore
diff --git a/debian/patches/0001-do-not-build-vss-module.patch b/debian/patches/0001-do-not-build-vss-module.patch
deleted file mode 100644
index cc765eb..0000000
--- a/debian/patches/0001-do-not-build-vss-module.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sun, 11 Sep 2011 23:18:03 +0200
-Subject: do not build vss module
-
----
- maven-scm-providers/pom.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/maven-scm-providers/pom.xml b/maven-scm-providers/pom.xml
-index 40d06cc..8d86e20 100644
---- a/maven-scm-providers/pom.xml
-+++ b/maven-scm-providers/pom.xml
-@@ -47,7 +47,6 @@
-     <module>maven-scm-provider-starteam</module>
-     <module>maven-scm-providers-svn</module>
-     <module>maven-scm-provider-synergy</module>
--    <module>maven-scm-provider-vss</module>
-     <module>maven-scm-provider-tfs</module>
-   </modules>
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 3d21946..71d6f02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-do-not-build-vss-module.patch
 0002-fix-perforce-tests.patch

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



More information about the pkg-java-commits mailing list