debian/changelog | 16 +++
debian/copyright | 59 +++++++++--
debian/scripts/debconf-updatepo | 197 ----------------------------------------
3 files changed, 62 insertions(+), 210 deletions(-)
New commits:
commit 2839fa6f4314574ec28ca33d212f2411be13ded4
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Mar 3 19:30:23 2012 +0100
Update debian/copyright
Update debian/copyright to
- add missing copyright statements
- add missing license notes
- not pretend the Debian and Ubuntu packages have different copyright
status; parts of the package are copyright Canonical, others are
copyright by various Debian folks.
Still unclear if the "Copyright Software in the Public Interest, Inc."
bits make sense, so leave them in for now.
Closes: #630830.
diff --git a/debian/changelog b/debian/changelog
index fd0d9ca..2fd4c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,15 @@ xorg (1:7.6+13) UNRELEASED; urgency=low
* Drop debian/scripts/debconf-updatepo, it looks like we're not using it
anymore.
+ * Update debian/copyright to
+ - add missing copyright statements
+ - add missing license notes
+ - not pretend the Debian and Ubuntu packages have different copyright
+ status; parts of the package are copyright Canonical, others are
+ copyright by various Debian folks.
+ Still unclear if the "Copyright Software in the Public Interest, Inc."
+ bits make sense, so leave them in for now.
+ Closes: #630830.
-- Julien Cristau <jcris...@debian.org> Sat, 03 Mar 2012 19:16:19 +0100
diff --git a/debian/copyright b/debian/copyright
index 54fc777..572288a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,6 @@
Source Package: xorg
-Debian/Ubuntu package author(s): Branden Robinson, Fabio M. Di Nitto, Daniel
- Stone.
-
-Canonical Ltd. copyright(s)/license(s):
-
-Unless otherwise noted, all modifications and additions to X.Org found in
-this Ubuntu package bear the following copyright and license terms:
+Debian/Ubuntu package authors: Branden Robinson, Fabio M. Di Nitto, Daniel
+ Stone and others
Copyright 2004-2005 Canonical Ltd.
@@ -32,12 +27,6 @@ used in advertising or otherwise to promote the sale, use or
other dealings
in this Software without prior written authorization from Canonical Ltd.
-------------------------------------------------------------------------------
-
-Debian copyright(s)/license(s):
-
-Unless otherwise noted, all modifications and additions to X.Org found in
-this Debian package bear the following copyright and license terms:
-
Copyright 1996-2002 Software in the Public Interest, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -62,3 +51,47 @@ Except as contained in this notice, the name of Software in
the Public
Interest, Inc. shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from Software in the Public Interest, Inc.
+
+--------------------------------------------------------------------------------
+Copyright 1998-2007 Branden Robinson <bran...@debian.org>.
+Copyright 2000, 2003, 2004 Progeny Linux Systems, Inc.
+Copyright 1996 Stephen Early
+Copyright 1997 Mark Eichin
+Copyright 2005 David Nusinow
+
+This is free software; you may redistribute it and/or modify
+it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2,
+or (at your option) any later version.
+
+This is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+the Debian operating system, in /usr/share/common-licenses/GPL; if
+not, write to the Free Software Foundation, Inc., 59 Temple Place,
+Suite 330, Boston, MA 02111-1307 USA
+
+--------------------------------------------------------------------------------
+© 2010-2011 Cyril Brulebois <k...@debian.org>
+
+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
+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.
+
commit 5ca6c4b7c4326e4de86f4efee3b4535afb3b8789
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Mar 3 19:17:04 2012 +0100
Drop debian/scripts/debconf-updatepo, it looks like we're not using it
anymore.
diff --git a/debian/changelog b/debian/changelog
index 5f8f3d8..fd0d9ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+13) UNRELEASED; urgency=low
+
+ * Drop debian/scripts/debconf-updatepo, it looks like we're not using it
+ anymore.
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 03 Mar 2012 19:16:19 +0100
+
xorg (1:7.6+12) unstable; urgency=high
* Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the
diff --git a/debian/scripts/debconf-updatepo b/debian/scripts/debconf-updatepo
deleted file mode 100755
index ad7fffc..0000000
--- a/debian/scripts/debconf-updatepo
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/bin/sh
-
-# This is a replacement for the real debconf-updatepo, which unfortunately
-# mangles our debian/po/templates.pot file beyond recognition.
-
-# Copyright (C) 2002-2004 Denis Barbier <barb...@debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-# Branden Robinson, 2004-11-11
-
-PROGNAME=${0##*/}
-
-usage() {
- cat <<EOF
-Usage: $PROGNAME [OPTIONS]
-Options:
- -h, --help display this help message
- -v, --verbose enable verbose mode
- --podir=DIR specify PO directory (searched by default in
- debian/po, ./po and ../po)
- --pot-header=FILE replace beginning of generated POT file with FILE
- (relative to PO directory)
- --skip-pot skip POT file; update only PO files
-EOF
-}
-
-trace () {
- if [ -n "$verbose" ]
- then
- echo "$PROGNAME: $*" >&2
- fi
-}
-
-error () {
- echo "$PROGNAME: error: $*" >&2
- exit 1
-}
-
-die () {
- error "$*"
- exit 1
-}
-
-repair_header () {
- if [ $# -ne 2 ]
- then
- die "repair_header() needs 2 arguments; got $#"
- fi
-
- trace "repairing header of $2"
- ( cat "$1"; sed -n '/^$/,$p' "$2" ) >"$2.new" && mv "$2.new" "$2"
-}
-
-: ${PODEBCONF_LIB=/usr/share/intltool-debian}
-INTLTOOL_EXTRACT=${PODEBCONF_LIB}/intltool-extract
-export INTLTOOL_EXTRACT
-
-# See intltool-extract
-INTLTOOL_DEBIAN_TYPE=po-debconf
-export INTLTOOL_DEBIAN_TYPE
-
-# Prevent automatic conversion to UTF-8 by Perl.
-unset LANGUAGE LANG LC_ALL LC_CTYPE
-
-help=
-verbose=
-podir=
-pot_header=
-skip_pot=
-
-for option
-do
- if [ -n "$prev" ]; then
- eval "$prev=\$option"
- prev=
- shift
- continue
- fi
- optarg=$(expr "$option" : '[^=]*=\(.*\)')
- case $option in
- -h | --h | --help )
- help=1 ;;
- -v | --v | --verbose )
- verbose=--verbose ;;
- --podir )
- prev=podir ;;
- --podir=* )
- podir="$optarg" ;;
- --pot-header=* )
- pot_header="$optarg" ;;
- --skip-pot )
- skip_pot=1 ;;
- -* )
- error "unknown option $option"
- usage >&2
- exit 1 ;;
- * ) break ;;
- esac
- shift
-done
-
-if [ -n "$help" ]
-then
- usage
- exit 0
-fi
-
-if [ -z "$podir" ]
-then
- for d in debian/po po ../po
- do
- if [ -d $d ]
- then
- podir=$d
- break
- fi
- done
-fi
-
-if [ -z "$podir" ]
-then
- die "No PO directory found; use --podir to specify location"
-fi
-
-if ! [ -d "$podir" ]
-then
- die "PO directory $podir is not a directory"
-fi
-
-if ! [ -f "$podir/POTFILES.in" ]
-then
- die "$podir/POTFILES.in does not exist"
-fi
-
-trace "PO directory is $podir"
-
-cd "$podir"
-
-if [ -f debian.pot ]
-then
- domain=debian
-else
- domain=templates
-fi
-
-if [ -z "$skip_pot" ]; then
- cmd="\"$PODEBCONF_LIB/intltool-update\" \"$verbose\"
--gettext-package=\"$domain\" --pot"
- eval trace "$cmd"
- if ! eval $cmd
- then
- die "intltool-update failed"
- fi
-
- # Repair the header of the POT file if necessary.
- trace "\$pot_header is $pot_header"
- if [ -n "$pot_header" ]
- then
- repair_header "$pot_header" "$domain.pot"
- fi
-else
- trace "skipping update of $domain.pot"
-fi
-
-for lang in *.po
-do
- if [ "$lang" = "*.po" ]
- then
- break
- fi
-
- if sed -e '1,/^msgid/d' -e ':t /^msgstr/,${N;/\nmsgid/q;bt;};' "$lang"
\
- | grep charset=CHARSET >/dev/null 2>&1; then
- echo "$podir/$lang: missing charset; file skipped" >&2
- continue
- fi
-
- lang=${lang%.po}
- "$PODEBCONF_LIB/intltool-update" --dist $verbose
--gettext-package=$domain $lang || exit 1
-done
-
-rm -f messages.mo 2>/dev/null
-
-# vim:set ai et sts=8 sw=8 tw=80:
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1s3tj9-0005qf...@vasks.debian.org
