x11proto-composite: Changes to 'debian-unstable'
debian/changelog | 10 ++++++--
debian/control | 2 -
debian/copyright | 41 +++++++++++++++++-----------------
debian/rules | 4 +--
debian/x11proto-composite-dev.install | 1
5 files changed, 33 insertions(+), 25 deletions(-)
New commits:
commit f30a108d225c05ab6312071d34bd9ca7adea7e2c
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 01:04:37 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index fbd12cb..6f3af2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low
+x11proto-composite (1:0.4.2-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -14,7 +14,7 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low
* Use .install rather than dh_installdocs for the txt documentation.
* Switch from --list-missing to --fail-missing for additional safety.
- -- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:02:03 -0400
+ -- Cyril Brulebois <kibi@debian.org> Wed, 03 Nov 2010 01:04:22 +0100
x11proto-composite (1:0.4.1-1) unstable; urgency=low
commit dfbf3482cbb0cca077b9320e8acb5718f2161aba
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 01:03:01 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index 4230b0a..fbd12cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low
* Update debian/copyright from upstream COPYING.
* Add myself to Uploaders.
* Use .install rather than dh_installdocs for the txt documentation.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:02:03 -0400
diff --git a/debian/rules b/debian/rules
index 581f390..2fab9d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ binary-indep: build install
dh_installdocs
dh_installman
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs ChangeLog
dh_link
dh_strip
commit 749fac54f74c70fd575cb880ac201866cf66fd67
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 01:02:28 2010 +0100
Use .install rather than dh_installdocs for the txt documentation.
diff --git a/debian/changelog b/debian/changelog
index 60a8404..4230b0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Update debian/copyright from upstream COPYING.
* Add myself to Uploaders.
+ * Use .install rather than dh_installdocs for the txt documentation.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:02:03 -0400
diff --git a/debian/rules b/debian/rules
index 76cb6f1..581f390 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ binary-indep: build install
dh_testdir
dh_testroot
- dh_installdocs compositeproto.txt
+ dh_installdocs
dh_installman
dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs ChangeLog
diff --git a/debian/x11proto-composite-dev.install b/debian/x11proto-composite-dev.install
index 8bf21f5..74a65bd 100644
--- a/debian/x11proto-composite-dev.install
+++ b/debian/x11proto-composite-dev.install
@@ -1,2 +1,3 @@
usr/include/X11/extensions/*
usr/lib/pkgconfig/compositeproto.pc
+usr/share/doc/compositeproto/compositeproto.txt usr/share/doc/x11proto-composite-dev
commit a2df244b7f334075dd3291a9f399486dba33b175
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 00:58:17 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 90546a3..60a8404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Update debian/copyright from upstream COPYING.
+ * Add myself to Uploaders.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:02:03 -0400
diff --git a/debian/control b/debian/control
index cf9ad61..fe2ebab 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-composite
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
commit 2e5f1d4c6e4a6732ce2124bcf3cbca6610794e4c
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 00:55:20 2010 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index f15a82a..90546a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low
* New upstream release.
* Add pkg-config to the build deps.
+ [ Cyril Brulebois ]
+ * Update debian/copyright from upstream COPYING.
+
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:02:03 -0400
x11proto-composite (1:0.4.1-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index f592565..455ceb6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,27 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/proto/
+Copyright (c) 2006, 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"),
+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 © 2003 Keith Packard
Permission to use, copy, modify, distribute, and sell this software and its
@@ -20,23 +41,3 @@ 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.
-
-Copyright © 2006 Sun Microsystems
-
-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 Sun Microsystems not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Sun Microsystems makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL SUN MICROSYSTEMS 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.
Reply to: