X Strike Force X.Org X11 SVN commit: r2655 - in branches/7.1/lib/libxevie/debian: . patches
Author: dparsons
Date: 2006-08-06 06:54:38 -0400 (Sun, 06 Aug 2006)
New Revision: 2655
Added:
branches/7.1/lib/libxevie/debian/libxevie-dev.manpages
Removed:
branches/7.1/lib/libxevie/debian/patches/01_manpage_location.diff
Modified:
branches/7.1/lib/libxevie/debian/changelog
branches/7.1/lib/libxevie/debian/patches/series
branches/7.1/lib/libxevie/debian/rules
Log:
Remove patch (applied upstream) and ensure man pages get installed.
Modified: branches/7.1/lib/libxevie/debian/changelog
===================================================================
--- branches/7.1/lib/libxevie/debian/changelog 2006-08-06 10:34:29 UTC (rev 2654)
+++ branches/7.1/lib/libxevie/debian/changelog 2006-08-06 10:54:38 UTC (rev 2655)
@@ -1,8 +1,10 @@
libxevie (1:1.0.1-1) experimental; urgency=low
- * New upstream release (X11R7.1).
+ * New upstream release (X11R7.1)
+ - patch 01_manpage_location.diff applied upstream
+ * Man pages installed using dh_installman. Closes: #377196.
- -- Drew Parsons <dparsons@debian.org> Sun, 6 Aug 2006 20:29:59 +1000
+ -- Drew Parsons <dparsons@debian.org> Sun, 6 Aug 2006 20:45:58 +1000
libxevie (1:1.0.0-5) UNRELEASED; urgency=low
Added: branches/7.1/lib/libxevie/debian/libxevie-dev.manpages
===================================================================
--- branches/7.1/lib/libxevie/debian/libxevie-dev.manpages 2006-08-06 10:34:29 UTC (rev 2654)
+++ branches/7.1/lib/libxevie/debian/libxevie-dev.manpages 2006-08-06 10:54:38 UTC (rev 2655)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man3/*
Deleted: branches/7.1/lib/libxevie/debian/patches/01_manpage_location.diff
===================================================================
--- branches/7.1/lib/libxevie/debian/patches/01_manpage_location.diff 2006-08-06 10:34:29 UTC (rev 2654)
+++ branches/7.1/lib/libxevie/debian/patches/01_manpage_location.diff 2006-08-06 10:54:38 UTC (rev 2655)
@@ -1,34 +0,0 @@
-Index: libXevie-X11R7.0-1.0.0/man/Makefile.am
-===================================================================
---- libXevie-X11R7.0-1.0.0.orig/man/Makefile.am 2006-03-09 22:36:49.000000000 -0500
-+++ libXevie-X11R7.0-1.0.0/man/Makefile.am 2006-03-09 22:37:41.000000000 -0500
-@@ -27,6 +27,8 @@
-
- libmandir = $(LIB_MAN_DIR)
-
-+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-+
- libman_PRE = Xevie.man
-
- libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-@@ -67,5 +69,5 @@
- shadows.DONE:
- -rm -f $(Xevie_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xevie_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/Xevie.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/Xevie.$(LIB_MAN_SUFFIX) > $$i; \
- done)
-Index: libXevie-X11R7.0-1.0.0/ChangeLog
-===================================================================
---- libXevie-X11R7.0-1.0.0.orig/ChangeLog 2006-03-09 22:35:33.000000000 -0500
-+++ libXevie-X11R7.0-1.0.0/ChangeLog 2006-03-09 22:38:00.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:
Modified: branches/7.1/lib/libxevie/debian/patches/series
===================================================================
--- branches/7.1/lib/libxevie/debian/patches/series 2006-08-06 10:34:29 UTC (rev 2654)
+++ branches/7.1/lib/libxevie/debian/patches/series 2006-08-06 10:54:38 UTC (rev 2655)
@@ -1 +1 @@
-01_manpage_location.diff
+
Modified: branches/7.1/lib/libxevie/debian/rules
===================================================================
--- branches/7.1/lib/libxevie/debian/rules 2006-08-06 10:34:29 UTC (rev 2654)
+++ branches/7.1/lib/libxevie/debian/rules 2006-08-06 10:54:38 UTC (rev 2655)
@@ -72,7 +72,8 @@
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=usr/share/man/man3 --exclude=libXevie.la
+ dh_installman
dh_installchangelogs
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
Reply to: