Merge lp:~logan/ubuntu/raring/dbus-java/debian-merge into lp:ubuntu/raring/dbus-java

[Logan Rosen]

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-10-24 00:40:25 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-10-24 00:40:25 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2012-10-24 00:40:25 +0000
@@ -0,0 +1,1 @@
+2

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-18 08:49:02 +0000
+++ debian/changelog	2012-10-24 00:40:25 +0000
@@ -1,3 +1,26 @@
+dbus-java (2.8-4ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable (LP: #1019178). Remaining changes:
+    - debian/rules: Use relative paths for the .jar dependencies.
+
+ -- Logan Rosen <[e-mail]>  Tue, 23 Oct 2012 20:33:28 -0400
+
+dbus-java (2.8-4) unstable; urgency=low
+
+  * Team upload.
+  * Correct maintainer mail address.  (Closes: #679031)
+
+ -- Niels Thykier <[e-mail]>  Sat, 30 Jun 2012 18:47:52 +0200
+
+dbus-java (2.8-3) unstable; urgency=low
+
+  * Team upload.
+  * Bump build dependency on javahelper to allow OpenJDK-7 as
+    alternative to OpenJDK-6.
+  * Remove stamp file in clean rule.
+
+ -- Niels Thykier <[e-mail]>  Tue, 19 Jun 2012 12:00:13 +0200
+
 dbus-java (2.8-2ubuntu1) precise; urgency=low
 
   * Merge from Debian testing. (LP: #905665) Remaining changes:

=== modified file 'debian/control'
--- debian/control	2011-12-18 08:49:02 +0000
+++ debian/control	2012-10-24 00:40:25 +0000
@@ -2,7 +2,7 @@
 Section: java
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Debian Java Maintainer <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainer <[e-mail]>
 Uploaders: Matthew Johnson <[e-mail]>
 Build-Depends: default-jdk,
                debhelper (>= 7.0.50~),
@@ -16,7 +16,7 @@
                texlive-latex-recommended,
                default-jdk-doc,
                gettext,
-               javahelper (>= 0.23)
+               javahelper (>= 0.42)
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/pkg-java/dbus-java.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/dbus-java.git

=== modified file 'debian/rules'
--- debian/rules	2011-12-18 08:49:02 +0000
+++ debian/rules	2012-10-24 00:40:25 +0000
@@ -21,19 +21,19 @@
 			  JAR=${JAVA_HOME}/bin/jar \
 			  JAVADOC="${JAVA_HOME}/bin/javadoc -link /usr/share/doc/default-jdk-doc/api" \
 			  all doc check 
-	
 	touch $@
 
 override_dh_auto_clean:
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
+	rm -f override_dh_auto_build
 
 override_dh_auto_install:
 	$(MAKE) DEBUG=disable \
 			  DESTDIR=$(CURDIR)/debian/tmp \
 			  PREFIX=/usr \
 			  install install-man install-doc
-	
+
 override_dh_install:
 	dh_install -i --sourcedir=debian/tmp
 override_jh_manifest: