Package: mockito
Version: 1.9.0+ds1-1
Severity: normal
Tags: patch pending

Dear maintainer,

I have sponsored an NMU prepared by Ludovic Claude for mockito 
(versioned as 1.9.0+ds1-1.1) and uploaded it to DELAYED/7. 
Please feel free to tell me if I should delay it longer or remove 
it from the upload queue.

Regards,
tony

diff -Nru mockito-1.9.0+ds1/debian/changelog mockito-1.9.0+ds1/debian/changelog
--- mockito-1.9.0+ds1/debian/changelog  2012-03-19 15:53:49.000000000 -0700
+++ mockito-1.9.0+ds1/debian/changelog  2012-04-10 15:15:35.000000000 -0700
@@ -1,3 +1,16 @@
+mockito (1.9.0+ds1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * d/control: update locations of Mockito in Vcs-Git and
+    Vcs-Browser
+  * d/control: add version contraint >= 1.7.1 to be able to
+    use jh_maven_repo_helper plugin
+  * d/rules: use jh_maven_repo_helper plugin and remove
+    override_dh_auto_install section.
+  * Update debian/pom.xml for mockito 1.9.0
+
+ -- Ludovic Claude <[email protected]>  Wed, 11 Apr 2012 00:11:24 
+0200
+
 mockito (1.9.0+ds1-1) unstable; urgency=low
 
   * New upstream version
diff -Nru mockito-1.9.0+ds1/debian/control mockito-1.9.0+ds1/debian/control
--- mockito-1.9.0+ds1/debian/control    2012-03-19 15:53:49.000000000 -0700
+++ mockito-1.9.0+ds1/debian/control    2012-04-10 15:15:35.000000000 -0700
@@ -5,7 +5,7 @@
 Build-Depends:
  debhelper (>= 7.0.50~)
  , javahelper (>= 0.20~)
- , maven-repo-helper
+ , maven-repo-helper (>= 1.7.1)
  , openjdk-6-jdk
  , default-jdk
 Build-Depends-Indep:
@@ -16,8 +16,8 @@
  , libobjenesis-java
 Standards-Version: 3.9.3
 Homepage: http://mockito.org
-Vcs-Git: git://git.debian.org/git/collab-maint/mockito-core.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/mockito-core.git
+Vcs-Git: git://git.debian.org/git/collab-maint/mockito.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/mockito.git
 
 Package: libmockito-java
 Architecture: all
diff -Nru mockito-1.9.0+ds1/debian/libmockito-java.jlibs 
mockito-1.9.0+ds1/debian/libmockito-java.jlibs
--- mockito-1.9.0+ds1/debian/libmockito-java.jlibs      1969-12-31 
16:00:00.000000000 -0800
+++ mockito-1.9.0+ds1/debian/libmockito-java.jlibs      2012-04-10 
15:15:35.000000000 -0700
@@ -0,0 +1 @@
+mockito-core.jar
diff -Nru mockito-1.9.0+ds1/debian/libmockito-java.poms 
mockito-1.9.0+ds1/debian/libmockito-java.poms
--- mockito-1.9.0+ds1/debian/libmockito-java.poms       2012-03-19 
15:53:49.000000000 -0700
+++ mockito-1.9.0+ds1/debian/libmockito-java.poms       2012-04-10 
15:15:35.000000000 -0700
@@ -1 +1,2 @@
-debian/pom.xml --no-parent
+debian/pom.xml --no-parent --usj-name=mockito-core
+
diff -Nru mockito-1.9.0+ds1/debian/pom.xml mockito-1.9.0+ds1/debian/pom.xml
--- mockito-1.9.0+ds1/debian/pom.xml    2012-03-19 15:53:49.000000000 -0700
+++ mockito-1.9.0+ds1/debian/pom.xml    2012-04-10 15:15:35.000000000 -0700
@@ -1,34 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd ">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.mockito</groupId>
-    <artifactId>mockito-core</artifactId>
-    <version>1.8.5</version>
-    <name>Mockito</name>
-    <url>http://www.mockito.org</url>
-    <description>Mock objects library for java</description>
-    <licenses>
-        <license>
-            <name>The MIT License</name>
-            <url>http://code.google.com/p/mockito/wiki/License</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>http://code.google.com/p/mockito/source/browse/</url>
-    </scm>
-    <dependencies>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-            <version>1.0</version>        
-        </dependency>
-    </dependencies>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd ">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mockito</groupId>
+    <artifactId>mockito-core</artifactId>
+    <version>1.9.0</version>
+    <name>Mockito</name>
+    <url>http://www.mockito.org</url>
+    <description>Mock objects library for java</description>
+    <licenses>
+        <license>
+            <name>The MIT License</name>
+            <url>http://code.google.com/p/mockito/wiki/License</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>http://code.google.com/p/mockito/source/browse/</url>
+    </scm>
+    <developers>
+        <developer>
+            <id>szczepiq</id>
+            <name>Szczepan Faber</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>1.0</version>        
+        </dependency>
+    </dependencies>
+    
+</project>
diff -Nru mockito-1.9.0+ds1/debian/rules mockito-1.9.0+ds1/debian/rules
--- mockito-1.9.0+ds1/debian/rules      2012-03-19 15:53:49.000000000 -0700
+++ mockito-1.9.0+ds1/debian/rules      2012-04-10 15:15:35.000000000 -0700
@@ -16,19 +16,14 @@
        find javadoc/ -type f | xargs -r sed -i 
"s/org.mockito.cglib/net.sf.cglib/g"
 
 override_jh_build:
-       jh_build mockito-core-$(CURVER).jar org/
-
-override_dh_auto_install:
-       dh_auto_install
-       mh_installpoms -plibmockito-java
-       mh_installjar -plibmockito-java -l debian/pom.xml 
mockito-core-$(CURVER).jar
+       jh_build mockito-core.jar org/
 
 override_dh_auto_clean:
        dh_auto_clean
        find javadoc/ -type f | xargs -r sed -i 
"s/net.sf.cglib/org.mockito.cglib/g"
 
 %:
-       dh --with javahelper $@
+       dh --with javahelper -with jh_maven_repo_helper $@
 
 get-orig-source:
        uscan --verbose --force-download --destdir .



-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to