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

x11-apps: Changes to 'debian-experimental'



 debian/changelog |    7 +
 debian/control   |    4 
 debian/copyright |  262 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 238 insertions(+), 35 deletions(-)

New commits:
commit 6c7abd6ab972ec64e97c2ba02070c49189556f33
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:29:43 2010 +0100

    Update copyright: xman.

diff --git a/debian/copyright b/debian/copyright
index baa506b..e4ba440 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -805,7 +805,7 @@ xmag:
   XFree86 Project.
 
 xman:
-  Copyright (c) 1987, 1988  X Consortium
+  Copyright (c) 1987, 1988, 1989, 1991  X Consortium
   
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -831,8 +831,27 @@ xman:
   other dealings in this Software without prior written authorization
   from the X Consortium.
   
-   Author:    Chris D. Peterson, MIT Project Athena
-   Created:   October 22, 1987
+  Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
+  
+  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.
+  
+  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
+  OPEN GROUP 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 Open Group 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 Open Group.
 
 xmore:
   Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>

commit ebad492a81cdcfca068a94d98145e5cd149fe85d
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:28:20 2010 +0100

    Update copyright: xmag.

diff --git a/debian/copyright b/debian/copyright
index cf1d898..baa506b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -755,7 +755,7 @@ xlogo:
   from The Open Group.
 
 xmag:
-  Copyright 1991, 1998  The Open Group
+  Copyright 1989, 1990, 1991, 1993, 1994, 1998  The Open Group
   
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
@@ -778,6 +778,31 @@ xmag:
   not be used in advertising or otherwise to promote the sale, use or
   other dealings in this Software without prior written authorization
   from The Open Group.
+  
+  
+  Copyright (C) 1999 The XFree86 Project, 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 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
+  XFREE86 PROJECT 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 XFree86 Project 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
+  XFree86 Project.
 
 xman:
   Copyright (c) 1987, 1988  X Consortium

commit 12c17215ac424afca5a831621c3e505da2781f40
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:27:25 2010 +0100

    Update copyright: xlogo.

diff --git a/debian/copyright b/debian/copyright
index ef736a6..cf1d898 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -729,7 +729,8 @@ xload:
   Project.
 
 xlogo:
-  Copyright 1989, 1998  The Open Group
+  Copyright 1988, 1990, 1993 1994, 1998  The Open Group
+  Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
   
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
@@ -737,19 +738,21 @@ xlogo:
   copyright notice and this permission notice appear in supporting
   documentation.
   
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
+  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
-  OPEN GROUP 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.
+  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 OPEN GROUP 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 Open Group 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 Open Group.
+  Except as contained in this notice, the name of The Open Group 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 Open Group.
 
 xmag:
   Copyright 1991, 1998  The Open Group

commit df1eb68e70c26878c0104308ef5b8379de5a885c
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:26:15 2010 +0100

    Update copyright: xload.

diff --git a/debian/copyright b/debian/copyright
index a2aacb9..ef736a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -671,6 +671,62 @@ xload:
   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.
+  
+  		----------------------------------------
+  
+  Copyright (c) 2000, 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.
+  
+  
+  		----------------------------------------
+  
+  get_rload.c (rwhod support) was added in 2001 by the XFree86 Project without
+  a copyright notice, and is thus covered by this general notice:
+  
+  XFree86 code without an explicit copyright is covered by the following copy-
+  right/license:
+  
+  Copyright (C) 1994-2003 The XFree86 Project, 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 fur-
+  nished 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, FIT-
+  NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+  NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of the XFree86 Project shall not
+  be used in advertising or otherwise to promote the sale, use or other deal-
+  ings in this Software without prior written authorization from the XFree86
+  Project.
 
 xlogo:
   Copyright 1989, 1998  The Open Group

commit 8603e5ca1b55aefda3df299a3a657968f180093c
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:24:33 2010 +0100

    Update copyright: xgc.

diff --git a/debian/copyright b/debian/copyright
index e7becb2..a2aacb9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -623,6 +623,27 @@ xgc:
   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.
+  
+  Copyright (c) 2009, 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.
 
 xload:
   Copyright (c) 1989  X Consortium

commit 0ca63c467239d05caf605b6225417049aa60d3e9
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:21:38 2010 +0100

    Update copyright: xditview.

diff --git a/debian/copyright b/debian/copyright
index e30ec1f..e7becb2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -382,7 +382,7 @@ xcursorgen:
   PERFORMANCE OF THIS SOFTWARE.
 
 xditview:
-  Copyright (c) 1991  X Consortium
+  Copyright (c) 1991, 1994 X Consortium
   
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the

commit b665344ef41875487007f4afc8b46ca47021e743
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:18:34 2010 +0100

    Update copyright: xconsole.

diff --git a/debian/copyright b/debian/copyright
index 4a83225..e30ec1f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -338,7 +338,7 @@ xclock:
   DEALINGS IN THE SOFTWARE.
 
 xconsole:
-  Copyright 1990, 1998  The Open Group
+  Copyright 1990, 1994, 1998  The Open Group
   
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
@@ -359,9 +359,6 @@ xconsole:
   Except as contained in this notice, the name of The Open Group 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 Open Group.
-   *
-   * Author:  Keith Packard, MIT X Consortium
-   */
 
 xcursorgen:
   Copyright (C) 2002 Manish Singh

commit 273218daf67540acfcd1d9e6673dc0a00425b2fd
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:14:44 2010 +0100

    Update copyright: xclock.

diff --git a/debian/copyright b/debian/copyright
index 1aaf054..4a83225 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -270,13 +270,7 @@ xclipboard:
    * Reauthored by: Keith Packard, MIT X Consortium.
 
 xclock:
-   * xclock --  Hacked from Tony Della Fera's much hacked clock program.
-   *
-   * "-strftime" option added by George Belotsky, Open Light Software Inc.
-   */
-  
-  /*
-  Copyright 1989, 1998  The Open Group
+  Copyright 1987, 1988, 1994, 1998  The Open Group
   
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
@@ -297,6 +291,51 @@ xclock:
   Except as contained in this notice, the name of The Open Group 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 Open Group.
+  
+      ------------------------------------------------------------
+  
+  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+  
+                          All Rights Reserved
+  
+  Permission to use, copy, modify, and distribute this software and its
+  documentation for any purpose and without fee is hereby granted,
+  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 Digital not be
+  used in advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+  
+  DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+  DIGITAL 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.
+  
+      ------------------------------------------------------------
+  
+  Copyright (c) 2004, 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.
 
 xconsole:
   Copyright 1990, 1998  The Open Group

commit 4bd8546e7ba709654b1cd5fbbf30a6d19859b412
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:13:07 2010 +0100

    Update copyright: x11perf.

diff --git a/debian/copyright b/debian/copyright
index ac8d1a8..1aaf054 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -148,13 +148,13 @@ x11perf:
   
                           All Rights Reserved
   
-  Permission to use, copy, modify, and distribute this software and its 
-  documentation for any purpose and without fee is hereby granted, 
+  Permission to use, copy, modify, and distribute this software and its
+  documentation for any purpose and without fee is hereby granted,
   provided that the above copyright notice appear in all copies and that
-  both that copyright notice and this permission notice appear in 
+  both that copyright notice and this permission notice appear in
   supporting documentation, and that the name of Digital not be
   used in advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.  
+  software without specific, written prior permission.
   
   DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
   ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -163,6 +163,18 @@ x11perf:
   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 (c) 1993 by Hewlett-Packard Company
+  
+  Permission to use, copy, modify, and  distribute  this  software and its
+  documentation  for  any  purpose  and  without  fee is  hereby  granted,
+  provided that the above  copyright  notice appear in all copies and that
+  both  the  copyright  notice  and  this  permission   notice  appear  in
+  supporting  documentation, and that the name of  Hewlett-Packard  not be
+  used in  advertising  or publicity  pertaining  to  distribution  of the
+  software without specific, written prior permission.
 
 xbiff:
   Copyright (c) 1988  X Consortium

commit 691acbbade102f1588508f4fd3c32767637a06b4
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:08:49 2010 +0100

    Update copyright: oclock.

diff --git a/debian/changelog b/debian/changelog
index 7fb7fb5..e73ed2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ x11-apps (7.6+1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Add xutils-dev build-dep for the macros.
+  * Update debian/copyright from upstream's COPYING files.
 
  -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 01 Nov 2010 17:14:56 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 909ee70..ac8d1a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -97,7 +97,7 @@ ico:
   PERFORMANCE OF THIS SOFTWARE.
 
 oclock:
-  Copyright 1989, 1998  The Open Group
+  Copyright 1989, 1993, 1998  The Open Group
   
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
@@ -118,6 +118,30 @@ oclock:
   Except as contained in this notice, the name of The Open Group 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 Open Group.
+  
+  Copyright (C) 1994 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 CONNEC-
+  TION 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 deal-
+  ings in this Software without prior written authorization from the X Consor-
+  ium.
 
 x11perf:
   Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.

commit adb56f6c7680ae92aa617b1a8624a193a412f141
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:04:56 2010 +0100

    Add xutils-dev build-dep for the macros.

diff --git a/debian/changelog b/debian/changelog
index c943202..7fb7fb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 x11-apps (7.6+1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * New upstream releases:
     - bitmap 1.0.5
     - ico 1.0.3
@@ -17,6 +18,9 @@ x11-apps (7.6+1) UNRELEASED; urgency=low
     - xman 1.1.1
     - xmore 1.0.2
 
+  [ Cyril Brulebois ]
+  * Add xutils-dev build-dep for the macros.
+
  -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 01 Nov 2010 17:14:56 -0400
 
 x11-apps (7.5+5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2371575..43811d8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,11 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev,
  libxcursor-dev (>= 1.1.5.2), libxext-dev (>= 1:1.0.0),
  libxft-dev (>= 2.1.8.2-6), libxkbfile-dev (>= 1:1.0.1),
  libxmuu-dev (>= 1:1.0.1), libxrender-dev (>= 1:0.9.0.2-2),
- libxt-dev (>= 1:1.0.0), xbitmaps, quilt, libxmu-dev
+ libxt-dev (>= 1:1.0.0), xbitmaps, quilt, libxmu-dev,
+ xutils-dev (>= 1:7.5+4),
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
+# xutils-dev for xorg macros
 # Individual apps:
 # bitmap: libx11-dev, libxmu-dev, xbitmaps, libxt-dev
 # ico: libx11-dev

commit a26e2760cfb83dacf9fa69fc4ccd24c55d0283fa
Author: Cyril Brulebois <kibi@debian.org>
Date:   Tue Nov 2 22:00:36 2010 +0100

    Bump version number.

diff --git a/debian/changelog b/debian/changelog
index 78fbe80..c943202 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.5+6) UNRELEASED; urgency=low
+x11-apps (7.6+1) UNRELEASED; urgency=low
 
   * New upstream releases:
     - bitmap 1.0.5


Reply to: