X Strike Force X.Org X11 SVN commit: r2759 - in branches/7.1/lib/libxi/debian: . patches
Author: dparsons
Date: 2006-08-09 13:03:00 -0400 (Wed, 09 Aug 2006)
New Revision: 2759
Removed:
branches/7.1/lib/libxi/debian/patches/01_manpage_location.diff
Modified:
branches/7.1/lib/libxi/debian/changelog
branches/7.1/lib/libxi/debian/control
branches/7.1/lib/libxi/debian/libxi-dev.install
branches/7.1/lib/libxi/debian/patches/series
branches/7.1/lib/libxi/debian/rules
Log:
Debian updates for uploading libxi-1.0.1 to experimental:
- remove patch 01_manpage_location.diff.
- libxi provides no header files, so don't try to install
usr/include/X11/*
- Exclude .la from dh_install.
Modified: branches/7.1/lib/libxi/debian/changelog
===================================================================
--- branches/7.1/lib/libxi/debian/changelog 2006-08-09 14:58:31 UTC (rev 2758)
+++ branches/7.1/lib/libxi/debian/changelog 2006-08-09 17:03:00 UTC (rev 2759)
@@ -1,3 +1,12 @@
+libxi (1:1.0.1-1) experimental; urgency=low
+
+ * New upstream version (X11R7.1).
+ - applies patch 01_manpage_location.diff.
+ * libxi provides no header files, so don't try to install usr/include/X11/*
+ * Exclude .la from dh_install.
+
+ -- Drew Parsons <dparsons@debian.org> Thu, 10 Aug 2006 03:00:53 +1000
+
libxi (1:1.0.0-6) UNRELEASED; urgency=low
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
Modified: branches/7.1/lib/libxi/debian/control
===================================================================
--- branches/7.1/lib/libxi/debian/control 2006-08-09 14:58:31 UTC (rev 2758)
+++ branches/7.1/lib/libxi/debian/control 2006-08-09 17:03:00 UTC (rev 2759)
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Drew Parsons <dparsons@debian.org>
Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev (>= 1:0.99.1-1), x11proto-input-dev, pkg-config, quilt
Standards-Version: 3.7.2
Modified: branches/7.1/lib/libxi/debian/libxi-dev.install
===================================================================
--- branches/7.1/lib/libxi/debian/libxi-dev.install 2006-08-09 14:58:31 UTC (rev 2758)
+++ branches/7.1/lib/libxi/debian/libxi-dev.install 2006-08-09 17:03:00 UTC (rev 2759)
@@ -1,4 +1,3 @@
-usr/include/X11/*
usr/lib/libXi.a
usr/lib/libXi.so
usr/lib/pkgconfig/xi.pc
Deleted: branches/7.1/lib/libxi/debian/patches/01_manpage_location.diff
===================================================================
--- branches/7.1/lib/libxi/debian/patches/01_manpage_location.diff 2006-08-09 14:58:31 UTC (rev 2758)
+++ branches/7.1/lib/libxi/debian/patches/01_manpage_location.diff 2006-08-09 17:03:00 UTC (rev 2759)
@@ -1,86 +0,0 @@
-Index: libXi-X11R7.0-1.0.0/ChangeLog
-===================================================================
---- libXi-X11R7.0-1.0.0.orig/ChangeLog 2005-12-30 14:50:54.000000000 -0500
-+++ libXi-X11R7.0-1.0.0/ChangeLog 2006-03-09 23:20:06.000000000 -0500
-@@ -1,3 +1,9 @@
-+2006-02-12 Alan Coopersmith <alan.coopersmith@sun.com>
-+
-+ * man/Makefile.am:
-+ Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628>
-+ Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
-+
- 2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
-Index: libXi-X11R7.0-1.0.0/man/Makefile.am
-===================================================================
---- libXi-X11R7.0-1.0.0.orig/man/Makefile.am 2005-12-30 14:50:54.000000000 -0500
-+++ libXi-X11R7.0-1.0.0/man/Makefile.am 2006-03-09 23:20:06.000000000 -0500
-@@ -27,6 +27,8 @@
-
- libmandir = $(LIB_MAN_DIR)
-
-+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-+
- libman_PRE = \
- XAllowDeviceEvents.man \
- XChangeDeviceDontPropagateList.man \
-@@ -136,44 +138,44 @@
- shadows.DONE:
- -rm -f $(all_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(XGetDeviceControl_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGetDeviceControl.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceControl.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGetFeedbackControl_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGetFeedbackControl.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetFeedbackControl.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGetDeviceKeyMapping_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGetDeviceKeyMapping.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceKeyMapping.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGetDeviceModifierMapping_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGetDeviceModifierMapping.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceModifierMapping.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XChangeDeviceDontPropagateList_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XChangeDeviceDontPropagateList.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XChangeDeviceDontPropagateList.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGetDeviceMotionEvents_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGetDeviceMotionEvents.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceMotionEvents.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGrabDeviceButton_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGrabDeviceButton.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabDeviceButton.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGrabDeviceKey_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGrabDeviceKey.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabDeviceKey.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGrabDevice_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGrabDevice.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabDevice.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XListInputDevices_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XListInputDevices.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XListInputDevices.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XOpenDevice_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XOpenDevice.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XOpenDevice.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetDeviceButtonMapping_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetDeviceButtonMapping.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetDeviceButtonMapping.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetDeviceFocus_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetDeviceFocus.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetDeviceFocus.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSelectExtensionEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSelectExtensionEvent.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSelectExtensionEvent.$(LIB_MAN_SUFFIX) > $$i; \
- done)
Modified: branches/7.1/lib/libxi/debian/patches/series
===================================================================
--- branches/7.1/lib/libxi/debian/patches/series 2006-08-09 14:58:31 UTC (rev 2758)
+++ branches/7.1/lib/libxi/debian/patches/series 2006-08-09 17:03:00 UTC (rev 2759)
@@ -1 +0,0 @@
-01_manpage_location.diff
Modified: branches/7.1/lib/libxi/debian/rules
===================================================================
--- branches/7.1/lib/libxi/debian/rules 2006-08-09 14:58:31 UTC (rev 2758)
+++ branches/7.1/lib/libxi/debian/rules 2006-08-09 17:03:00 UTC (rev 2759)
@@ -72,7 +72,7 @@
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=libXi.la
dh_installchangelogs
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
Reply to: