r11675 - in /packages/unstable/java-access-bridge/debian: control control.in rules

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

Author: kartikm-guest
Date: Mon Jun 25 09:21:53 2007
New Revision: 11675

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11675
Log:
Added contol.in, fixed typo, removed dependency on java5, rules in better now -- thanks to lool

Added:
    packages/unstable/java-access-bridge/debian/control.in
      - copied, changed from r11674, packages/unstable/java-access-bridge/debian/control
Modified:
    packages/unstable/java-access-bridge/debian/control
    packages/unstable/java-access-bridge/debian/rules

Modified: packages/unstable/java-access-bridge/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/java-access-bridge/debian/control?rev=11675&op=diff
==============================================================================
--- packages/unstable/java-access-bridge/debian/control (original)
+++ packages/unstable/java-access-bridge/debian/control Mon Jun 25 09:21:53 2007
@@ -6,13 +6,13 @@
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: autotools-dev,
                      pkg-config (>= 0.9.0),
-		     sun-java5-jdk | sun-java6-jdk,
+		     sun-java6-jdk,
 		     xbase-clients
 Standards-Version: 3.7.2
 
 Package: libgnomeaccessbridge-java
 Architecture: all
-Depends: sun-java5-jdki | sun-java6-jdk | sun-java5-jre | sun-java6-jre
+Depends: sun-java6-jre
 Description: Java Access Bridge for GNOME
  This package contains the java access bridge for GNOME, which connects the
  built-in accessibility support in Java Swing apps to the GNOME Accessibility

Copied: packages/unstable/java-access-bridge/debian/control.in (from r11674, packages/unstable/java-access-bridge/debian/control)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/java-access-bridge/debian/control.in?rev=11675&op=diff
==============================================================================
--- packages/unstable/java-access-bridge/debian/control (original)
+++ packages/unstable/java-access-bridge/debian/control.in Mon Jun 25 09:21:53 2007
@@ -2,17 +2,17 @@
 Section: contrib/gnome
 Priority: optional
 Maintainer: Kartik Mistry <kartik.mistry at gmail.com>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: autotools-dev,
                      pkg-config (>= 0.9.0),
-		     sun-java5-jdk | sun-java6-jdk,
+		     sun-java6-jdk | sun-java5-jdk,
 		     xbase-clients
 Standards-Version: 3.7.2
 
 Package: libgnomeaccessbridge-java
 Architecture: all
-Depends: sun-java5-jdki | sun-java6-jdk | sun-java5-jre | sun-java6-jre
+Depends: sun-java6-jre | sun-java5-jre
 Description: Java Access Bridge for GNOME
  This package contains the java access bridge for GNOME, which connects the
  built-in accessibility support in Java Swing apps to the GNOME Accessibility

Modified: packages/unstable/java-access-bridge/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/java-access-bridge/debian/rules?rev=11675&op=diff
==============================================================================
--- packages/unstable/java-access-bridge/debian/rules (original)
+++ packages/unstable/java-access-bridge/debian/rules Mon Jun 25 09:21:53 2007
@@ -3,12 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-JAVA_HOME      := /usr/lib/jvm/java-6-sun-1.6.0.00
+JAVA_HOME      := /usr/lib/jvm/java-6-sun
 JRE_HOME       := $(JAVA_HOME)/jre
-JAR             = $(JAVA_HOME)/bin/jar
-JARNAME         = gnome-java-bridge
+JAR            := $(JAVA_HOME)/bin/jar
+JARNAME        := gnome-java-bridge
 
-VERSION	= $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+VERSION	:= $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -23,8 +23,10 @@
 
 config.status: configure
 	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=/usr CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
+	./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
+	--host=$(DEB_HOST_GNU_TYPE) \
+	--build=$(DEB_BUILD_GNU_TYPE) \
+	--prefix=/usr \
 	--with-java-home=${JAVA_HOME}
 
 build: build-stamp
@@ -62,15 +64,15 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 binary-arch: build install