debian/changelog |    6 ++++++
 debian/rules     |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 9b6ca70b382815524e3bb9311ee34ad20359c338
Author: Drew Parsons <[EMAIL PROTECTED]>
Date:   Mon Mar 19 17:08:49 2007 +1100

    Add exclude entries to dh_install.
    
    Separate dh_install runs are made in debian/rules for architecture
    dependent (-a) and independent (-i) packages.  Add some -X exclude
    entries to prevent dh_install --list-missing from complaining
    unnecessarily about files which are in fact installed.

diff --git a/debian/changelog b/debian/changelog
index b2991fb..f5b6899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.2.99.902-2) UNRELEASED; urgency=low
+
+  * Add exclude entries to dh_install in debian/rules.
+
+ -- Drew Parsons <[EMAIL PROTECTED]>  Mon, 19 Mar 2007 17:10:24 +1100
+
 xorg-server (2:1.2.99.902-1) experimental; urgency=low
 
   [ Drew Parsons ]
diff --git a/debian/rules b/debian/rules
index 852e9e6..128cdd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,7 +128,7 @@ binary-arch: build install
        
        dh_installdocs -a
        dh_installchangelogs -a
-       dh_install -a --sourcedir=debian/tmp --list-missing
+       dh_install -a --sourcedir=debian/tmp --list-missing 
-Xusr/share/man/man1/Xprt -Xusr/lib/X11/xserver 
-Xetc/X11/Xsession.d/92xprint-xpserverlist
        $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
        $(INSTALL) -m644 $(CURDIR)/debian/videoabiver \
                   
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/videoabiver
@@ -157,7 +157,7 @@ endif
 # Build architecture-independent files here (xprint-common)
 binary-indep: build install
        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
-       dh_install -i --sourcedir=debian/tmp --list-missing
+       dh_install -i --sourcedir=debian/tmp --list-missing -Xusr/share/man 
-Xusr/include/xorg -Xusr/share/aclocal -Xusr/lib/xorg/modules 
-Xusr/lib/pkgconfig/xorg-server.pc -Xusr/bin -XSecurityPolicy -Xvar/lib/xkb 
-Xusr/lib/X11/Cards -Xusr/lib/X11/Options
        
        $(INSTALL) -m 644 $(CURDIR)/debian/xprint-common-overrides 
$(CURDIR)/debian/xprint-common/usr/share/lintian/overrides/xprint-common
        # split Xprint config files so font files do not land in /etc


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to