Author: gg0-guest
Date: 2010-03-09 00:38:05 +0000 (Tue, 09 Mar 2010)
New Revision: 11821
Added:
trunk/maven-scm/debian/maven-scm-provider-tfs-components.xml
trunk/maven-scm/debian/source/
trunk/maven-scm/debian/source/format
Removed:
trunk/maven-scm/debian/maven.ignoreRules
trunk/maven-scm/debian/patches/
Modified:
trunk/maven-scm/debian/build.properties
trunk/maven-scm/debian/build.xml
trunk/maven-scm/debian/changelog
trunk/maven-scm/debian/control
trunk/maven-scm/debian/libmaven-scm-java.poms
trunk/maven-scm/debian/rules
Log:
new upstream release 1.3
Modified: trunk/maven-scm/debian/build.properties
===================================================================
--- trunk/maven-scm/debian/build.properties 2010-03-08 21:17:19 UTC (rev
11820)
+++ trunk/maven-scm/debian/build.properties 2010-03-09 00:38:05 UTC (rev
11821)
@@ -4,11 +4,12 @@
/usr/share/java/regexp.jar:\
/usr/share/java/ganymed-ssh2.jar:\
/usr/share/java/cvsclient.jar:\
+ /usr/share/java/junit.jar:\
${basedir}/maven-scm-api/build/maven-scm-api-${version}.jar:\
${basedir}/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/build/maven-scm-provider-git-commons-${version}.jar:\
${basedir}/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/build/maven-scm-provider-svn-commons-${version}.jar:\
${basedir}/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/build/maven-scm-provider-cvs-commons-${version}.jar
javadoc.dir=build/api
-maven.test.skip=true
+maven.test.skip=test
Modified: trunk/maven-scm/debian/build.xml
===================================================================
--- trunk/maven-scm/debian/build.xml 2010-03-08 21:17:19 UTC (rev 11820)
+++ trunk/maven-scm/debian/build.xml 2010-03-09 00:38:05 UTC (rev 11821)
@@ -35,6 +35,7 @@
<cleanmodule
dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe"/>
<cleanmodule dir="maven-scm-providers/maven-scm-provider-hg"/>
<cleanmodule dir="maven-scm-providers/maven-scm-provider-vss"/>
+ <cleanmodule dir="maven-scm-providers/maven-scm-provider-tfs"/>
<cleanmodule dir="maven-scm-providers/maven-scm-provider-synergy"/>
<cleanmodule dir="maven-scm-providers/maven-scm-provider-local"/>
<cleanmodule
dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons"/>
@@ -46,6 +47,7 @@
<cleanmodule
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons"/>
<cleanmodule
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe"/>
<cleanmodule
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava"/>
+ <cleanmodule dir="maven-scm-test"/>
<cleanmodule dir="maven-scm-client"/>
</target>
@@ -113,6 +115,7 @@
<packagemodule
dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe"/>
<packagemodule dir="maven-scm-providers/maven-scm-provider-hg"/>
<packagemodule dir="maven-scm-providers/maven-scm-provider-vss"/>
+ <packagemodule dir="maven-scm-providers/maven-scm-provider-tfs"/>
<packagemodule dir="maven-scm-providers/maven-scm-provider-synergy"/>
<packagemodule dir="maven-scm-providers/maven-scm-provider-local"/>
<packagemodule
dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons"/>
@@ -124,6 +127,7 @@
<packagemodule
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons"/>
<packagemodule
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe"/>
<packagemodule
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava"/>
+ <packagemodule dir="maven-scm-test"/>
<packagemodule dir="maven-scm-client"/>
</target>
@@ -136,6 +140,7 @@
<packageset
dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java"/>
<packageset
dir="maven-scm-providers/maven-scm-provider-hg/src/main/java"/>
<packageset
dir="maven-scm-providers/maven-scm-provider-vss/src/main/java"/>
+ <packageset
dir="maven-scm-providers/maven-scm-provider-tfs/src/main/java"/>
<packageset
dir="maven-scm-providers/maven-scm-provider-synergy/src/main/java"/>
<packageset
dir="maven-scm-providers/maven-scm-provider-local/src/main/java"/>
<packageset
dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java"/>
@@ -147,6 +152,7 @@
<packageset
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java"/>
<packageset
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java"/>
<packageset
dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java"/>
+ <packageset dir="maven-scm-test/src/main/java/"/>
<packageset dir="maven-scm-client/src/main/java/"/>
</javadoc>
</target>
Modified: trunk/maven-scm/debian/changelog
===================================================================
--- trunk/maven-scm/debian/changelog 2010-03-08 21:17:19 UTC (rev 11820)
+++ trunk/maven-scm/debian/changelog 2010-03-09 00:38:05 UTC (rev 11821)
@@ -1,3 +1,14 @@
+maven-scm (1.3-1) unstable; urgency=low
+
+ * New upstream release.
+ - Added tfs provider component
+ * Standards-Version to 3.8.4
+ * Source format 3.0 (quilt), removed quilt dependency
+ * Re-added maven-scm-test dependency
+ * Removed patch modello-xsd.diff, upstream updated model tag.
+
+ -- Gabriele Giacone <1o5g4...@gmail.com> Tue, 09 Mar 2010 01:17:46 +0100
+
maven-scm (1.2-2) unstable; urgency=low
* Bump up Standards-Version to 3.8.2
Modified: trunk/maven-scm/debian/control
===================================================================
--- trunk/maven-scm/debian/control 2010-03-08 21:17:19 UTC (rev 11820)
+++ trunk/maven-scm/debian/control 2010-03-09 00:38:05 UTC (rev 11821)
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.cla...@laposte.net>
-Build-Depends: debhelper (>= 6), cdbs, quilt, default-jdk
-Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4), ant,
ant-optional,
- libmodello-java,
- libregexp-java, libplexus-utils-java, libnetbeans-cvsclient-java,
- libganymed-ssh2-java, libplexus-container-default-java
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 6), cdbs, default-jdk
+Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4), ant,
+ ant-optional, libmodello-java, libregexp-java, libplexus-utils-java,
+ libnetbeans-cvsclient-java, libganymed-ssh2-java,
libplexus-container-default-java,
+ junit
+Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-scm
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-scm/
Homepage: http://maven.apache.org/scm/
Modified: trunk/maven-scm/debian/libmaven-scm-java.poms
===================================================================
--- trunk/maven-scm/debian/libmaven-scm-java.poms 2010-03-08 21:17:19 UTC
(rev 11820)
+++ trunk/maven-scm/debian/libmaven-scm-java.poms 2010-03-09 00:38:05 UTC
(rev 11821)
@@ -1,27 +1,32 @@
pom.xml --no-parent
maven-scm-api/pom.xml
-maven-scm-client/pom.xml
maven-scm-managers/pom.xml
maven-scm-managers/maven-scm-manager-plexus/pom.xml
+maven-scm-test/pom.xml
maven-scm-providers/pom.xml
+maven-scm-providers/maven-scm-provider-accurev/pom.xml
maven-scm-providers/maven-scm-provider-bazaar/pom.xml
+maven-scm-providers/maven-scm-provider-clearcase/pom.xml
+maven-scm-providers/maven-scm-providers-cvs/pom.xml
+maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml
+maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml
+maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml
+maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml
+maven-scm-providers/maven-scm-provider-hg/pom.xml
maven-scm-providers/maven-scm-providers-git/pom.xml
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
+maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
-maven-scm-providers/maven-scm-provider-hg/pom.xml
+maven-scm-providers/maven-scm-provider-local/pom.xml
+maven-scm-providers/maven-scm-provider-perforce/pom.xml
maven-scm-providers/maven-scm-providers-standard/pom.xml
-maven-scm-providers/maven-scm-provider-vss/pom.xml
-maven-scm-providers/maven-scm-provider-synergy/pom.xml
-maven-scm-providers/maven-scm-provider-local/pom.xml
+maven-scm-providers/maven-scm-provider-starteam/pom.xml
maven-scm-providers/maven-scm-providers-svn/pom.xml
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
-maven-scm-providers/maven-scm-provider-accurev/pom.xml
-maven-scm-providers/maven-scm-provider-starteam/pom.xml
-maven-scm-providers/maven-scm-provider-perforce/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml
-maven-scm-providers/maven-scm-provider-clearcase/pom.xml
-
+maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml
+maven-scm-providers/maven-scm-provider-synergy/pom.xml
+maven-scm-providers/maven-scm-provider-vss/pom.xml
+maven-scm-providers/maven-scm-provider-tfs/pom.xml
+maven-scm-client/pom.xml
+maven-scm-plugin/pom.xml --no-parent
Added: trunk/maven-scm/debian/maven-scm-provider-tfs-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-tfs-components.xml
(rev 0)
+++ trunk/maven-scm/debian/maven-scm-provider-tfs-components.xml
2010-03-09 00:38:05 UTC (rev 11821)
@@ -0,0 +1,11 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.scm.provider.ScmProvider</role>
+ <role-hint>tfs</role-hint>
+
<implementation>org.apache.maven.scm.provider.tfs.TfsScmProvider</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ </components>
+</component-set>
Deleted: trunk/maven-scm/debian/maven.ignoreRules
===================================================================
--- trunk/maven-scm/debian/maven.ignoreRules 2010-03-08 21:17:19 UTC (rev
11820)
+++ trunk/maven-scm/debian/maven.ignoreRules 2010-03-09 00:38:05 UTC (rev
11821)
@@ -1 +0,0 @@
-org.apache.maven.scm maven-scm-test
Modified: trunk/maven-scm/debian/rules
===================================================================
--- trunk/maven-scm/debian/rules 2010-03-08 21:17:19 UTC (rev 11820)
+++ trunk/maven-scm/debian/rules 2010-03-09 00:38:05 UTC (rev 11821)
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
@@ -12,16 +11,23 @@
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
API_DOCS := build/api
-SCM_PROVIDERS := maven-scm-provider-bazaar
maven-scm-providers-git/maven-scm-provider-git-commons \
- maven-scm-providers-git/maven-scm-provider-gitexe \
- maven-scm-provider-hg maven-scm-provider-vss maven-scm-provider-synergy
maven-scm-provider-local \
- maven-scm-providers-svn/maven-scm-provider-svn-commons \
- maven-scm-providers-svn/maven-scm-provider-svnexe \
- maven-scm-provider-accurev maven-scm-provider-starteam
maven-scm-provider-perforce \
- maven-scm-providers-cvs/maven-scm-provider-cvs-commons \
- maven-scm-providers-cvs/maven-scm-provider-cvsexe \
- maven-scm-providers-cvs/maven-scm-provider-cvsjava \
- maven-scm-provider-clearcase
+SCM_PROVIDERS := maven-scm-provider-accurev \
+ maven-scm-provider-bazaar \
+ maven-scm-provider-clearcase \
+ maven-scm-provider-hg \
+ maven-scm-provider-local \
+ maven-scm-provider-perforce \
+ maven-scm-providers-cvs/maven-scm-provider-cvsjava \
+ maven-scm-providers-cvs/maven-scm-provider-cvsexe \
+ maven-scm-providers-cvs/maven-scm-provider-cvs-commons
\
+ maven-scm-providers-git/maven-scm-provider-git-commons
\
+ maven-scm-providers-git/maven-scm-provider-gitexe \
+ maven-scm-providers-svn/maven-scm-provider-svn-commons
\
+ maven-scm-providers-svn/maven-scm-provider-svnexe \
+ maven-scm-provider-starteam \
+ maven-scm-provider-synergy \
+ maven-scm-provider-tfs \
+ maven-scm-provider-vss
makebuilddir/lib$(PACKAGE)-java::
set -e; for PROVIDER in maven-scm-managers/maven-scm-manager-plexus
$(addprefix maven-scm-providers/, $(SCM_PROVIDERS)); do \
@@ -35,6 +41,7 @@
binary-post-install/lib$(PACKAGE)-java::
mh_installpoms -plib$(PACKAGE)-java
mh_installjar -plib$(PACKAGE)-java -l maven-scm-api/pom.xml
maven-scm-api/build/maven-scm-api-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l maven-scm-test/pom.xml
maven-scm-test/build/maven-scm-test-$(VERSION).jar
mh_installjar -plib$(PACKAGE)-java -l maven-scm-client/pom.xml
maven-scm-client/build/maven-scm-client-$(VERSION).jar
mh_installjar -plib$(PACKAGE)-java -l
maven-scm-managers/maven-scm-manager-plexus/pom.xml
maven-scm-managers/maven-scm-manager-plexus/build/maven-scm-manager-plexus-$(VERSION).jar
set -e; for PROVIDER in $(SCM_PROVIDERS); do \
@@ -58,3 +65,5 @@
find . -type f -path *$*/target/classes/META-INF/plexus/components.xml
-exec cp '{}' $@ \;
copy-plexus-components: $(PLEXUS_COMPONENTS)
+
+unpatch:
Added: trunk/maven-scm/debian/source/format
===================================================================
--- trunk/maven-scm/debian/source/format (rev 0)
+++ trunk/maven-scm/debian/source/format 2010-03-09 00:38:05 UTC (rev
11821)
@@ -0,0 +1 @@
+3.0 (quilt)
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
