r11729 - in /packages/unstable/java-access-bridge/debian: control links rules

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

Author: kartikm-guest
Date: Fri Jun 29 04:01:30 2007
New Revision: 11729

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11729
Log:
Added links file, moved dh_install to binary-indep, much better working way to get VERSION of package, moved LDFLAGS out of configure

Added:
    packages/unstable/java-access-bridge/debian/links
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=11729&op=diff
==============================================================================
--- packages/unstable/java-access-bridge/debian/control (original)
+++ packages/unstable/java-access-bridge/debian/control Fri Jun 29 04:01:30 2007
@@ -13,7 +13,7 @@
 
 Package: libgnomeaccessbridge-java
 Architecture: all
-Depends: 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

Added: packages/unstable/java-access-bridge/debian/links
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/java-access-bridge/debian/links?rev=11729&op=file
==============================================================================
--- packages/unstable/java-access-bridge/debian/links (added)
+++ packages/unstable/java-access-bridge/debian/links Fri Jun 29 04:01:30 2007
@@ -1,0 +1,1 @@
+${JARNAME}-${VERSION}.jar ${JARNAME}.jar

Modified: packages/unstable/java-access-bridge/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/java-access-bridge/debian/rules?rev=11729&op=diff
==============================================================================
--- packages/unstable/java-access-bridge/debian/rules (original)
+++ packages/unstable/java-access-bridge/debian/rules Fri Jun 29 04:01:30 2007
@@ -7,12 +7,13 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 JAVA_HOME      := /usr/lib/jvm/java-6-sun
-JAR            := $(JAVA_HOME)/bin/jar
 JARNAME        := gnome-java-bridge
-
-VERSION	:= dpkg-parsechangelog | grep "^Version: "| cut -b 10-15
+DEBVERSION     := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+VERSION        := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
 
 CFLAGS = -Wall -g
+LDFLAGS = -Wl,-z,defs
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -22,8 +23,10 @@
 
 config.status: configure
 	dh_testdir
-	./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
-		    --with-java-home=${JAVA_HOME} --prefix=/usr
+	./configure CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		    --build=$(DEB_BUILD_GNU_TYPE) \
+		    --with-java-home=${JAVA_HOME} \
+		    --prefix=/usr
 
 build: build-stamp
 build-stamp:  config.status
@@ -35,7 +38,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	$(MAKE) -i distclean
+	-$(MAKE) -i distclean
 
 	# cleanups
 	rm -f `find -name Makefile`
@@ -54,17 +57,16 @@
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	mv debian/tmp/usr/share/jar/gnome-java-bridge.jar \
-		$(CURDIR)/debian/tmp/usr/share/jar/${JARNAME}-${VERSION}.jar
-	dh_install debian/tmp/usr/share/jar/${JARNAME}-${VERSION}.jar \
-		usr/share/java
-	dh_install debian/tmp/usr/share/jar/JNav.jar usr/share/java
+	   debian/tmp/usr/share/jar/${JARNAME}-${VERSION}.jar
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
-	dh_link -i ${JARNAME}-${VERSION}.jar ${JARNAME}.jar
+	dh_install debian/tmp/usr/share/jar/${JARNAME}-${VERSION}.jar usr/share/java
+	dh_install debian/tmp/usr/share/jar/JNav.jar usr/share/java
+	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i