libxss: Changes to 'debian-unstable'
.gitignore | 74 +++++++++++---
ChangeLog | 190 ++++++++++++++++++++++++++++++++++++
Makefile.am | 10 +
configure.ac | 23 +---
debian/changelog | 11 +-
debian/control | 4
debian/rules | 2
include/X11/extensions/scrnsaver.h | 1
man/Makefile.am | 102 +++++++------------
man/XScreenSaverAllocInfo.man | 1
man/XScreenSaverGetRegistered.man | 1
man/XScreenSaverQueryExtension.man | 1
man/XScreenSaverQueryInfo.man | 1
man/XScreenSaverQueryVersion.man | 1
man/XScreenSaverRegister.man | 1
man/XScreenSaverSelectInput.man | 1
man/XScreenSaverSetAttributes.man | 1
man/XScreenSaverSuspend.man | 1
man/XScreenSaverUnregister.man | 1
man/XScreenSaverUnsetAttributes.man | 1
man/Xss.man | 3
src/Makefile.am | 3
src/XScrnSaver.c | 4
23 files changed, 331 insertions(+), 107 deletions(-)
New commits:
commit 1da9ec0466518d07223c15321a54ae98c3aad3df
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 00:52:59 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 2ab5ee6..b47e163 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxss (1:1.2.1-1) UNRELEASED; urgency=low
+libxss (1:1.2.1-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -11,7 +11,7 @@ libxss (1:1.2.1-1) UNRELEASED; urgency=low
* Switch from --list-missing to --fail-missing for additional safety.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 00:48:00 +0100
+ -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 00:52:53 +0100
libxss (1:1.2.0-2) unstable; urgency=low
commit 94bc753183173f96401c934b4deba0debdd83018
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 00:52:32 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index eeaca12..2ab5ee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libxss (1:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for new macros.
* Switch from --list-missing to --fail-missing for additional safety.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 00:48:00 +0100
diff --git a/debian/control b/debian/control
index f840c69..f48edc6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxss
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5),
libx11-dev (>= 1:0.99.2),
commit 1c35b9322b7ea28b10a85d9b0e3a50e1e388874d
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 00:51:10 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index 73e48dd..eeaca12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxss (1:1.2.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
* Bump xutils-dev build-dep for new macros.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 00:48:00 +0100
diff --git a/debian/rules b/debian/rules
index 82188e5..d168ad5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing --exclude=libXss.la --exclude=usr/share/man/man3
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXss.la --exclude=usr/share/man/man3
dh_installman
dh_installchangelogs ChangeLog
dh_link
commit d67192a4b21a660e001f3af65b9cd73d22461d31
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 00:49:44 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index be8033e..73e48dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxss (1:1.2.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 00:48:00 +0100
diff --git a/debian/control b/debian/control
index a9ff3b9..f840c69 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxss
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxss.git
commit d6cba89804c5448b23070211044ea597b220b618
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 00:48:10 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index b241a72..0c09d4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,193 @@
+commit aa25c745b032608c9cdc8006ed351d8ef435bf18
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 29 22:20:54 2010 -0700
+
+ libXScrnSaver 1.2.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f8b5e67d5b9fe5f6d8ff75561d66ac6a4bc16df2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 29 22:18:40 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3ef4f63bf542411aa01e62ef5e8c8120afe255be
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:30:02 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 25c4abc730f7d2407c33fcd5c48a6a82c541c921
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Aug 17 09:00:28 2010 -0400
+
+ man: store shadow man pages in git rather than generating them
+
+ Simplify the build process and the makefile.
+
+ Local fix in CVS for bug 5628 is not required
+ as the problem has been fixed in
+ util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1fb51a78ae5a063aa384b0b6b6fb7b11e972fcfa
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 8 15:04:20 2010 -0700
+
+ Use make rules instead of shell for loops to generate shadow man pages
+
+ Allows parallel make and simpler build logs/error reporting
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2f5b75f49528c4bf57100b5d8fb83788013f7da9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 8 15:01:36 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d1a4b97476efc64d9c47202b877c72c8b0fed14d
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:04:31 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bd46f8e115caeb4f48af64fc235d2b317f01b41f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 16:50:33 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d665b35a9b33b7b0a80b557115240ff5514bd8cf
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 14:53:48 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 00e9520738c8660451cdf21e5a3b530924855822
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Feb 16 10:37:21 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0b90e128718f269be334b9e60aa5b50604b1dc8c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 14 21:09:04 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 2f58888d29d779cb84072d1895934dfcee683f4c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Nov 27 20:56:03 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 27972a511fb73bad74dd0309487af050a6a99c42
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit fe1b6951a8e6ac4006b4f488121746cf71e4771d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 27 15:07:26 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 7c8ac21a9485beab00560764d16e41a4c26cfc02
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:42 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit b0b29818e4893fcf97a67fab58640740f285ad25
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:19 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit b27442666e132a521c5ce8c2aaa8de97abfa54b1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Oct 21 12:47:23 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
commit aa162e709338904604b3f945999956044bcbc7cb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 18:47:04 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 58edcd5..be8033e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libxss (1:1.2.0-3) UNRELEASED; urgency=low
+libxss (1:1.2.1-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:43 +0000
+ [ Cyril Brulebois ]
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 00:48:00 +0100
libxss (1:1.2.0-2) unstable; urgency=low
commit baa858adcdf8f6b1e567a5fd3e85b9f627e3ec6e
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 00:47:32 2010 +0100
Remove empty series file.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
commit aa25c745b032608c9cdc8006ed351d8ef435bf18
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 22:20:54 2010 -0700
libXScrnSaver 1.2.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 0e3e5e1..b426a02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,9 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(libXScrnSaver, 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
+AC_INIT([libXScrnSaver], [1.2.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXScrnSaver])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit f8b5e67d5b9fe5f6d8ff75561d66ac6a4bc16df2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 22:18:40 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 8bdb115..e711937 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-#
+#
libmandir = $(LIB_MAN_DIR)
commit 3ef4f63bf542411aa01e62ef5e8c8120afe255be
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:02 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/extensions/scrnsaver.h b/include/X11/extensions/scrnsaver.h
index 72f92b8..654aef6 100644
--- a/include/X11/extensions/scrnsaver.h
+++ b/include/X11/extensions/scrnsaver.h
@@ -25,7 +25,6 @@ in this Software without prior written authorization from the X Consortium.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86$ */
#ifndef _SCRNSAVER_H_
#define _SCRNSAVER_H_
diff --git a/man/Xss.man b/man/Xss.man
index 7b65d96..c9b091d 100644
--- a/man/Xss.man
+++ b/man/Xss.man
@@ -1,7 +1,4 @@
.\"
-.\" $XFree86: xc/lib/Xss/Xss.man,v 1.1 2003/10/26 19:00:24 herrb Exp $
-.\" $XdotOrg: lib/XScrnSaver/man/Xss.man,v 1.2 2004/04/23 18:43:51 eich Exp $
-.\"
.\" Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c
index d496b94..c19dc0a 100644
--- a/src/XScrnSaver.c
+++ b/src/XScrnSaver.c
@@ -1,5 +1,4 @@
/*
- * $XConsortium: XScrnSaver.c,v 1.5 94/04/17 20:59:35 rws Exp $
*
Copyright (c) 1992 X Consortium
@@ -26,7 +25,6 @@ in this Software without prior written authorization from the X Consortium.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.1 2001/10/28 03:32:40 tsi Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
commit 25c4abc730f7d2407c33fcd5c48a6a82c541c921
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Aug 17 09:00:28 2010 -0400
man: store shadow man pages in git rather than generating them
Simplify the build process and the makefile.
Local fix in CVS for bug 5628 is not required
as the problem has been fixed in
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Makefile.am b/man/Makefile.am
index b84aff5..8bdb115 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,18 +23,27 @@
libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
+libman_PRE = \
+ Xss.man \
+ $(Xss_shadows:=.man)
-libman_PRE = Xss.man
-
-BUILT_SOURCES = $(Xss_shadowmen)
+Xss_shadows = \
+ XScreenSaverQueryExtension \
+ XScreenSaverQueryVersion \
+ XScreenSaverAllocInfo \
+ XScreenSaverQueryInfo \
+ XScreenSaverSelectInput \
+ XScreenSaverSetAttributes \
+ XScreenSaverUnsetAttributes \
+ XScreenSaverRegister \
+ XScreenSaverUnregister \
+ XScreenSaverGetRegistered \
+ XScreenSaverSuspend
EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xss_shadowmen)
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
@@ -42,21 +51,3 @@ SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-Xss_shadows = \
- XScreenSaverQueryExtension \
- XScreenSaverQueryVersion \
- XScreenSaverAllocInfo \
- XScreenSaverQueryInfo \
- XScreenSaverSelectInput \
- XScreenSaverSetAttributes \
- XScreenSaverUnsetAttributes \
- XScreenSaverRegister \
- XScreenSaverUnregister \
- XScreenSaverGetRegistered \
- XScreenSaverSuspend
-
-Xss_shadowmen = $(Xss_shadows:=.@LIB_MAN_SUFFIX@)
-$(Xss_shadowmen):
- $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xss.$(LIB_MAN_SUFFIX)" > $@
diff --git a/man/XScreenSaverAllocInfo.man b/man/XScreenSaverAllocInfo.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverAllocInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverGetRegistered.man b/man/XScreenSaverGetRegistered.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverGetRegistered.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverQueryExtension.man b/man/XScreenSaverQueryExtension.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverQueryInfo.man b/man/XScreenSaverQueryInfo.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverQueryInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverQueryVersion.man b/man/XScreenSaverQueryVersion.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverRegister.man b/man/XScreenSaverRegister.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverRegister.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverSelectInput.man b/man/XScreenSaverSelectInput.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverSelectInput.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverSetAttributes.man b/man/XScreenSaverSetAttributes.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverSetAttributes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverSuspend.man b/man/XScreenSaverSuspend.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverSuspend.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverUnregister.man b/man/XScreenSaverUnregister.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverUnregister.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
diff --git a/man/XScreenSaverUnsetAttributes.man b/man/XScreenSaverUnsetAttributes.man
new file mode 100644
index 0000000..0b94d09
--- /dev/null
+++ b/man/XScreenSaverUnsetAttributes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__libmansuffix__
commit 1fb51a78ae5a063aa384b0b6b6fb7b11e972fcfa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 15:04:20 2010 -0700
Use make rules instead of shell for loops to generate shadow man pages
Allows parallel make and simpler build logs/error reporting
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index edfe37f..b84aff5 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,14 +27,14 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libman_PRE = Xss.man
-BUILT_SOURCES = shadows.DONE
+BUILT_SOURCES = $(Xss_shadowmen)
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xss_shadows:=.@LIB_MAN_SUFFIX@)
+ $(Xss_shadowmen)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
@@ -57,8 +57,6 @@ Xss_shadows = \
XScreenSaverGetRegistered \
XScreenSaverSuspend
-shadows.DONE:
- -rm -f $(Xss_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xss_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xss.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+Xss_shadowmen = $(Xss_shadows:=.@LIB_MAN_SUFFIX@)
+$(Xss_shadowmen):
+ $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xss.$(LIB_MAN_SUFFIX)" > $@
commit 2f5b75f49528c4bf57100b5d8fb83788013f7da9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 15:01:36 2010 -0700
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 1297b61..0e3e5e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,10 +29,10 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Check for progs
diff --git a/man/Makefile.am b/man/Makefile.am
index d561836..edfe37f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -36,21 +36,11 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(Xss_shadows:=.@LIB_MAN_SUFFIX@)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__miscmansuffix__/$(MISC_MAN_SUFFIX)/g' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
commit d1a4b97476efc64d9c47202b877c72c8b0fed14d
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:04:31 2010 -0300
Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c
index 0bbdc60..d496b94 100644
--- a/src/XScrnSaver.c
+++ b/src/XScrnSaver.c
@@ -28,8 +28,6 @@ in this Software without prior written authorization from the X Consortium.
*/
/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.1 2001/10/28 03:32:40 tsi Exp $ */
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/extensions/Xext.h>
commit bd46f8e115caeb4f48af64fc235d2b317f01b41f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 16:50:33 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 3d6bcb7..1297b61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(libXScrnSaver, 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit d665b35a9b33b7b0a80b557115240ff5514bd8cf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:48 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index c7182d8..2774e62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xscrnsaver.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xscrnsaver.pc.in
.PHONY: ChangeLog INSTALL
commit 00e9520738c8660451cdf21e5a3b530924855822
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 16 10:37:21 2010 -0500
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 38ada5e..3d6bcb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,9 +41,6 @@ AC_PROG_LIBTOOL
# Check for dependencies
PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.2])
-XSCRNSAVER_CFLAGS="$CWARNFLAGS $XSCRNSAVER_CFLAGS"
-AC_SUBST(XSCRNSAVER_CFLAGS)
-AC_SUBST(XSCRNSAVER_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
diff --git a/src/Makefile.am b/src/Makefile.am
index b0498be..aa923b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_srcdir)/include/X11/extensions \
$(XSCRNSAVER_CFLAGS) \
- $(MALLOC_ZERO_CFLAGS)
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
lib_LTLIBRARIES = libXss.la
commit 0b90e128718f269be334b9e60aa5b50604b1dc8c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 14 21:09:04 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 5931f69..d561836 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
#
libmandir = $(LIB_MAN_DIR)
commit 2f58888d29d779cb84072d1895934dfcee683f4c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:03 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index ffb210c..c7182d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xscrnsaver.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xscrnsaver.pc.in
.PHONY: ChangeLog INSTALL
commit 27972a511fb73bad74dd0309487af050a6a99c42
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile.am b/Makefile.am
index 9f9dc74..ffb210c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,15 @@ pkgconfig_DATA = xscrnsaver.pc
EXTRA_DIST = xscrnsaver.pc.in
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
if LINT
# Check source code with tools like lint & sparse
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
commit fe1b6951a8e6ac4006b4f488121746cf71e4771d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:26 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
Reply to: