.gitignore | 4 +
ChangeLog | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++----
Makefile.am | 15 +++-
configure.ac | 6 +
debian/changelog | 13 +++
debian/control | 3
saver.h | 2
saverproto.h | 3
scrnsaver.h | 136 ---------------------------------------
9 files changed, 213 insertions(+), 160 deletions(-)
New commits:
commit 82fbedcb16eaf886e90fb8f55f7b53e7617deca2
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jan 6 12:29:52 2010 +0000
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index db3a925..e885efb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-scrnsaver (1.2.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Julien Cristau <jcris...@debian.org> Wed, 06 Jan 2010 12:30:56 +0000
+
x11proto-scrnsaver (1.2.0-1) experimental; urgency=low
* Bump debhelper compat level to 5.
commit ae03690cb22b9821b43ab56c0d32748fdaa28cdd
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Sep 13 18:34:00 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9bda758..db3a925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-scrnsaver (1.2.0-1) UNRELEASED; urgency=low
+x11proto-scrnsaver (1.2.0-1) experimental; urgency=low
* Bump debhelper compat level to 5.
* Run autoreconf at build time.
@@ -11,7 +11,7 @@ x11proto-scrnsaver (1.2.0-1) UNRELEASED; urgency=low
+ scrnsaver.h moved to libXScrnSaver
* Break old libxss-dev to make sure scrnsaver.h doesn't go missing.
- -- Julien Cristau <jcris...@debian.org> Sun, 13 Sep 2009 18:17:25 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 13 Sep 2009 18:33:53 +0200
x11proto-scrnsaver (1.1.0.0-2) unstable; urgency=low
commit 02f5620ec55d26f9bc582d99f1b8f89dfa76a656
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Sep 13 18:30:50 2009 +0200
Break old libxss-dev to make sure scrnsaver.h doesn't go missing.
diff --git a/debian/changelog b/debian/changelog
index 6e9ca93..9bda758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11proto-scrnsaver (1.2.0-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
* New upstream release
+ scrnsaver.h moved to libXScrnSaver
+ * Break old libxss-dev to make sure scrnsaver.h doesn't go missing.
-- Julien Cristau <jcris...@debian.org> Sun, 13 Sep 2009 18:17:25 +0200
diff --git a/debian/control b/debian/control
index cb05b06..843db12 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/proto/x11proto-scrnsaver.git
Package: x11proto-scrnsaver-dev
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev
+Breaks: libxss-dev (<< 1:1.2.0)
Description: X11 Screen Saver extension wire protocol
This package provides development headers describing the wire protocol
for the MIT-SCREEN-SAVER extension, used to notify the server of client
commit 17061ce726a81b7c3f8052cb78a6ec025423b102
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Sep 13 18:29:14 2009 +0200
Bump xutils-dev build-dep for new util-macros
diff --git a/debian/control b/debian/control
index f00e8d5..cb05b06 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon
<dilin...@debian.
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev
+ xutils-dev (>= 1:7.4+4)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-scrnsaver
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-scrnsaver.git
commit f6de883f9bdf2c2982bb22de0d50565acebf340c
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Sep 13 18:28:30 2009 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..0b68df4
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,185 @@
+commit bcc25e87ba8e93c306b3cd00317a6f550c73f5cf
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Aug 25 18:34:56 2009 +1000
+
+ scrnsaverproto 1.2.0
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit a2f5eaf51b26616746fddcd3a60c3b939d1a018a
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Aug 25 18:34:36 2009 +1000
+
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 83974b2814eb18d9c86f41e39dfdafaf39759ced
+Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 88a1fe1ac27353b92836b9a21c5a1757bad64fad
+Author: Peter Hutterer <pe...@cs.unisa.edu.au>
+Date: Mon May 19 20:08:12 2008 +0930
+
+ Remove scrnsaver.h. This is an xlib header, moved to libXScrnSaver.
+
+ For future amendments to this file, look at
+ git://anongit.freedesktop.org/git/xorg/lib/libXScrnSaver
+
+commit c993e0c422a52bc5f56f7fba29af82f78f7680a5
+Author: Peter Hutterer <pe...@cs.unisa.edu.au>
+Date: Mon May 19 19:11:29 2008 +0930
+
+ Nuke RCS tags.
+
+commit 7e19b4a5ad470f1715046f56ea8149df851221e4
+Author: James Cloos <cl...@jhcloos.com>
+Date: Thu Dec 6 16:39:07 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 00aa1552d0c151402173ce9e4f612d84e4bbddcf
+Author: James Cloos <cl...@jhcloos.com>
+Date: Mon Sep 3 05:54:16 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 294d7788b9e4ee86d93992ea074b169bf2ede25e
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jul 14 18:56:32 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit ac0b03f75facc368da302fa2f500dcfeafc04e15
+Author: Fredrik Höglund <fred...@kde.org>
+Date: Fri Mar 31 18:39:42 2006 +0000
+
+ Update the package version number to 1.1.
+ Increase the minor version to 1.
+ Add the ScreenSaverSuspend request.
+ Add the prototype for XScreenSaverSuspend.
+
+commit 2f091ac1252c833bf70639b718bb1ac738066016
+Author: Kevin E Martin <k...@kem.org>
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 7bc2f8f300a7fac1f86d281459e74f2c3aafde07
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Oct 19 02:48:15 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit ab3d7b78cfd25882ff74159931c9b1e5a7f1e762
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 4a27d790b9e39c2bae6515ddc71cd7c710b9fd69
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri Jul 29 21:22:56 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 6f818dc15a71a0af7e9cf5806677722f99227ebd
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Sat May 21 04:19:33 2005 +0000
+
+ Set version to 1.0.
+
+commit 450acca3dbce47f8fef56864235698715ba5122d
+Author: Adam Jackson <a...@nwnk.net>
+Date: Thu May 19 00:22:40 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 15eaf97151b718e01eecac1aba75872e4c9d2ddc
+Author: Adam Jackson <a...@nwnk.net>
+Date: Thu May 19 00:10:19 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 771299cf2f6de82ac1bc58aaf4830cc514033569
+Author: Josh Triplett <j...@speakeasy.net>
+Date: Tue May 17 20:41:15 2005 +0000
+
+ Add COPYING file for ScrnSaver.
+
+commit e455c03bb7e498e7eaaf8ad815fb60355fb1f72e
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Date: Mon May 9 18:20:06 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 22a2a1cdb0f6e05fa609fbd996c696aa509f1f83
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri May 6 01:46:31 2005 +0000
+
+ Initial build system files for proto module.
+
+commit df80fd315a3dedab112429d68c45adaf57e12c3d
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Thu Jan 27 05:36:16 2005 +0000
+
+ Include X11/Xlib.h in scrnsaver.h
+
+commit fd13bc250b337d0510975b49a2432b0fd9e3753c
+Author: Egbert Eich <e...@suse.de>
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 30ce491906c32ed9137738cd97c13e2c346f4d48
+Author: Egbert Eich <e...@suse.de>
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 7e886322e57130ed3a2b4633cd93a9f6fe17c4c4
+Author: Egbert Eich <e...@suse.de>
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit bdcc80fa6a01bfdbaba23ed0ea265afbb3deff3c
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 13:35:14 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 6229c02f2d40f995b5f0067fab1ae1c281b3c5f9
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 21e708cda17e86d513bbc8cd779fa5f35376b868
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 78c91d731d4b9e708e5187f7051022a9ee50563a
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 0c0b82a2143adfb443157badfe84093d8b74cc13
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index 3afd05c..6e9ca93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-scrnsaver (1.1.0.0-3) UNRELEASED; urgency=low
+x11proto-scrnsaver (1.2.0-1) UNRELEASED; urgency=low
* Bump debhelper compat level to 5.
* Run autoreconf at build time.
@@ -7,6 +7,8 @@ x11proto-scrnsaver (1.1.0.0-3) UNRELEASED; urgency=low
was only needed for upgrades from sarge.
* Add dependency on x11proto-core-dev.
* Bump Standards-Version to 3.8.3.
+ * New upstream release
+ + scrnsaver.h moved to libXScrnSaver
-- Julien Cristau <jcris...@debian.org> Sun, 13 Sep 2009 18:17:25 +0200
commit bcc25e87ba8e93c306b3cd00317a6f550c73f5cf
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Aug 25 18:34:56 2009 +1000
scrnsaverproto 1.2.0
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 0a191f6..fff6f40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([ScrnSaverProto], [1.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([ScrnSaverProto], [1.2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit a2f5eaf51b26616746fddcd3a60c3b939d1a018a
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Aug 25 18:34:36 2009 +1000
Remove RCS tags
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/saver.h b/saver.h
index d253e4f..e8da625 100644
--- a/saver.h
+++ b/saver.h
@@ -1,6 +1,4 @@
/*
- * $XConsortium: saver.h,v 1.5 94/04/17 20:59:33 rws Exp $
- *
Copyright (c) 1992 X Consortium
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/saverproto.h b/saverproto.h
index 9b8ed73..7197084 100644
--- a/saverproto.h
+++ b/saverproto.h
@@ -1,6 +1,4 @@
/*
- * $XConsortium: saverproto.h,v 1.5 94/04/17 20:59:33 keith Exp $
- *
Copyright (c) 1992 X Consortium
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,7 +24,6 @@ in this Software without prior written authorization from the
X Consortium.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86$ */
#ifndef _SAVERPROTO_H_
#define _SAVERPROTO_H_
commit 83974b2814eb18d9c86f41e39dfdafaf39759ced
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Tue Jan 27 20:06:28 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
diff --git a/.gitignore b/.gitignore
index 949541e..dcf80c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
missing
scrnsaverproto.pc
*~
+scrnsaverproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index fd9cb3f..cb098d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ scrnsaver_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = scrnsaverproto.pc
-EXTRA_DIST = autogen.sh scrnsaverproto.pc.in
+EXTRA_DIST = scrnsaverproto.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -14,6 +14,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 10d7e1b..0a191f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([ScrnSaverProto], [1.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
scrnsaverproto.pc])
commit 88a1fe1ac27353b92836b9a21c5a1757bad64fad
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon May 19 20:08:12 2008 +0930
Remove scrnsaver.h. This is an xlib header, moved to libXScrnSaver.
For future amendments to this file, look at
git://anongit.freedesktop.org/git/xorg/lib/libXScrnSaver
diff --git a/Makefile.am b/Makefile.am
index f836985..fd9cb3f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,7 @@
scrnsaverdir = $(includedir)/X11/extensions
scrnsaver_HEADERS = \
saver.h \
- saverproto.h \
- scrnsaver.h
+ saverproto.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = scrnsaverproto.pc
diff --git a/scrnsaver.h b/scrnsaver.h
deleted file mode 100644
index 72f92b8..0000000
--- a/scrnsaver.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
-Copyright (c) 1992 X Consortium
-
-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 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
-X CONSORTIUM 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 X Consortium 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 X Consortium.
- *
- * Author: Keith Packard, MIT X Consortium
- */
-/* $XFree86$ */
-
-#ifndef _SCRNSAVER_H_
-#define _SCRNSAVER_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/saver.h>
-
-typedef struct {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came frome a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* screen saver window */
- Window root; /* root window of event screen */
- int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverCycle*/
- int kind; /* ScreenSaverBlanked, ...Internal, ...External */
- Bool forced; /* extents of new region */
- Time time; /* event timestamp */
-} XScreenSaverNotifyEvent;
-
-typedef struct {
- Window window; /* screen saver window - may not exist */
- int state; /* ScreenSaverOff, ScreenSaverOn,
ScreenSaverDisabled*/
- int kind; /* ScreenSaverBlanked, ...Internal,
...External */
- unsigned long til_or_since; /* time til or since screen saver */
- unsigned long idle; /* total time since last user input */
- unsigned long eventMask; /* currently selected events for this client */
-} XScreenSaverInfo;
-
-_XFUNCPROTOBEGIN
-
-extern Bool XScreenSaverQueryExtension (
- Display* /* display */,
- int* /* event_base */,
- int* /* error_base */
-);
-
-extern Status XScreenSaverQueryVersion (
- Display* /* display */,
- int* /* major_version */,
- int* /* minor_version */
-);
-
-extern XScreenSaverInfo *XScreenSaverAllocInfo (
- void
-);
-
-extern Status XScreenSaverQueryInfo (
- Display* /* display */,
- Drawable /* drawable */,
- XScreenSaverInfo* /* info */
-);
-
-extern void XScreenSaverSelectInput (
- Display* /* display */,
- Drawable /* drawable */,
- unsigned long /* eventMask */
-);
-
-extern void XScreenSaverSetAttributes (
- Display* /* display */,
- Drawable /* drawable */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int /* border_width */,
- int /* depth */,
- unsigned int /* class */,
- Visual * /* visual */,
- unsigned long /* valuemask */,
- XSetWindowAttributes * /* attributes */
-);
-
-extern void XScreenSaverUnsetAttributes (
- Display* /* display */,
- Drawable /* drawable */
-);
-
-extern Status XScreenSaverRegister (
- Display* /* display */,
- int /* screen */,
- XID /* xid */,
- Atom /* type */
-);
-
-extern Status XScreenSaverUnregister (
- Display* /* display */,
- int /* screen */
-);
-
-extern Status XScreenSaverGetRegistered (
- Display* /* display */,
- int /* screen */,
- XID* /* xid */,
- Atom* /* type */
-);
-
-extern void XScreenSaverSuspend (
- Display* /* display */,
- Bool /* suspend */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _SCRNSAVER_H_ */
commit c993e0c422a52bc5f56f7fba29af82f78f7680a5
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon May 19 19:11:29 2008 +0930
Nuke RCS tags.
diff --git a/scrnsaver.h b/scrnsaver.h
index 8e8c5d6..72f92b8 100644
--- a/scrnsaver.h
+++ b/scrnsaver.h
@@ -1,5 +1,4 @@
/*
- * $XConsortium: scrnsaver.h,v 1.6 94/04/17 20:59:34 keith Exp $
*
Copyright (c) 1992 X Consortium
commit 7e19b4a5ad470f1715046f56ea8149df851221e4
Author: James Cloos <cl...@jhcloos.com>
Date: Thu Dec 6 16:39:07 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 0acb57a..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-2006-03-31 Fredrik Höglund <fred...@kde.org>
-
- * configure.ac:
- Update the package version number to 1.1.
-
- * saver.h:
- Increase the minor version to 1.
-
- * saverproto.h:
- Add the ScreenSaverSuspend request.
-
- * scrnsaver.h:
- Add the prototype for XScreenSaverSuspend.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
diff --git a/Makefile.am b/Makefile.am
index aa73785..f836985 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = scrnsaverproto.pc
EXTRA_DIST = autogen.sh scrnsaverproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
commit 00aa1552d0c151402173ce9e4f612d84e4bbddcf
Author: James Cloos <cl...@jhcloos.com>
Date: Mon Sep 3 05:54:16 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 9513265..949541e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
install-sh
missing
scrnsaverproto.pc
+*~
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
