[pkg-java] r11626 - trunk/httpunit/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2010-02-18 19:14:53 +0000 (Thu, 18 Feb 2010)
New Revision: 11626

Added:
   trunk/httpunit/debian/libhttpunit-java.jlibs
Modified:
   trunk/httpunit/debian/changelog
   trunk/httpunit/debian/control
   trunk/httpunit/debian/copyright
   trunk/httpunit/debian/libhttpunit-java.install
   trunk/httpunit/debian/rules
Log:
* Now depends and build-depends on default JRE and JDK.
* Enabled javahelper.
* Updated debian/copyright.


Modified: trunk/httpunit/debian/changelog
===================================================================
--- trunk/httpunit/debian/changelog	2010-02-18 18:23:53 UTC (rev 11625)
+++ trunk/httpunit/debian/changelog	2010-02-18 19:14:53 UTC (rev 11626)
@@ -1,12 +1,17 @@
 httpunit (1.7+dfsg-3) unstable; urgency=low
 
-  * Added Maven support
-  * Standards-Version to 3.8.4
-  * Source format 3.0, removed dpatch dependency
-  * dh compat to 7
+  [ Gabriele Giacone ]
+  * Added Maven support.
+  * Bumped Standards-Version to 3.8.4. No changes neeeded.
+  * Changed source format to 3.0, removed dpatch dependency.
+  * Replaced cdbs with debhelper, and bumped compat level to 7.
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Thu, 18 Feb 2010 00:02:40 +0100
+  [ Miguel Landaeta ]
+  * Updated to Depend and Build-Depend on default JRE and JDK, and use
+    javahelper.
 
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 18 Feb 2010 12:38:26 -0430
+
 httpunit (1.7+dfsg-2) unstable; urgency=low
 
   [ Miguel Landaeta ]

Modified: trunk/httpunit/debian/control
===================================================================
--- trunk/httpunit/debian/control	2010-02-18 18:23:53 UTC (rev 11625)
+++ trunk/httpunit/debian/control	2010-02-18 19:14:53 UTC (rev 11626)
@@ -3,7 +3,7 @@
 Uploaders: Miguel Landaeta <miguel at miguel.cc>, Michael Koch <konqueror at gmx.de>
 Section: libs
 Priority: optional
-Build-Depends: openjdk-6-jdk (>= 6b11-9.1), ant (>= 1.7.0-6), cdbs (>= 0.4.52),
+Build-Depends: default-jdk, ant (>= 1.7.0-6), javahelper (>= 0.28),
  debhelper (>= 7.0.50~), rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2),
  libgnujaf-java (>= 1.1.1-4), junit (>= 3.8.2), libgnumail-java (>= 1.1.2-2),
  libservlet2.4-java (>= 5.0.30-8), libxerces2-java (>= 2.9.1-2),
@@ -17,7 +17,8 @@
 Architecture: all
 Section: java
 Priority: optional
-Depends: openjdk-6-jdk (>= 6b11-9.1) | java2-runtime,
+Depends: default-jre-headless | java6-runtime-headless |
+         java5-runtime-headless | java2-runtime-headless | java2-runtime,
          libxerces2-java (>= 2.9.1-2), libnekohtml-java (>= 0.9.5+dfsg-1.1),
          rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2), ${misc:Depends}
 Recommends: junit (>= 3.8.2)

Modified: trunk/httpunit/debian/copyright
===================================================================
--- trunk/httpunit/debian/copyright	2010-02-18 18:23:53 UTC (rev 11625)
+++ trunk/httpunit/debian/copyright	2010-02-18 19:14:53 UTC (rev 11626)
@@ -46,7 +46,8 @@
  SOFTWARE. 
 
 Files: debian/*
-Copyright: Copyright 2009, Miguel Landaeta <miguel at miguel.cc>
+Copyright: © 2009-2010, Miguel Landaeta <miguel at miguel.cc>,
+           © 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
 License: GPL-2+
  On Debian systems the full text of the GNU General Public License can be
  found in the `/usr/share/common-licenses/GPL-2' file.

Modified: trunk/httpunit/debian/libhttpunit-java.install
===================================================================
--- trunk/httpunit/debian/libhttpunit-java.install	2010-02-18 18:23:53 UTC (rev 11625)
+++ trunk/httpunit/debian/libhttpunit-java.install	2010-02-18 19:14:53 UTC (rev 11626)
@@ -1,2 +1 @@
-lib/httpunit.jar		usr/share/java
 debian/README.Debian-source	usr/share/doc/libhttpunit-java

Added: trunk/httpunit/debian/libhttpunit-java.jlibs
===================================================================
--- trunk/httpunit/debian/libhttpunit-java.jlibs	                        (rev 0)
+++ trunk/httpunit/debian/libhttpunit-java.jlibs	2010-02-18 19:14:53 UTC (rev 11626)
@@ -0,0 +1 @@
+lib/httpunit.jar

Modified: trunk/httpunit/debian/rules
===================================================================
--- trunk/httpunit/debian/rules	2010-02-18 18:23:53 UTC (rev 11625)
+++ trunk/httpunit/debian/rules	2010-02-18 19:14:53 UTC (rev 11626)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with javahelper $@
 
 override_dh_auto_clean:
 	ant total-clean