Commit b29fd235e07f6db167bb57f05d5809d5c9e0d8ea - maven-debian-helper

+2

-2

debian/control less more

4	4	Uploaders: Torsten Werner <twerner@debian.org>, Ludovic Claude <ludovic.claude@laposte.net>,
5	5	Michael Koch <konqueror@gmx.de>, Damien Raude-Morvan <drazzib@debian.org>
6	6	Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper (>> 6.7), ant-optional, help2man
7		Build-Depends-Indep: maven-repo-helper (>= 1.3), junit, libmaven-plugin-tools-java,
	7	Build-Depends-Indep: maven-repo-helper (>= 1.5), junit, libmaven-plugin-tools-java,
8	8	libplexus-velocity-java
9	9	Standards-Version: 3.9.1
10	10	Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-debian-helper

13	13
14	14	Package: maven-debian-helper
15	15	Architecture: all
16		Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.3), maven2 (>= 2.2.1-5),
	16	Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.5), maven2 (>= 2.2.1-5),
17	17	libmaven-clean-plugin-java, libmaven-resources-plugin-java,
18	18	libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-site-plugin-java,
19	19	libsurefire-java, velocity, libplexus-velocity-java

+1

-1

debian/rules less more

56	56	update-package-version:
57	57	perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" pom.xml
58	58	perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" maven-build-nodocs/pom.xml maven-debian-helper/pom.xml maven-debian-plugin/pom.xml
59		perl -p -i -e "s/maven-debian-helper $>= ([0-9\.]+$/maven-debian-helper \(>= ${VERSION})/" share/cdbs/1/class/maven-vars.mk maven-packager-utils/src/main/resources/control.vm
	59	perl -p -i -e "s/maven-debian-helper $>= ([0-9\.]+)$/maven-debian-helper \(>= ${VERSION})/" share/cdbs/1/class/maven-vars.mk maven-packager-utils/src/main/resources/control.vm
60	60
61	61

+1

-1

maven-build-nodocs/pom.xml less more

4	4	<parent>
5	5	<groupId>org.debian.maven</groupId>
6	6	<artifactId>maven-debian</artifactId>
7		<version>1.3</version>
	7	<version>1.4</version>
8	8	</parent>
9	9
10	10	<artifactId>maven-build-nodocs</artifactId>

+1

-1

maven-debian-helper/pom.xml less more

4	4	<parent>
5	5	<groupId>org.debian.maven</groupId>
6	6	<artifactId>maven-debian</artifactId>
7		<version>1.3</version>
	7	<version>1.4</version>
8	8	</parent>
9	9
10	10	<artifactId>maven-debian-helper</artifactId>

+1

-1

maven-debian-plugin/pom.xml less more

5	5	<parent>
6	6	<artifactId>maven-debian</artifactId>
7	7	<groupId>org.debian.maven</groupId>
8		<version>1.3</version>
	8	<version>1.4</version>
9	9	</parent>
10	10
11	11	<artifactId>maven-debian-plugin</artifactId>

+1

-1

maven-packager-utils/src/main/resources/control.ant.vm less more

17	17	Priority: optional
18	18	Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
19	19	Uploaders: ${packager} <${packagerEmail}>
20		Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.4)#if ($project.packaging != "pom" \|\| $project.modules.size() > 0), ant-optional, maven-ant-helper (>> 6.7)#end$space
	20	Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.5)#if ($project.packaging != "pom" \|\| $project.modules.size() > 0), ant-optional, maven-ant-helper (>> 6.7)#end$space
21	21	#if(!$compileDependencies.isEmpty())
22	22	Build-Depends-Indep:#printDependencies($compileDependencies)$space
23	23	#end

+1

-1

maven-packager-utils/src/main/resources/control.vm less more

17	17	Priority: optional
18	18	Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
19	19	Uploaders: ${packager} <${packagerEmail}>
20		Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.3)
	20	Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
21	21	#if(!$compileDependencies.isEmpty())
22	22	Build-Depends-Indep:#printDependencies($compileDependencies)$space
23	23	#end

+2

-2

pom.xml less more

3	3
4	4	<groupId>org.debian.maven</groupId>
5	5	<artifactId>maven-debian</artifactId>
6		<version>1.3</version>
	6	<version>1.4</version>
7	7	<packaging>pom</packaging>
8	8	<name>helper tools for using Maven to build Debian packages</name>
9	9

37	37	<dependency>
38	38	<groupId>org.debian.maven</groupId>
39	39	<artifactId>maven-repo-helper</artifactId>
40		<version>1.4</version>
	40	<version>1.5</version>
41	41	</dependency>
42	42	</dependencies>
43	43	</dependencyManagement>

+1

-1

share/cdbs/1/class/maven-vars.mk less more

27	27
28	28	# Declare Build-Deps for packages using this file
29	29	CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.43)
30		CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.3)
	30	CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.5)
31	31
32	32	# Maven home directory. Doesn't need to be changed except when using
33	33	# nonstandard Maven installations.