libxss: Changes to 'debian-unstable'
ChangeLog | 63 ++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 6 ++--
configure.ac | 75 +++++++++++++++++++++++++++----------------------------
debian/changelog | 6 ++++
man/Xss.man | 6 ++--
src/XScrnSaver.c | 14 +++++-----
6 files changed, 119 insertions(+), 51 deletions(-)
New commits:
commit 857ad76feefc4ddb30cf9637debec6563fe8046c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 15:23:43 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 0c09d4c..8b2cc90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+commit 0ec072963f5964e09fbf84f4cd7d7ff8a9f3291f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Mar 7 21:05:41 2012 -0800
+
+ libXScrnSaver 1.2.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7d4e80e24773cd961d3c5d04031873017a1551a2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 10 21:41:58 2011 -0800
+
+ Fix gcc -Wwrite-strings warning
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1cd2ab96550b6b7d3abf92f76fe112798af727a4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 16 22:52:51 2011 -0700
+
+ Strip trailing whitespace
+
+ Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+ git diff -w & git diff -b show no diffs from this change
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit cfd6e22a3722514beefb39c73970715e2037b3ea
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Feb 2 11:43:40 2011 -0500
+
+ config: comment, minor upgrade, quote and layout configure.ac
+
+ Group statements per section as per Autoconf standard layout
+ Quote statements where appropriate.
+ Autoconf recommends not using dnl instead of # for comments
+
+ Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+ Add AC_CONFIG_SRCDIR([Makefile.am])
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit 49b025eff5d5d343ae11c6bfea7731ca8bcbe332
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ca2fc82f17a2bbe104b44ac33298377db0299c43
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 27 18:50:15 2011 -0500
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit aa25c745b032608c9cdc8006ed351d8ef435bf18
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 22:20:54 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index a61e9b5..9675c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxss (1:1.2.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 15:22:59 +0200
+
libxss (1:1.2.1-2) unstable; urgency=low
* Build for multiarch.
commit 0ec072963f5964e09fbf84f4cd7d7ff8a9f3291f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 21:05:41 2012 -0800
libXScrnSaver 1.2.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index ad1da81..0f52477 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXScrnSaver], [1.2.1],
+AC_INIT([libXScrnSaver], [1.2.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXScrnSaver])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 7d4e80e24773cd961d3c5d04031873017a1551a2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 21:41:58 2011 -0800
Fix gcc -Wwrite-strings warning
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c
index d09612d..2a89246 100644
--- a/src/XScrnSaver.c
+++ b/src/XScrnSaver.c
@@ -36,7 +36,7 @@ in this Software without prior written authorization from the X Consortium.
static XExtensionInfo _screen_saver_info_data;
static XExtensionInfo *screen_saver_info = &_screen_saver_info_data;
-static /* const */ char *screen_saver_extension_name = ScreenSaverName;
+static const char *screen_saver_extension_name = ScreenSaverName;
#define ScreenSaverCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, screen_saver_extension_name, val)
commit 1cd2ab96550b6b7d3abf92f76fe112798af727a4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:52:51 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Makefile.am b/Makefile.am
index 2774e62..907af39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 Red Hat, Inc.
-#
+#
# 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
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/configure.ac b/configure.ac
index 5873e48..ad1da81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.2])
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([Xss])
-
+
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
diff --git a/man/Xss.man b/man/Xss.man
index c9b091d..91f0ccf 100644
--- a/man/Xss.man
+++ b/man/Xss.man
@@ -337,14 +337,14 @@ be activated again, until the client has canceled the suspension.
.SH "ERRORS"
.B XScreenSaverSelectInput,
.B XScreenSaverQueryInfo,
-.B XScreenSaverSetAttributes
+.B XScreenSaverSetAttributes
and
-.B XScreenSaverUnsetAttributes
+.B XScreenSaverUnsetAttributes
will generate a
.I BadDrawable
error if \fIdrawable\fP is not a valid drawable identifier.
If any undefined bits are set in \fIevent-mask\fP,
-a BadValue error is generated by
+a BadValue error is generated by
.B XScreenSaverSelectInput .
.PP
.SH AVAILABILITY
diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c
index c19dc0a..d09612d 100644
--- a/src/XScrnSaver.c
+++ b/src/XScrnSaver.c
@@ -75,7 +75,7 @@ static /* const */ XExtensionHooks screen_saver_extension_hooks = {
};
static XEXT_GENERATE_FIND_DISPLAY (find_display, screen_saver_info,
- screen_saver_extension_name,
+ screen_saver_extension_name,
&screen_saver_extension_hooks,
ScreenSaverNumberEvents, NULL)
@@ -266,7 +266,7 @@ XScreenSaverProcessWindowAttributes (
if (valuemask & CWBackPixmap)
*value++ = attributes->background_pixmap;
-
+
if (valuemask & CWBackPixel)
*value++ = attributes->background_pixel;
@@ -284,7 +284,7 @@ XScreenSaverProcessWindowAttributes (
if (valuemask & CWBackingStore)
*value++ = attributes->backing_store;
-
+
if (valuemask & CWBackingPlanes)
*value++ = attributes->backing_planes;
@@ -352,9 +352,9 @@ void XScreenSaverSetAttributes (
else
req->visualID = visual->visualid;
/* abuse an Xlib internal interface - is this legal for us? */
- if ((req->mask = valuemask))
+ if ((req->mask = valuemask))
XScreenSaverProcessWindowAttributes (dpy,
- (xChangeWindowAttributesReq *)req,
+ (xChangeWindowAttributesReq *)req,
valuemask, attributes);
UnlockDisplay (dpy);
SyncHandle ();
@@ -394,7 +394,7 @@ Status XScreenSaverRegister (
return 0;
ul = (unsigned long) xid;
- XChangeProperty (dpy, RootWindow(dpy,screen), prop, type, 32,
+ XChangeProperty (dpy, RootWindow(dpy,screen), prop, type, 32,
PropModeReplace, (unsigned char *) &ul, 1);
return 1;
}
commit cfd6e22a3722514beefb39c73970715e2037b3ea
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:40 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
diff --git a/configure.ac b/configure.ac
index 0b0a4a0..5873e48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,55 +1,55 @@
-dnl Copyright 2005 Red Hat, Inc.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Red Hat not be used in
-dnl advertising or publicity pertaining to distribution of the software without
-dnl specific, written prior permission. Red Hat makes no
-dnl representations about the suitability of this software for any purpose. It
-dnl is provided "as is" without express or implied warranty.
-dnl
-dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
+# Copyright 2005 Red Hat, Inc.
+#
+# 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, and that the name of Red Hat not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Red Hat makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+
+# Initialize Autoconf
AC_PREREQ([2.60])
-
AC_INIT([libXScrnSaver], [1.2.1],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- [libXScrnSaver])
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXScrnSaver])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AC_CONFIG_HEADERS(config.h)
+# Initialize libtool
+AC_PROG_LIBTOOL
# 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.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
+XORG_CHECK_MALLOC_ZERO
-# Check for progs
-AC_PROG_LIBTOOL
-
-# Check for dependencies
+# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.2])
-dnl Allow checking code with lint, sparse, etc.
+# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([Xss])
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
- src/Makefile
- man/Makefile
- xscrnsaver.pc])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ xscrnsaver.pc])
+AC_OUTPUT
commit 49b025eff5d5d343ae11c6bfea7731ca8bcbe332
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 12f187b..0b0a4a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_INIT([libXScrnSaver], [1.2.1],
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
commit ca2fc82f17a2bbe104b44ac33298377db0299c43
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 27 18:50:15 2011 -0500
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index b426a02..12f187b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
# Check for dependencies
Reply to: