Author: dparsons
Date: 2006-10-13 09:51:49 -0400 (Fri, 13 Oct 2006)
New Revision: 3739
Added:
trunk/lib/libxss/debian/libxss-dev.manpages
Removed:
trunk/lib/libxss/debian/patches/01_manpage_location.diff
Modified:
trunk/lib/libxss/debian/changelog
trunk/lib/libxss/debian/compat
trunk/lib/libxss/debian/control
trunk/lib/libxss/debian/libxss-dev.install
trunk/lib/libxss/debian/patches/series
trunk/lib/libxss/debian/rules
Log:
* New upstream version (X11R7.1).
- applies patch 01_manpage_location.diff.
* Standards version 3.7.2.
* Use debhelper 5.
* libxss-dev does not install usr/include/X11/*
* Install man pages into libxss-dev.
* Use --list-missing with dh_install, exclude libXss.la.
Modified: trunk/lib/libxss/debian/changelog
===================================================================
--- trunk/lib/libxss/debian/changelog 2006-10-13 13:23:33 UTC (rev 3738)
+++ trunk/lib/libxss/debian/changelog 2006-10-13 13:51:49 UTC (rev 3739)
@@ -1,3 +1,15 @@
+libxss (1:1.1.0-1) unstable; urgency=low
+
+ * New upstream version (X11R7.1).
+ - applies patch 01_manpage_location.diff.
+ * Standards version 3.7.2.
+ * Use debhelper 5.
+ * libxss-dev does not install usr/include/X11/*
+ * Install man pages into libxss-dev.
+ * Use --list-missing with dh_install, exclude libXss.la.
+
+ -- Drew Parsons <[EMAIL PROTECTED]> Fri, 13 Oct 2006 23:40:57 +1000
+
libxss (1:1.0.1-4) unstable; urgency=low
* Reorder makeshlib command in rules file so that ldconfig is run
Modified: trunk/lib/libxss/debian/compat
===================================================================
--- trunk/lib/libxss/debian/compat 2006-10-13 13:23:33 UTC (rev 3738)
+++ trunk/lib/libxss/debian/compat 2006-10-13 13:51:49 UTC (rev 3739)
@@ -1 +1 @@
-4
+5
Modified: trunk/lib/libxss/debian/control
===================================================================
--- trunk/lib/libxss/debian/control 2006-10-13 13:23:33 UTC (rev 3738)
+++ trunk/lib/libxss/debian/control 2006-10-13 13:51:49 UTC (rev 3739)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev
(>= 1:0.99.1-1), x11proto-scrnsaver-dev, pkg-config, quilt
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 5), libx11-dev (>= 1:0.99.2-1), libxext-dev (>=
1:0.99.1-1), x11proto-scrnsaver-dev (>= 1.1.0.0-1), pkg-config, quilt
+Standards-Version: 3.7.2
Package: libxss1
Architecture: any
Modified: trunk/lib/libxss/debian/libxss-dev.install
===================================================================
--- trunk/lib/libxss/debian/libxss-dev.install 2006-10-13 13:23:33 UTC (rev
3738)
+++ trunk/lib/libxss/debian/libxss-dev.install 2006-10-13 13:51:49 UTC (rev
3739)
@@ -1,4 +1,3 @@
-usr/include/X11/*
usr/lib/libXss.a
usr/lib/libXss.so
usr/lib/pkgconfig/xscrnsaver.pc
Added: trunk/lib/libxss/debian/libxss-dev.manpages
===================================================================
--- trunk/lib/libxss/debian/libxss-dev.manpages (rev 0)
+++ trunk/lib/libxss/debian/libxss-dev.manpages 2006-10-13 13:51:49 UTC (rev
3739)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man3/*
Deleted: trunk/lib/libxss/debian/patches/01_manpage_location.diff
===================================================================
--- trunk/lib/libxss/debian/patches/01_manpage_location.diff 2006-10-13
13:23:33 UTC (rev 3738)
+++ trunk/lib/libxss/debian/patches/01_manpage_location.diff 2006-10-13
13:51:49 UTC (rev 3739)
@@ -1,34 +0,0 @@
-Index: libXScrnSaver-X11R7.0-1.0.1/ChangeLog
-===================================================================
---- libXScrnSaver-X11R7.0-1.0.1.orig/ChangeLog 2005-12-30 14:51:18.000000000
-0500
-+++ libXScrnSaver-X11R7.0-1.0.1/ChangeLog 2006-03-09 23:29:26.000000000
-0500
-@@ -1,3 +1,9 @@
-+2006-02-12 Alan Coopersmith <[EMAIL PROTECTED]>
-+
-+ * 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-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
-Index: libXScrnSaver-X11R7.0-1.0.1/man/Makefile.am
-===================================================================
---- libXScrnSaver-X11R7.0-1.0.1.orig/man/Makefile.am 2005-12-30
14:51:18.000000000 -0500
-+++ libXScrnSaver-X11R7.0-1.0.1/man/Makefile.am 2006-03-09
23:29:26.000000000 -0500
-@@ -27,6 +27,8 @@
-
- libmandir = $(LIB_MAN_DIR)
-
-+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-+
- libman_PRE = Xss.man
-
- BUILT_SOURCES = shadows.DONE
-@@ -71,5 +73,5 @@
- shadows.DONE:
- -rm -f $(Xss_shadows:[EMAIL PROTECTED]@)
- (for i in $(Xss_shadows:[EMAIL PROTECTED]@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/Xss.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/Xss.$(LIB_MAN_SUFFIX) > $$i; \
- done)
Modified: trunk/lib/libxss/debian/patches/series
===================================================================
--- trunk/lib/libxss/debian/patches/series 2006-10-13 13:23:33 UTC (rev
3738)
+++ trunk/lib/libxss/debian/patches/series 2006-10-13 13:51:49 UTC (rev
3739)
@@ -1 +0,0 @@
-01_manpage_location.diff
Modified: trunk/lib/libxss/debian/rules
===================================================================
--- trunk/lib/libxss/debian/rules 2006-10-13 13:23:33 UTC (rev 3738)
+++ trunk/lib/libxss/debian/rules 2006-10-13 13:51:49 UTC (rev 3739)
@@ -72,10 +72,11 @@
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=libXss.la
--exclude=usr/share/man/man3
+ dh_installman
dh_installchangelogs
dh_link
- dh_strip --dbg-package=$(PACKAGE)
+ dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
dh_makeshlibs
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
