[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

x11proto-core: Changes to 'debian-unstable'



 debian/changelog |   10 ++++++++--
 debian/control   |    2 +-
 debian/copyright |   25 +++++++++++++++++++++----
 debian/rules     |    4 ++--
 4 files changed, 32 insertions(+), 9 deletions(-)

New commits:
commit d52779c0ec635c99667548c529d61ca33cf40615
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Nov 3 01:17:18 2010 +0100

    Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index b5bc753..23cb17d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-core (7.0.18-1) UNRELEASED; urgency=low
+x11proto-core (7.0.18-1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Get rid of the x-dev transitional package.
@@ -15,7 +15,7 @@ x11proto-core (7.0.18-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:14:34 -0400
+ -- Cyril Brulebois <kibi@debian.org>  Wed, 03 Nov 2010 01:17:11 +0100
 
 x11proto-core (7.0.16-1) unstable; urgency=low
 

commit 343fcfd7dc4a2c88822faab5d90f63bb76119c65
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Nov 3 01:17:02 2010 +0100

    Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index f3769e6..b5bc753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11proto-core (7.0.18-1) UNRELEASED; urgency=low
   * Update debian/copyright from upstream COPYING.
   * 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:14:34 -0400
 
diff --git a/debian/control b/debian/control
index a18501c..189b163 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-core
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
 Build-Depends:
  debhelper (>= 5.0.0),
  automake,

commit 6d4958d5238bfe41047e1dba2ca4c92c75d34f2c
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Nov 3 01:16:01 2010 +0100

    No longer pass --disable-shared, this option is gone.

diff --git a/debian/changelog b/debian/changelog
index 70eee64..f3769e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11proto-core (7.0.18-1) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Update debian/copyright from upstream COPYING.
   * 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:14:34 -0400
 
diff --git a/debian/rules b/debian/rules
index 9ffe56b..e86ddbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ build-stamp: configure
 	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 a1b1a47bfb286126b6f0b2a44fa380c6527f977c
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Nov 3 01:15:15 2010 +0100

    Switch from --list-missing to --fail-missing for additional safety.

diff --git a/debian/changelog b/debian/changelog
index 7cf4137..70eee64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-core (7.0.18-1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Update debian/copyright from upstream COPYING.
+  * Switch from --list-missing to --fail-missing for additional safety.
 
  -- Robert Hooker <sarvatt@ubuntu.com>  Tue, 02 Nov 2010 19:14:34 -0400
 
diff --git a/debian/rules b/debian/rules
index aedb95a..9ffe56b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,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 888f3107094b9beb06d83df67815c4601a0347e4
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Nov 3 01:13:33 2010 +0100

    Fix missing Debian revision.

diff --git a/debian/changelog b/debian/changelog
index bf3a356..7cf4137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-core (7.0.18) UNRELEASED; urgency=low
+x11proto-core (7.0.18-1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Get rid of the x-dev transitional package.

commit abb92fdf14be1321d0f4c117606750b36e3e002c
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Nov 3 01:13:18 2010 +0100

    Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index 3bb3dfe..bf3a356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ x11proto-core (7.0.18) UNRELEASED; urgency=low
   [ Robert Hooker ]
   * New upstream release.
 
+  [ Cyril Brulebois ]
+  * Update debian/copyright from upstream COPYING.
+
  -- Robert Hooker <sarvatt@ubuntu.com>  Tue, 02 Nov 2010 19:14:34 -0400
 
 x11proto-core (7.0.16-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 5924e14..e77812c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,27 @@ http://xorg.freedesktop.org/releases/individual/proto/
 
 Debianised by Daniel Stone <daniel.stone@ubuntu.com>.
 
-The architect of the X11 core protocol was Bob Scheifler of MIT LCS, with
-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
 


Reply to: