[Pkg-utopia-commits] r1625 - in /packages/unstable/dbus-java/debian: changelog rules

[mjj29-guest at users.alioth.debian.org]

Author: mjj29-guest
Date: Thu Jul 26 15:33:40 2007
New Revision: 1625

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1625
Log:
tidy up rules

Modified:
    packages/unstable/dbus-java/debian/changelog
    packages/unstable/dbus-java/debian/rules

Modified: packages/unstable/dbus-java/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/changelog?rev=1625&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/changelog (original)
+++ packages/unstable/dbus-java/debian/changelog Thu Jul 26 15:33:40 2007
@@ -2,8 +2,10 @@
 
   * Upstream bug fix release
   * Clean up control, add misc:Depends entries
+  * Wrap long lines in rules and control
+  * Don't ignore make clean errors
 
- -- Matthew Johnson <debian at matthew.ath.cx>  Thu, 26 Jul 2007 12:14:35 +0100
+ -- Matthew Johnson <debian at matthew.ath.cx>  Thu, 26 Jul 2007 16:32:38 +0100
 
 dbus-java (2.3-1) unstable; urgency=low
 

Modified: packages/unstable/dbus-java/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/rules?rev=1625&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/rules (original)
+++ packages/unstable/dbus-java/debian/rules Thu Jul 26 15:33:40 2007
@@ -9,9 +9,17 @@
 	dh_testdir
 	
 	# Add here commands to compile the package.
-	$(MAKE) DEBUG=disable JCFLAGS=-O PREFIX=/usr JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun/ JAVAC=/usr/lib/jvm/java-1.5.0-sun/bin/javac JAVA=/usr/lib/jvm/java-1.5.0-sun/bin/java JAR=/usr/lib/jvm/java-1.5.0-sun/bin/jar JAVADOC="/usr/lib/jvm/java-1.5.0-sun/bin/javadoc -link /usr/share/doc/classpath-doc/api" all
+	$(MAKE) DEBUG=disable \
+			  JCFLAGS=-O \
+			  PREFIX=/usr \
+			  JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun/ \
+			  JAVAC=/usr/lib/jvm/java-1.5.0-sun/bin/javac \
+			  JAVA=/usr/lib/jvm/java-1.5.0-sun/bin/java \
+			  JAR=/usr/lib/jvm/java-1.5.0-sun/bin/jar \
+			  JAVADOC="/usr/lib/jvm/java-1.5.0-sun/bin/javadoc -link /usr/share/doc/classpath-doc/api" \
+			  all
 	
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
@@ -19,7 +27,7 @@
 	rm -f build-stamp
 	
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 	
 	rm -rf debian/tmp
 	dh_clean
@@ -29,9 +37,14 @@
 	dh_testroot
 	dh_clean -k 
 	
-	$(MAKE) DEBUG=disable DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr install install-man install-doc
+	$(MAKE) DEBUG=disable \
+			  DESTDIR=$(CURDIR)/debian/tmp \
+			  PREFIX=/usr \
+			  install install-man install-doc
 	# These are installed by upstream and aren't needed on Debian
-	rm -f $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/COPYING $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/AUTHORS $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/INSTALL
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/COPYING \
+		   $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/AUTHORS \
+			$(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/INSTALL
 	
 # Build architecture-independent files here.
 binary-indep: build install