Mon Sep 4 09:56:32 UTC 2017

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

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

commit 9df3b27683105a0576c05ab7fe8aaf7bbfd54fcb
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Mon Jul 13 23:41:48 2009 +0000

    * Change section to java, bump up Standards-Version to 3.8.1
    * Bump up debhelper to 6
    * Add the Maven POM to the package
    * Add a Build-Depends-Indep dependency on maven-repo-helper
    * Move debhelper, quilt, default-jdk dependencies to Build-Depends
    * Use mh_installpom and mh_installjar to install the POM and the jar to the
      Maven repository
    * Use default-java for the build
    * Add ${misc:Depends} to Depends to clear Lintian warnings
    * Use quilt instead of dpatch and update the patches (I have trouble
      with dpatch)
---
 debian/changelog                                   | 16 ++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 11 ++--
 debian/links                                       |  1 -
 debian/maven.rules                                 |  2 +
 debian/patches/00list                              |  2 -
 debian/patches/02_bad_test_case.dpatch             | 46 ----------------
 .../patches/{01_build_files.dpatch => build.patch} | 62 ++++++++++------------
 debian/patches/series                              |  1 +
 debian/pom.xml                                     | 13 +++++
 debian/rules                                       | 18 +++++--
 11 files changed, 81 insertions(+), 93 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66d3c78..9001bef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+jmock (1.0.1-3) experimental; urgency=low
+
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Bump up debhelper to 6
+  * Add the Maven POM to the package
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Move debhelper, quilt, default-jdk dependencies to Build-Depends
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Use default-java for the build
+  * Add ${misc:Depends} to Depends to clear Lintian warnings
+  * Use quilt instead of dpatch and update the patches (I have trouble
+    with dpatch)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 27 May 2009 20:11:43 +0100
+
 jmock (1.0.1-2) unstable; urgency=low
 
   * Added ant-optional as required by ant reorganization to
diff --git a/debian/compat b/debian/compat
index b8626c4..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+6
diff --git a/debian/control b/debian/control
index 719ec16..84ec87c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,23 @@
 Source: jmock
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.n>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: ant (>= 1.6.5), debhelper (>> 4.0.0), dpatch (>= 2.0.15), junit (>= 3.8.1), kaffe (>= 2:1.1.5), ant-optional
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 6), quilt, default-jdk
+Build-Depends-Indep: ant (>= 1.6.5), junit (>= 3.8.1), ant-optional, maven-repo-helper
+Standards-Version: 3.8.1
 
 Package: libjmock-java
 Architecture: all
-Depends: kaffe (>= 2:1.1.5) | java1-runtime | java2-runtime
+Depends: ${misc:Depends}, kaffe (>= 2:1.1.5) | java1-runtime-headless | java2-runtime-headless
 Suggests: libjmock-java-doc
 Description: Java library for testing code with mock objects
  Mock objects help you design and test the interactions between the objects in
  your programs.
 
 Package: libjmock-java-doc
+Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Java library for testing code with mock objects - documentation
  Includes javadoc only.
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 1e8ebd0..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/jmock-1.0.1.jar usr/share/java/jmock.jar
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..7a4bdc9
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+jmock jmock jar s/1\..*/1.x/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 585ceed..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_build_files
-02_bad_test_case
diff --git a/debian/patches/02_bad_test_case.dpatch b/debian/patches/02_bad_test_case.dpatch
deleted file mode 100755
index 37972ba..0000000
--- a/debian/patches/02_bad_test_case.dpatch
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_bad_test_case.dpatch by  <trygvis at echidna.inamo.no>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./core/src/test/jmock/builder/InvocationMockerBuilderTest.java /tmp/dpep-work.Oc8f9Z/jmock/core/src/test/jmock/builder/InvocationMockerBuilderTest.java
---- ./core/src/test/jmock/builder/InvocationMockerBuilderTest.java	2005-09-18 16:08:38.000000000 +0200
-+++ /tmp/dpep-work.Oc8f9Z/jmock/core/src/test/jmock/builder/InvocationMockerBuilderTest.java	2005-09-18 16:32:46.021700168 +0200
-@@ -62,7 +62,7 @@
-         }
-         fail("should have thrown IllegalArgumentException");
-     }
--
-+/*
-     public void testMethodNameNotInMockedTypeCausesTestFailure() {
-         String methodNameNotInMockedInterface = "methodNameNotInMockedInterface";
- 
-@@ -78,7 +78,7 @@
-         }
-         fail("should have thrown AssertionFailedError");
-     }
--
-+*/
-     public void testSpecifyingMethodWithConstraintAddsMethodNameMatcherButDoesNotAddSelfToIdentityTable() {
-         Constraint nameConstraint = (Constraint)newDummy(Constraint.class, "nameConstraint");
- 
-diff -urNad --exclude=CVS --exclude=.svn ./core/src/test/jmock/core/stub/ThrowStubTest.java /tmp/dpep-work.Oc8f9Z/jmock/core/src/test/jmock/core/stub/ThrowStubTest.java
---- ./core/src/test/jmock/core/stub/ThrowStubTest.java	2005-09-18 16:08:39.000000000 +0200
-+++ /tmp/dpep-work.Oc8f9Z/jmock/core/src/test/jmock/core/stub/ThrowStubTest.java	2005-09-18 16:32:46.020700320 +0200
-@@ -131,7 +131,7 @@
-         }
-         fail("should have thrown an Error");
-     }
--
-+/*
-     public void testSetsStackTraceWhenExceptionIsThrown() {
-         try {
-             throwStub.invoke(invocation);
-@@ -143,4 +143,5 @@
-                          throwStub.getClass().getName(), stackTrace[0].getClassName());
-         }
-     }
-+*/
- }
diff --git a/debian/patches/01_build_files.dpatch b/debian/patches/build.patch
old mode 100755
new mode 100644
similarity index 68%
rename from debian/patches/01_build_files.dpatch
rename to debian/patches/build.patch
index fc7001c..096d256
--- a/debian/patches/01_build_files.dpatch
+++ b/debian/patches/build.patch
@@ -1,16 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_build_files.dpatch by  <trygvis at echidna.inamo.no>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./build.xml /tmp/dpep-work.WZPNHj/jmock/build.xml
---- ./build.xml	2005-09-18 16:08:38.000000000 +0200
-+++ /tmp/dpep-work.WZPNHj/jmock/build.xml	2005-09-18 16:31:15.390478208 +0200
-@@ -1,4 +1,17 @@
- <project default="jars">
-+
+--- a/build.xml
++++ b/build.xml
+@@ -1,5 +1,16 @@
+ <project default="jars">
+-    <property file="build.properties"/>
 +    <property name="build.javadoc.subdir" value="javadoc"/>
 +
 +    <target name="debian-clean" depends="clean">
@@ -20,26 +12,26 @@ diff -urNad --exclude=CVS --exclude=.svn ./build.xml /tmp/dpep-work.WZPNHj/jmock
 +    </target>
 +
 +    <target name="debian-install" depends="core.jar,javadoc">
-+        <copy file="${core.jar}" todir="debian/libjmock-java/usr/share/java"/>
 +    </target>
-+
-     <property file="build.properties"/>
- 
-     <property name="lib.dir" value="lib"/>
-@@ -80,14 +93,14 @@
-     <target name="core.test.unit" depends="core.compile">
-         <!-- Must add lib/junit.jar to the CLASSPATH to run this task -->
-         <mkdir dir="${report.test.unit.dir}"/>
--        <junit printsummary="no" haltonfailure="true" haltonerror="true" fork="true">
-+        <junit printsummary="on" haltonfailure="true" haltonerror="true" fork="true">
-             <classpath>
-                 <fileset dir="${lib.dir}"/>
-                 <pathelement path="${core.build.dir}"/>
-             </classpath>
-             <formatter type="plain"/>
-             <batchtest todir="${report.test.unit.dir}">
--                <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*"/>
-+                <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*,**/DefaultResultStubTest.java,**/ThrowStubTest.java"/>
-             </batchtest>
-         </junit>
-     </target>
++ 
++   <property file="build.properties"/>
+ 
+     <property name="lib.dir" value="lib"/>
+     <property name="examples.dir" value="examples"/>
+@@ -80,14 +91,14 @@
+     <target name="core.test.unit" depends="core.compile">
+         <!-- Must add lib/junit.jar to the CLASSPATH to run this task -->
+         <mkdir dir="${report.test.unit.dir}"/>
+-        <junit printsummary="no" haltonfailure="true" haltonerror="true" fork="true">
++        <junit printsummary="on" haltonfailure="true" haltonerror="true" fork="true">
+             <classpath>
+                 <fileset dir="${lib.dir}"/>
+                 <pathelement path="${core.build.dir}"/>
+             </classpath>
+             <formatter type="plain"/>
+             <batchtest todir="${report.test.unit.dir}">
+-                <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*"/>
++                <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*,**/DefaultResultStubTest.java,**/ThrowStubTest.java"/>
+             </batchtest>
+         </junit>
+     </target>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5879227
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build.patch
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..114b6eb
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,13 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>jmock</groupId>
+  <artifactId>jmock</artifactId>
+  <version>1.0.1</version>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/debian/rules b/debian/rules
index 5141c07..aee65a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,24 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 export LANG=C
 
-JAVA_HOME  		:= /usr/lib/kaffe
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+JAVA_HOME  		:= /usr/lib/jvm/default-java
 JAVACMD         := $(JAVA_HOME)/bin/java
 ANT_PROPS       := debian/ant.properties
 ANT_HOME        := /usr/share/ant
-ANT_CLASSPATH   := $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:/usr/share/java/junit.jar
+ANT_CLASSPATH   := $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:/usr/share/java/junit.jar:$(JAVA_HOME)/lib/tools.jar
 VERBOSE			:= #-verbose
 
 ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) org.apache.tools.ant.Main $(VERBOSE) -propertyfile $(ANT_PROPS)
 
 build: build-stamp
 
-build-stamp: patch-stamp
+build-stamp: debian/stamp-patched
 	dh_testdir
 	$(ANT) debian-build
 	touch build-stamp
@@ -33,6 +36,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 	$(ANT) debian-install
+	mh_installpoms -plibjmock-java
+	mh_installjar -plibjmock-java -l debian/pom.xml build/dist/jars/jmock-$(DEB_UPSTREAM_VERSION).jar
 #	mkdir -p $(TEMPDIR)/usr/share/java
 #	mkdir -p $(TEMPDIR)/usr/share/doc/libowanttasks-java
 #	install -m 644 output/lib/ow_util_ant_tasks.jar $(TEMPDIR)/usr/share/java
@@ -62,3 +67,8 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
+
+get-orig-pom:
+	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/jmock/jmock/$(DEB_UPSTREAM_VERSION)/jmock-$(DEB_UPSTREAM_VERSION).pom
+
+

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

