Author: twerner
Date: 2011-08-06 22:41:28 +0000 (Sat, 06 Aug 2011)
New Revision: 14012

Added:
   trunk/jmock/debian/libjmock-java.poms
   trunk/jmock/debian/source/
   trunk/jmock/debian/source/format
Modified:
   trunk/jmock/debian/changelog
   trunk/jmock/debian/control
   trunk/jmock/debian/rules
Log:
* Team upload
* Switch to source format 3.0.
* Remove Java runtime Depends.
* Some lintian fixes in debian/rules.
* Add missing file debian/libjmock-java.poms.

Modified: trunk/jmock/debian/changelog
===================================================================
--- trunk/jmock/debian/changelog        2011-08-06 19:09:22 UTC (rev 14011)
+++ trunk/jmock/debian/changelog        2011-08-06 22:41:28 UTC (rev 14012)
@@ -1,5 +1,7 @@
-jmock (1.0.1-5) UNRELEASED; urgency=low
+jmock (1.0.1-5) unstable; urgency=low
 
+  * Team upload
+
   [ Michael Koch ]
   * Removed Trygve from Uploaders (Closes: #514075).
   * Removed Wolfgang and added myself to Uploaders.
@@ -10,8 +12,14 @@
   * Include javadoc files in libjmock-java-doc. (Closes: #601213).
   * Add call to mh_clean in clean target.
 
- -- Miguel Landaeta <mig...@miguel.cc>  Sun, 24 Oct 2010 17:27:26 -0430
+  [ Torsten Werner ]
+  * Switch to source format 3.0.
+  * Remove Java runtime Depends.
+  * Some lintian fixes in debian/rules.
+  * Add missing file debian/libjmock-java.poms.
 
+ -- Torsten Werner <twer...@debian.org>  Sun, 07 Aug 2011 00:37:54 +0200
+
 jmock (1.0.1-4) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/jmock/debian/control
===================================================================
--- trunk/jmock/debian/control  2011-08-06 19:09:22 UTC (rev 14011)
+++ trunk/jmock/debian/control  2011-08-06 22:41:28 UTC (rev 14012)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Koch <konque...@gmx.de>
-Build-Depends: debhelper (>= 7), quilt, default-jdk
+Build-Depends: debhelper (>= 7), default-jdk
 Build-Depends-Indep: ant (>= 1.6.5), junit (>= 3.8.1), ant-optional, 
maven-repo-helper,
  libasm-java
 Standards-Version: 3.8.3
 
 Package: libjmock-java
 Architecture: all
-Depends: ${misc:Depends}, default-java-headless | java2-runtime-headless
+Depends: ${misc:Depends}
 Suggests: libjmock-java-doc, libasm-java
 Description: Java library for testing code with mock objects
  Mock objects help you design and test the interactions between the objects in

Added: trunk/jmock/debian/libjmock-java.poms
===================================================================
--- trunk/jmock/debian/libjmock-java.poms                               (rev 0)
+++ trunk/jmock/debian/libjmock-java.poms       2011-08-06 22:41:28 UTC (rev 
14012)
@@ -0,0 +1 @@
+debian/pom.xml

Modified: trunk/jmock/debian/rules
===================================================================
--- trunk/jmock/debian/rules    2011-08-06 19:09:22 UTC (rev 14011)
+++ trunk/jmock/debian/rules    2011-08-06 22:41:28 UTC (rev 14012)
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
 
 export LANG=C
 
@@ -18,23 +17,25 @@
 
 build: build-stamp
 
-build-stamp: debian/stamp-patched
+build-stamp:
        dh_testdir
        $(ANT) debian-build
        touch build-stamp
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
+       rm -f build-stamp configure-stamp install-stamp
        rm -rf build
        dh_clean
        mh_clean
 
-install: build
+install: install-stamp
+
+install-stamp: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep
        dh_installdirs
        $(ANT) debian-install
        mh_installpoms -plibjmock-java
@@ -44,29 +45,29 @@
 #      mkdir -p $(TEMPDIR)/usr/share/doc/libowanttasks-java
 #      install -m 644 output/lib/ow_util_ant_tasks.jar 
$(TEMPDIR)/usr/share/java
 #      mv output/docs/api $(TEMPDIR)/usr/share/doc/libowanttasks-java
+       touch install-stamp
 
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+       dh_testdir -i
+       dh_testroot -i
+       dh_installchangelogs  -i
+       dh_installdocs -i
+       dh_installexamples -i
+       dh_installman -i
+       dh_link -i
+       dh_strip -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_shlibdeps -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps                                                            
                                                                          
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
 binary: binary-indep binary-arch
 

Added: trunk/jmock/debian/source/format
===================================================================
--- trunk/jmock/debian/source/format                            (rev 0)
+++ trunk/jmock/debian/source/format    2011-08-06 22:41:28 UTC (rev 14012)
@@ -0,0 +1 @@
+3.0 (quilt)


_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to