Hello community, here is the log from the commit of package xorg-x11-driver-video-unichrome for openSUSE:Factory checked in at Thu May 26 12:25:31 CEST 2011.
-------- --- xorg-x11-driver-video-unichrome/xorg-x11-driver-video-unichrome.changes 2010-12-06 22:40:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-unichrome/xorg-x11-driver-video-unichrome.changes 2011-05-23 15:09:21.000000000 +0200 @@ -1,0 +2,14 @@ +Mon May 23 13:08:14 UTC 2011 - e...@suse.de + +- Updated driver to lastest GIT version and removed the two + now obsolete patches. + +------------------------------------------------------------------- +Mon May 23 12:50:41 UTC 2011 - e...@suse.de + +- remove mandriva2007.diff. + The man page directory is handled correctly by the macros. + Neither does the patch contain any information why it is + needed nor exists any reference to this patch in this changelog. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libdrm-2.4.20.diff mandriva2007.diff missing_fclose.diff xf86-video-unichrome-3e2dd0a.tar.bz2 New: ---- xf86-video-unichrome-b917bee.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-unichrome.spec ++++++ --- /var/tmp/diff_new_pack.Xx1aqa/_old 2011-05-26 12:21:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Xx1aqa/_new 2011-05-26 12:21:47.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xorg-x11-driver-video-unichrome (Version 20091206) +# spec file for package xorg-x11-driver-video-unichrome # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -58,17 +58,14 @@ #Supplements: modalias(pci:v00001106d00001122sv*sd*bc*sc*i*) %endif AutoReqProv: on -Version: 20091206 +Version: 20110523 Release: 1 Summary: The Unichrome Project PreReq: coreutils Requires: xorg-x11-server Provides: xorg-x11-driver-video:%{_libdir}/xorg/modules/drivers/unichrome_drv.so -Source: xf86-video-unichrome-3e2dd0a.tar.bz2 +Source: xf86-video-unichrome-b917bee.tar.bz2 Source1: pci_ids -Patch1: mandriva2007.diff -Patch2: libdrm-2.4.20.diff -Patch3: missing_fclose.diff ExclusiveArch: %ix86 ia64 ppc ppc64 x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,11 +85,6 @@ %prep %setup -n xf86-video-unichrome -%if 0%{?mandriva_version} > 2006 -%patch1 -%endif -%patch2 -%patch3 %build %if 0%{?suse_version} > 1010 || 0%{?fedora_version} >= 6 || 0%{?mandriva_version} > 2006 ++++++ xf86-video-unichrome-3e2dd0a.tar.bz2 -> xf86-video-unichrome-b917bee.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/FETCH_HEAD new/xf86-video-unichrome/.git/FETCH_HEAD --- old/xf86-video-unichrome/.git/FETCH_HEAD 2010-12-06 22:33:40.000000000 +0100 +++ new/xf86-video-unichrome/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -3e2dd0afb9719295454d8d879d6f5ffde0755253 branch 'master' of git://people.freedesktop.org/~libv/xf86-video-unichrome -ac52aca2e6f808a9ecfde879c01f7a669d9cddd4 not-for-merge branch 'release-0_2_1' of git://people.freedesktop.org/~libv/xf86-video-unichrome -d493fdc039a862a94eb6505b128f4c4f06b7b788 not-for-merge branch 'release-0_2_2' of git://people.freedesktop.org/~libv/xf86-video-unichrome -bad59f24e5242a5d0e16fb19e3b632c2f548a289 not-for-merge branch 'release-0_2_3' of git://people.freedesktop.org/~libv/xf86-video-unichrome -f29eba2017a85850dd3bcc105accac4047de7dbb not-for-merge branch 'release-0_2_4' of git://people.freedesktop.org/~libv/xf86-video-unichrome -a580e37da8abd53164bf36df8bd306052f04c57f not-for-merge branch 'release-0_2_5' of git://people.freedesktop.org/~libv/xf86-video-unichrome -4b32b00759fc23aa5f397f4f1c563b431f096602 not-for-merge branch 'release-0_2_6' of git://people.freedesktop.org/~libv/xf86-video-unichrome -6db325ed9fdebf96722f5a64956914564d7820b2 not-for-merge branch 'unified' of git://people.freedesktop.org/~libv/xf86-video-unichrome -bd3a6d5cb1a544ccae9eecf7cb0b40fb6bdac287 not-for-merge branch 'xuma' of git://people.freedesktop.org/~libv/xf86-video-unichrome diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/HEAD new/xf86-video-unichrome/.git/HEAD --- old/xf86-video-unichrome/.git/HEAD 2010-12-06 22:33:32.000000000 +0100 +++ new/xf86-video-unichrome/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/ORIG_HEAD new/xf86-video-unichrome/.git/ORIG_HEAD --- old/xf86-video-unichrome/.git/ORIG_HEAD 2010-12-06 22:33:40.000000000 +0100 +++ new/xf86-video-unichrome/.git/ORIG_HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3e2dd0afb9719295454d8d879d6f5ffde0755253 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/config new/xf86-video-unichrome/.git/config --- old/xf86-video-unichrome/.git/config 2010-12-06 22:33:32.000000000 +0100 +++ new/xf86-video-unichrome/.git/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = git://people.freedesktop.org/~libv/xf86-video-unichrome/ -[branch "master"] - remote = origin - merge = refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/description new/xf86-video-unichrome/.git/description --- old/xf86-video-unichrome/.git/description 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/description 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/applypatch-msg.sample new/xf86-video-unichrome/.git/hooks/applypatch-msg.sample --- old/xf86-video-unichrome/.git/hooks/applypatch-msg.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/commit-msg.sample new/xf86-video-unichrome/.git/hooks/commit-msg.sample --- old/xf86-video-unichrome/.git/hooks/commit-msg.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/post-commit.sample new/xf86-video-unichrome/.git/hooks/post-commit.sample --- old/xf86-video-unichrome/.git/hooks/post-commit.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/post-commit.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script that is called after a successful -# commit is made. -# -# To enable this hook, rename this file to "post-commit". - -: Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/post-receive.sample new/xf86-video-unichrome/.git/hooks/post-receive.sample --- old/xf86-video-unichrome/.git/hooks/post-receive.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/post-receive.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script for the "post-receive" event. -# -# The "post-receive" script is run after receive-pack has accepted a pack -# and the repository has been updated. It is passed arguments in through -# stdin in the form -# <oldrev> <newrev> <refname> -# For example: -# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master -# -# see contrib/hooks/ for a sample, or uncomment the next line and -# rename the file to "post-receive". - -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/post-update.sample new/xf86-video-unichrome/.git/hooks/post-update.sample --- old/xf86-video-unichrome/.git/hooks/post-update.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/pre-applypatch.sample new/xf86-video-unichrome/.git/hooks/pre-applypatch.sample --- old/xf86-video-unichrome/.git/hooks/pre-applypatch.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/pre-commit.sample new/xf86-video-unichrome/.git/hooks/pre-commit.sample --- old/xf86-video-unichrome/.git/hooks/pre-commit.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ascii filenames set this variable to true. -allownonascii=$(git config hooks.allownonascii) - -# Cross platform projects tend to avoid non-ascii filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test "$(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0')" -then - echo "Error: Attempt to add a non-ascii file name." - echo - echo "This can cause problems if you want to work" - echo "with people on other platforms." - echo - echo "To be portable it is advisable to rename the file ..." - echo - echo "If you know what you are doing you can disable this" - echo "check using:" - echo - echo " git config hooks.allownonascii true" - echo - exit 1 -fi - -exec git diff-index --check --cached $against -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/pre-rebase.sample new/xf86-video-unichrome/.git/hooks/pre-rebase.sample --- old/xf86-video-unichrome/.git/hooks/pre-rebase.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up-to-date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -exit 0 - -################################################################ - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/prepare-commit-msg.sample new/xf86-video-unichrome/.git/hooks/prepare-commit-msg.sample --- old/xf86-video-unichrome/.git/hooks/prepare-commit-msg.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first comments out the -# "Conflicts:" part of a merge commit. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -case "$2,$3" in - merge,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$1" ;; - - *) ;; -esac - -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/hooks/update.sample new/xf86-video-unichrome/.git/hooks/update.sample --- old/xf86-video-unichrome/.git/hooks/update.sample 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 <ref> <oldrev> <newrev>)" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 <ref> <oldrev> <newrev>" >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 Files old/xf86-video-unichrome/.git/index and new/xf86-video-unichrome/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/info/exclude new/xf86-video-unichrome/.git/info/exclude --- old/xf86-video-unichrome/.git/info/exclude 2010-12-06 22:33:16.000000000 +0100 +++ new/xf86-video-unichrome/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/logs/HEAD new/xf86-video-unichrome/.git/logs/HEAD --- old/xf86-video-unichrome/.git/logs/HEAD 2010-12-06 22:33:32.000000000 +0100 +++ new/xf86-video-unichrome/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 3e2dd0afb9719295454d8d879d6f5ffde0755253 Stefan Dirsch <sndir...@suse.de> 1291671212 +0100 clone: from git://people.freedesktop.org/~libv/xf86-video-unichrome/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/logs/refs/heads/master new/xf86-video-unichrome/.git/logs/refs/heads/master --- old/xf86-video-unichrome/.git/logs/refs/heads/master 2010-12-06 22:33:32.000000000 +0100 +++ new/xf86-video-unichrome/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 3e2dd0afb9719295454d8d879d6f5ffde0755253 Stefan Dirsch <sndir...@suse.de> 1291671212 +0100 clone: from git://people.freedesktop.org/~libv/xf86-video-unichrome/ Files old/xf86-video-unichrome/.git/objects/pack/pack-2e37f594829f445cb864d43d91501a3646d77dd0.idx and new/xf86-video-unichrome/.git/objects/pack/pack-2e37f594829f445cb864d43d91501a3646d77dd0.idx differ Files old/xf86-video-unichrome/.git/objects/pack/pack-2e37f594829f445cb864d43d91501a3646d77dd0.pack and new/xf86-video-unichrome/.git/objects/pack/pack-2e37f594829f445cb864d43d91501a3646d77dd0.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/packed-refs new/xf86-video-unichrome/.git/packed-refs --- old/xf86-video-unichrome/.git/packed-refs 2010-12-06 22:33:32.000000000 +0100 +++ new/xf86-video-unichrome/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -# pack-refs with: peeled -bd3a6d5cb1a544ccae9eecf7cb0b40fb6bdac287 refs/remotes/origin/xuma -6db325ed9fdebf96722f5a64956914564d7820b2 refs/remotes/origin/unified -4b32b00759fc23aa5f397f4f1c563b431f096602 refs/remotes/origin/release-0_2_6 -a580e37da8abd53164bf36df8bd306052f04c57f refs/remotes/origin/release-0_2_5 -f29eba2017a85850dd3bcc105accac4047de7dbb refs/remotes/origin/release-0_2_4 -bad59f24e5242a5d0e16fb19e3b632c2f548a289 refs/remotes/origin/release-0_2_3 -d493fdc039a862a94eb6505b128f4c4f06b7b788 refs/remotes/origin/release-0_2_2 -ac52aca2e6f808a9ecfde879c01f7a669d9cddd4 refs/remotes/origin/release-0_2_1 -3e2dd0afb9719295454d8d879d6f5ffde0755253 refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/refs/heads/master new/xf86-video-unichrome/.git/refs/heads/master --- old/xf86-video-unichrome/.git/refs/heads/master 2010-12-06 22:33:32.000000000 +0100 +++ new/xf86-video-unichrome/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3e2dd0afb9719295454d8d879d6f5ffde0755253 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/.git/refs/remotes/origin/HEAD new/xf86-video-unichrome/.git/refs/remotes/origin/HEAD --- old/xf86-video-unichrome/.git/refs/remotes/origin/HEAD 2010-12-06 22:33:32.000000000 +0100 +++ new/xf86-video-unichrome/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/src/via_crt.c new/xf86-video-unichrome/src/via_crt.c --- old/xf86-video-unichrome/src/via_crt.c 2010-12-06 22:33:33.000000000 +0100 +++ new/xf86-video-unichrome/src/via_crt.c 2011-05-23 14:29:17.000000000 +0200 @@ -154,6 +154,8 @@ __func__, EDIDFileName, strerror(errno)); else Output->EDID = xf86InterpretEDID(Output->scrnIndex, Block); + + fclose(EDIDFile); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-unichrome/src/via_memory.h new/xf86-video-unichrome/src/via_memory.h --- old/xf86-video-unichrome/src/via_memory.h 2010-12-06 22:33:33.000000000 +0100 +++ new/xf86-video-unichrome/src/via_memory.h 2011-05-23 14:29:17.000000000 +0200 @@ -30,7 +30,7 @@ /* don't include local via_drm.h when using modular */ #ifdef HAVE_CONFIG_H -#include "drm/via_drm.h" +#include <via_drm.h> #else #include "via_drm.h" #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org