-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Torsten, hi Nils, hi *,
Am Mon, 16 Aug 2010 00:14:58 +0200 schrieb Niels Thykier <ni...@thykier.net>: > >> See attached patch. > > > > thanks for the patch but you want to remove the existing install/* > > target from debian/rules, too. i fixed this and add a new patch. > I recall the maven-repo-helper having issues cleaning up after itself > (leaving behind a debian/.mh or so) and I did not see any additions to > the clean rule to remove this. > So is this patch missing an addition to the clean rule or have the > maven helper tool stopped leaving things behind? Thanks for the hint - there was indeed a debian/.mh left after the package building. Now it will remove in clean::. best regards, Matthias -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkxpkBIACgkQJwRJTy3zZoH1VgCfb7JK6S/Cz5Fh3VRZ/vu8S+Ul tXMAn0bhbkligqocG0wiHz2ARxem3sGM =9UcO -----END PGP SIGNATURE-----
From b6293a8529ecaefc39b09a072d9f757feaacddc3 Mon Sep 17 00:00:00 2001 From: Matthias Schmitz <matth...@sigxcpu.org> Date: Mon, 16 Aug 2010 21:06:51 +0200 Subject: [PATCH] Add easymock-2.4.pom and install it with maven-repo-helper * Add easymock-2.4.pom from repo1.maven.org * Add maven-repo-helper to Build-Depends: * Install the pom and link the jar in /usr/share/maven-repo * remove debian/.mh in clean:: --- debian/control | 2 +- debian/easymock-2.4.pom | 159 ++++++++++++++++++++++++++++++++++++++++++ debian/libeasymock-java.poms | 1 + debian/rules | 9 ++- 4 files changed, 166 insertions(+), 5 deletions(-) create mode 100644 debian/easymock-2.4.pom create mode 100644 debian/libeasymock-java.poms diff --git a/debian/control b/debian/control index 085054d..8022be3 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ DM-Upload-Allowed: yes Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/easymock/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/easymock/ Build-Depends: cdbs, debhelper (>= 5.0.42), default-jdk, ant-optional (>= 1.7.0), - junit4 (>= 4.6-2) + junit4 (>= 4.6-2), maven-repo-helper Standards-Version: 3.8.4 Homepage: http://www.easymock.org diff --git a/debian/easymock-2.4.pom b/debian/easymock-2.4.pom new file mode 100644 index 0000000..575b285 --- /dev/null +++ b/debian/easymock-2.4.pom @@ -0,0 +1,159 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.4</version> + <packaging>jar</packaging> + <name>EasyMock</name> + <url>http://www.easymock.org</url> + <description>EasyMock provides an easy way to create Mock Objects for interfaces by generating them on the fly using Java's proxy mechanism</description> + <licenses> + <license> + <name>MIT License</name> + <url>http://www.easymock.org/License.html</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>tammo</id> + <name>Tammo Freese</name> + <timezone>+1</timezone> + </developer> + <developer> + <id>henri</id> + <name>Henri Tremblay</name> + <url>http://www.jroller.com/Henri/</url> + <organization>Ossia Conseil</organization> + <organizationUrl>http://ossia-conseil.com</organizationUrl> + <timezone>+1</timezone> + </developer> + </developers> + <issueManagement> + <system>SourceForge</system> + <url>http://sourceforge.net/tracker/?group_id=82958</url> + </issueManagement> + <mailingLists> + <mailingList> + <name>User List</name> + <subscribe>From Yahoo groups</subscribe> + <unsubscribe>easymock-unsubscr...@yahoogroups.com</unsubscribe> + <post>easym...@yahoogroups.com</post> + <archive>http://tech.groups.yahoo.com/group/easymock/</archive> + </mailingList> + </mailingLists> + <scm> + <url>http://easymock.cvs.sourceforge.net/easymock/</url> + <developerConnection>scm:cvs:ext:usern...@easymock.cvs.sourceforge.net:/cvsroot/easymock:easymock</developerConnection> + <connection>scm:cvs:pserver:anonym...@easymock.cvs.sourceforge.net:/cvsroot/easymock:easymock</connection> + </scm> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <sourceDirectory>${basedir}/src</sourceDirectory> + <testSourceDirectory>${basedir}/src-tests</testSourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <index>true</index> + <manifestEntries> + <EasyMock-Version>${pom.version}</EasyMock-Version> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- plugin> + <artifactId>maven-clover-plugin</artifactId> + <version>2.4</version> + <configuration> + <licenseLocation>${basedir}/lib/clover.license</licenseLocation> + <jdk>1.5</jdk> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <configuration> + <targetPercentage>100%</targetPercentage> + </configuration> + <goals> + <goal>instrument</goal> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin--> + </plugins> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-2</version> + </extension> + </extensions> + </build> + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <excludePackageNames>*.internal</excludePackageNames> + <bottom><![CDATA[<i>Copyright © 2001-2008 OFFIS, Tammo Freese. This documentation is provided under the terms of the MIT licence.</i>]]></bottom> + </configuration> + </plugin> + </plugins> + </reporting> + <distributionManagement> + <repository> + <id>easymock-release</id> + <name>EasyMock Repository</name> + <url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository</url> + </repository> + <snapshotRepository> + <id>easymock-snapshot</id> + <name>EasyMock Snapshot Repository</name> + <url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository-snapshot</url> + </snapshotRepository> + </distributionManagement> +</project> diff --git a/debian/libeasymock-java.poms b/debian/libeasymock-java.poms new file mode 100644 index 0000000..4ffc7fe --- /dev/null +++ b/debian/libeasymock-java.poms @@ -0,0 +1 @@ +debian/easymock-2.4.pom diff --git a/debian/rules b/debian/rules index b58c231..5f2b2da 100755 --- a/debian/rules +++ b/debian/rules @@ -33,10 +33,7 @@ src: debian/rules restore-from-source clean:: - -install/libeasymock-java:: - install -m 0644 dist/easymock-$(UPSTREAM_VERSION).jar $(JAVADIR) - dh_link /usr/share/java/easymock-$(UPSTREAM_VERSION).jar /usr/share/java/easymock.jar + -rm -rf debian/.mh remove-source: rm -rf src tests samples @@ -63,3 +60,7 @@ check: upload: dupload -t mentors $(CHANGESFILE) + +binary-post-install/libeasymock-java:: + mh_installpoms -plibeasymock-java + mh_installjar -plibeasymock-java -l debian/easymock-$(UPSTREAM_VERSION).pom dist/easymock-$(UPSTREAM_VERSION).jar -- 1.7.1
