x11proto-core: Changes to 'debian-unstable'
debian/changelog | 25 +++++++++++++++++++------
debian/control | 2 +-
debian/copyright | 1 +
3 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit 59b45e34a3efc73dff3f4cfe655078a2bf61f0b5
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 6 17:55:45 2010 +0100
Fix mismerge
diff --git a/debian/copyright b/debian/copyright
index 96c5339..d6ee14f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,27 +25,6 @@ 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.
-Copyright © 1991 Sun Microsystems, Inc. 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"),
-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.
-
Copyright 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
commit e6338a2a24228706bab5225d4f94e03e839d115c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 6 17:54:45 2010 +0100
Add a changelog entry
diff --git a/debian/changelog b/debian/changelog
index 3ed8c35..ad16741 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-core (7.0.19-2) UNRELEASED; urgency=low
+
+ * Merge changes from the experimental branch (7.0.17-1 upload).
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 06 Nov 2010 17:54:22 +0100
+
x11proto-core (7.0.19-1) unstable; urgency=low
* New upstream release.
commit a9fefe5e19e84b0f40c1fc588f9bec5e0473e6ad
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 18:22:02 2010 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 2e4cc68..56fe567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-core (7.0.17-1) UNRELEASED; urgency=low
+x11proto-core (7.0.17-1) experimental; urgency=low
* Get rid of the x-dev transitional package.
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -9,7 +9,7 @@ x11proto-core (7.0.17-1) UNRELEASED; urgency=low
* Update debian/copyright.
* Bump Standards-Version to 3.9.0, no changes.
- -- Julien Cristau <jcristau@debian.org> Sat, 03 Jul 2010 20:04:15 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 07 Jul 2010 18:21:51 +0100
x11proto-core (7.0.16-1) unstable; urgency=low
commit 829a5098a229ed0c99b2bd9ac9efae53a9f0f756
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 18:21:40 2010 +0100
Bump Standards-Version to 3.9.0, no changes.
diff --git a/debian/changelog b/debian/changelog
index 0e3270d..2e4cc68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x11proto-core (7.0.17-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for xorg-macros.
* Update debian/copyright.
+ * Bump Standards-Version to 3.9.0, no changes.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Jul 2010 20:04:15 +0100
diff --git a/debian/control b/debian/control
index edf6295..30ba3aa 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
automake,
xutils-dev (>= 1:7.5),
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-core
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-core.git
commit c0ccac4f459a9462598960fb4b5effa8e748bf01
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 16:24:59 2010 +0100
Update debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 69531d5..0e3270d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11proto-core (7.0.17-1) UNRELEASED; urgency=low
* Remove myself from Uploaders
* New upstream release.
* Bump xutils-dev build-dep for xorg-macros.
+ * Update debian/copyright.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Jul 2010 20:04:15 +0100
diff --git a/debian/copyright b/debian/copyright
index 5924e14..a1e993d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,27 @@ significant contributions from Jim Gettys, Phil Karlton and Scott
McGregor of Digital, Dave Rosenthal of Sun, and many others of
the xpert mailing list.
+Copyright © 1991 Sun Microsystems, Inc. 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"),
+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.
+
Copyright 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -50,3 +71,4 @@ 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.
+
commit ca88bff1a15347d0683cb8e7f6d1231592e55a22
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 16:19:27 2010 +0100
Bump xutils-dev build-dep for xorg-macros.
diff --git a/debian/changelog b/debian/changelog
index d69e929..69531d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-core (7.0.17-1) UNRELEASED; urgency=low
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
* New upstream release.
+ * Bump xutils-dev build-dep for xorg-macros.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Jul 2010 20:04:15 +0100
diff --git a/debian/control b/debian/control
index a18501c..edf6295 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-core
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-core.git
commit 2e92a7f40e198e4b43fdd7b7348acd5a97ac08c1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 7 16:10:17 2010 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index eb1bd67..c2e3246 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,149 @@
+commit 9ffca704438993516016671e9a7f67c5ca21f142
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sat May 15 17:43:32 2010 +0200
+
+ xproto 7.0.17
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 81c3cc1ce1f163de91d33bfa1b335f8b4d309c13
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Mar 28 19:25:52 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 1f442cdd1c26fa10e654ef2e957e24c2306abb11
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Mar 28 19:00:31 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 1511eb6065c103149b7ce59b4cc0aa538449cf80
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Mar 27 19:42:59 2010 -0700
+
+ Add _X_NORETURN macro to signify functions that don't return
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit e7d73aec46f2ebc21e8b80378c3647b69f098b9a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Mar 27 16:38:27 2010 -0400
+
+ config: remove execute permission on configuration file
+
+ Introduced in commit c879dab58f82f4789f27933c22706c84015f8684
+ "avoid checking for fds_bits on mingw"
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bf25d06799da98c3df655d8a734fe98c98bf143e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 15 13:31:40 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit d02f4b124489016f43478ac2ca2fbb2d0253ba02
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Oct 13 16:51:14 2009 -0500
+
+ xproto: Cygwin GCC does not support visibility attributes
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ec13f2cc5af936aafc3a483f441c44aa5ed14fe3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 22 19:24:48 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 45135e80f1e1f8818159f7d80372a77df0537738
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Nov 16 11:13:30 2009 -0500
+
+ README: file created or updated #24206
+
+ Contains a set of URLs to freedesktop.org.
+
+commit cdd22487f12f7058404759bd138ada421debc93a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 15 19:45:27 2009 -0500
+
+ 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 b99b992915dd19914c9464d9a96278d2cc2ceeeb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 15 18:31:29 2009 -0500
+
+ Makefile.am: INSTALL file is missing or incorrect #24206
+
+ The standard GNU file on building/installing tarball is copied
+ using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
+ Add INSTALL target
+
+commit caea0fd5a966a74465d965ecab89f4829dced157
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 15 18:11:36 2009 -0500
+
+ configure.ac: 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 f1b1d45cd955f24a338af098ebd6a181b1454b38
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Nov 14 20:47:09 2009 -0500
+
+ configure.ac: AM_MAINTAINER_MODE missing #24238
+
+ This turns off maintainer mode build rules in tarballs.
+ Works in conjunction with autogen.sh --enable-maintainer-mode
+
+commit 78947b5a7e0ef934fdce7e1bce734d2cf29639b4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Nov 14 18:26:47 2009 -0500
+
+ .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 3ec82cd722407e4dccd6165786d3452f3ab80bea
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Oct 2 10:46:06 2009 +1000
+
+ Add XF86XK_TouchpadToggle
+
+ Many laptops provide a key to enable or disable the touchpad and the
+ trackstick. On Lenovo T61s, this key is located on Fn + F8.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 4253e208088d166a8666f673360ef69a3c86f8b0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Sep 23 17:04:09 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index 42618d4..d69e929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-x11proto-core (7.0.16-2) UNRELEASED; urgency=low
+x11proto-core (7.0.17-1) UNRELEASED; urgency=low
* Get rid of the x-dev transitional package.
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ * New upstream release.
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Nov 2009 10:34:47 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 03 Jul 2010 20:04:15 +0100
x11proto-core (7.0.16-1) unstable; urgency=low
Reply to: