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

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

Author: kartikm-guest
Date: Wed Jun 27 11:37:01 2007
New Revision: 11702

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11702
Log:
Added build dependency on gnome-pkg-tools, Better way to get VERSION of upstream package, use dh_install and dh_link, use upstream make install, better clean rule

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=11702&op=diff
==============================================================================
--- packages/unstable/java-access-bridge/debian/control (original)
+++ packages/unstable/java-access-bridge/debian/control Wed Jun 27 11:37:01 2007
@@ -5,6 +5,7 @@
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: autotools-dev,
+                     gnome-pkg-tools (>= 0.10),
                      pkg-config (>= 0.9.0),
                      sun-java6-jdk,
                      xbase-clients

Modified: packages/unstable/java-access-bridge/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/java-access-bridge/debian/rules?rev=11702&op=diff
==============================================================================
--- packages/unstable/java-access-bridge/debian/rules (original)
+++ packages/unstable/java-access-bridge/debian/rules Wed Jun 27 11:37:01 2007
@@ -3,17 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 JAVA_HOME      := /usr/lib/jvm/java-6-sun
-JRE_HOME       := $(JAVA_HOME)/jre
 JAR            := $(JAVA_HOME)/bin/jar
 JARNAME        := gnome-java-bridge
 
-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)
+VERSION	:= dpkg-parsechangelog | grep "^Version: "| cut -b 10-15
 
 CFLAGS = -Wall -g
 
@@ -26,10 +23,7 @@
 config.status: configure
 	dh_testdir
 	./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
-	--host=$(DEB_HOST_GNU_TYPE) \
-	--build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=/usr \
-	--with-java-home=${JAVA_HOME}
+		    --with-java-home=${JAVA_HOME} --prefix=/usr
 
 build: build-stamp
 build-stamp:  config.status
@@ -37,11 +31,11 @@
 	$(MAKE)
 	touch $@
 
-clean:
+clean::
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) distclean
+	$(MAKE) -i distclean
 
 	# cleanups
 	rm -f `find -name Makefile`
@@ -58,19 +52,19 @@
 	dh_clean -k
 	dh_installdirs
 
-	install -D -m 0644 ${JARNAME}.jar \
-			debian/libgnomeaccessbridge-java/usr/share/java/${JARNAME}-${VERSION}.jar
-	install -D -m 0644 JNav.jar debian/libgnomeaccessbridge-java/usr/share/java/JNav.jar
-
-	ln -s ${JARNAME}-${VERSION}.jar \
-			debian/libgnomeaccessbridge-java/usr/share/java/${JARNAME}.jar
+	$(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
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
-	dh_link -i
+	dh_link -i ${JARNAME}-${VERSION}.jar ${JARNAME}.jar
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -81,4 +75,4 @@
 binary-arch: build install
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install configure