x11proto-fixes: Changes to 'debian-unstable'
debian/changelog | 12 +++++++++--
debian/control | 2 -
debian/copyright | 41 ++++++++++++++++++--------------------
debian/rules | 6 ++---
debian/x11proto-fixes-dev.install | 1
5 files changed, 35 insertions(+), 27 deletions(-)
New commits:
commit e6bc57831533bd3ebc7809214150eb2b8bc9dbaa
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:44:23 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 0a8a783..33c62cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
+x11proto-fixes (1:4.1.2-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -16,7 +16,7 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
* No longer pass --disable-shared, this option is gone.
* Add myself to Uploaders.
- -- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:21:43 -0400
+ -- Cyril Brulebois <kibi@debian.org> Wed, 03 Nov 2010 23:44:17 +0100
x11proto-fixes (1:4.1.1-2) unstable; urgency=low
commit 108d1b678ef019482a7ce29854f3b85b9b11f611
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:44:01 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index f8a8554..0a8a783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
dh_installdocs.
* Switch from --list-missing to --fail-missing for additional safety.
* No longer pass --disable-shared, this option is gone.
+ * Add myself to Uploaders.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:21:43 -0400
diff --git a/debian/control b/debian/control
index 6e22a3c..d4001d7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-fixes
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
commit e31eaf908932bce51ee367ab58a204c0df01a36d
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:43:40 2010 +0100
Install fixesproto.txt with dh_install rather than with dh_installdocs.
diff --git a/debian/changelog b/debian/changelog
index 46336f0..f8a8554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Update debian/copyright.
+ * Install fixesproto.txt with dh_install rather than with
+ dh_installdocs.
* Switch from --list-missing to --fail-missing for additional safety.
* No longer pass --disable-shared, this option is gone.
diff --git a/debian/rules b/debian/rules
index 527b280..238eefb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ binary-indep: build install
dh_testdir
dh_testroot
- dh_installdocs fixesproto.txt
+ dh_installdocs
dh_installman
dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs ChangeLog
diff --git a/debian/x11proto-fixes-dev.install b/debian/x11proto-fixes-dev.install
index 3eab5d3..6a03d21 100644
--- a/debian/x11proto-fixes-dev.install
+++ b/debian/x11proto-fixes-dev.install
@@ -1,2 +1,3 @@
usr/include/X11/extensions/*
usr/lib/pkgconfig/fixesproto.pc
+usr/share/doc/fixesproto/fixesproto.txt usr/share/doc/x11proto-fixes-dev/
commit 7fd0f5a0c7d7aeb6b1b82933712f1d54446f2016
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:37:21 2010 +0100
No longer pass --disable-shared, this option is gone.
diff --git a/debian/changelog b/debian/changelog
index 7de06ef..46336f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Update debian/copyright.
* Switch from --list-missing to --fail-missing for additional safety.
+ * No longer pass --disable-shared, this option is gone.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:21:43 -0400
diff --git a/debian/rules b/debian/rules
index a3a21b9..527b280 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ build-stamp:
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --disable-shared \
+ --infodir=\$${prefix}/share/info \
$(confflags) CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
>$@
commit 657b49c80809740a9094cd8371a8b9de8479568c
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:37:08 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index 8b0ccb1..7de06ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Update debian/copyright.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:21:43 -0400
diff --git a/debian/rules b/debian/rules
index 9ef0a5c..a3a21b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ binary-indep: build install
dh_installdocs fixesproto.txt
dh_installman
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs ChangeLog
dh_link
dh_strip
commit 9a816b2f2f68eb4554a12b1f25b18bfd5f5fb9ee
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:34:52 2010 +0100
Update debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 6f60d0f..8b0ccb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
[ Robert Hooker ]
* New upstream release.
+ [ Cyril Brulebois ]
+ * Update debian/copyright.
+
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:21:43 -0400
x11proto-fixes (1:4.1.1-2) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 4628843..6fe99c4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,26 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/proto/
-$Id$
+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 © 2001,2003 Keith Packard
@@ -22,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: