Commit 80ceb11c authored by Keith Packard's avatar Keith Packard
Browse files

Add files used to merge the repositories


Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
parent fa8997ab
./.gitignore
./AUTHORS
./autogen.sh
./configure.ac
./COPYING
./docbook.am
./Makefile.am
./README
./specs/Makefile.am
./specs/.gitignore
#!/bin/sh
for i in `cat protos`; do
sed -e "s/^pkgconfig/${i}pkgconfig/" \
-e "s/EXTRA_DIST/${i}_EXTRA_DIST/" \
-e 's/#.*$//' \
-e '/MAINTAINERCLEANFILES/d' \
-e '/PHONY/d' \
-e '/SUBDIRS=specs/d' \
-e '/ChangeLog/d' \
-e '/CHANGELOG/d' \
-e '/INSTALL/d' \
-e '/dist-hook/d' \
$i/Makefile.am
done | cat -s |
awk '/dist_doc_DATA/ { doc[ndoc++] = $3; }
{ print $0 }
END { print "SUBDIRS=specs"; print; print "dist_doc_DATA = \\"; for (i in doc) printf "\t%s \\\n", doc[i]; }'
#!/bin/sh
for i in `cat protos | grep -v x11proto`; do
git merge --allow-unrelated-histories $i/master --commit --no-edit -m"Merge $i"
./move-protos $i
done
#!/bin/sh
case $# in
1)
me="$1"
;;
*)
echo 'Usage: $0 <my-name>'
exit 1
;;
esac
for i in `cat duplicate-files`; do
if [ -f $i ]; then
mkdir -p $me/`dirname $i`
echo git mv $i $me/$i
git mv $i $me/$i
fi
done
git commit -m"Move common $me files out of the way"
applewmproto
bigreqsproto
calibrateproto
compositeproto
damageproto
dmxproto
dri2proto
dri3proto
evieproto
fixesproto
fontcacheproto
fontsproto
glproto
inputproto
kbproto
lg3dproto
panoramixproto
pmproto
presentproto
printproto
randrproto
recordproto
renderproto
resourceproto
scrnsaverproto
trapproto
videoproto
windowswmproto
x11proto
xcmiscproto
xextproto
xf86bigfontproto
xf86dgaproto
xf86driproto
xf86miscproto
xf86rushproto
xf86vidmodeproto
xineramaproto
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment