tags 598619 + patch
tags 598619 + pending
thanks

Dear maintainer,

Here's my second attempt.  This certainly has been an educational
experience. :)

I have uploaded it to DELAYED/2 again.

Tim

diff -Nru x11vnc-0.9.10/debian/changelog x11vnc-0.9.10/debian/changelog
--- x11vnc-0.9.10/debian/changelog      2010-06-14 11:28:54.000000000 +0100
+++ x11vnc-0.9.10/debian/changelog      2010-10-19 00:02:12.000000000 +0100
@@ -1,3 +1,12 @@
+x11vnc (0.9.10-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: B-D-I on openjdk-6-jdk rather than B-D on default-jdk.
+  * debian/rules: Only rebuild jars in binary and binary-indep targets.
+    (Closes: #598619)
+
+ -- Tim Retout <dioc...@debian.org>  Mon, 18 Oct 2010 23:53:56 +0100
+
 x11vnc (0.9.10-1) unstable; urgency=low
 
   * New upstream release:
diff -Nru x11vnc-0.9.10/debian/control x11vnc-0.9.10/debian/control
--- x11vnc-0.9.10/debian/control        2010-06-14 10:36:06.000000000 +0100
+++ x11vnc-0.9.10/debian/control        2010-10-19 00:02:17.000000000 +0100
@@ -2,10 +2,11 @@
 Section: x11
 Priority: optional
 Maintainer: Fathi Boudra <f...@debian.org>
-Build-Depends: debhelper (>= 7.4.15), chrpath, automake, libtool, default-jdk,
+Build-Depends: debhelper (>= 7.4.15), chrpath, automake, libtool,
  libavahi-client-dev, libssl-dev, libvncserver-dev (>= 0.9.7),
  libxdamage-dev, libxext-dev, libxfixes-dev, libxinerama-dev, libxrandr-dev,
  libxss-dev, libxtst-dev
+Build-Depends-Indep: openjdk-6-jdk
 Standards-Version: 3.8.4
 Homepage: http://www.karlrunge.com/x11vnc/
 
diff -Nru x11vnc-0.9.10/debian/rules x11vnc-0.9.10/debian/rules
--- x11vnc-0.9.10/debian/rules  2010-06-14 11:21:04.000000000 +0100
+++ x11vnc-0.9.10/debian/rules  2010-10-19 00:02:07.000000000 +0100
@@ -3,19 +3,23 @@
 %:
        dh $@ --parallel --list-missing
 
+binary binary-indep:
+       dh $@ --parallel --list-missing --until dh_auto_install
+       $(MAKE) -C classes/ssl/src update_jars
+       $(MAKE) -C classes/ssl/src clean
+       dh_auto_install -- -C classes
+       dh $@ --parallel --list-missing --remaining
+
 override_dh_auto_configure:
        aclocal
        autoheader
        automake --add-missing --copy
        autoconf
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq ($(DEB_HOST_ARCH),hppa)
-       $(MAKE) -C classes/ssl/src update_jars
-       $(MAKE) -C classes/ssl/src clean
-  endif
-endif
        dh_auto_configure -- --with-system-libvncserver
 
+override_dh_auto_build:
+       dh_auto_build -- -C x11vnc
+
 override_dh_auto_clean:
        dh_auto_clean
        rm -rf autom4te.cache
@@ -23,14 +27,10 @@
                depcomp install-sh missing \
                rfbconfig.h.in rfb/rfbconfig.h rfb/rfbint.h
        find . -type f -name Makefile.in -delete
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq ($(DEB_HOST_ARCH),hppa)
        find . -type f -name '*.jar' -delete
-  endif
-endif
 
 override_dh_auto_install:
-       dh_auto_install
+       dh_auto_install -- -C x11vnc
        find debian -type f -name 'x11vnc' | xargs chrpath -d
 
 .PHONY: override_dh_auto_test



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to