xsf-tools: Changes to 'master'
mrconfig | 11 ++++++-----
mrconfig.README | 2 +-
mrconfig.head | 4 +++-
3 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 482cd01fc073c00bf444d477dd138f849912f3ad
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 18 17:00:33 2010 +0100
Update git URL so that git2ssh works for this repository as well.
diff --git a/mrconfig.README b/mrconfig.README
index 2508856..48e8c8e 100644
--- a/mrconfig.README
+++ b/mrconfig.README
@@ -13,7 +13,7 @@ Go to the directory where you want to clone all XSF packages (let's
call it `~/debian-x`) and run this:
# Get XSF tools:
- git clone git://git.debian.org/pkg-xorg/debian/xsf-tools.git debian/xsf-tools.git
+ git clone git://git.debian.org/git/pkg-xorg/debian/xsf-tools.git debian/xsf-tools.git
# Make the mrconfig file visible from the top-level:
ln -s debian/xsf-tools.git/mrconfig .mrconfig
# Needed to get custom commands to work:
commit 916a0a102eb10ad429d61b69b76ee1c982c580db
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 18 16:55:01 2010 +0100
Add remote_add_upstream alias.
diff --git a/mrconfig b/mrconfig
index e84d150..d5850d7 100644
--- a/mrconfig
+++ b/mrconfig
@@ -16,7 +16,9 @@ update =
git2ssh =
sed -i 's,git://git.debian.org,ssh://git.debian.org,' $MR_REPO/.git/config
-
+# Make it easy to run this command on all repositories:
+remote_add_upstream =
+ xsf-remote-add-upstream
[app/compiz.git]
[app/grandr.git]
[app/intel-gen4asm.git]
diff --git a/mrconfig.head b/mrconfig.head
index 8456ab0..ebee71b 100644
--- a/mrconfig.head
+++ b/mrconfig.head
@@ -16,4 +16,6 @@ update =
git2ssh =
sed -i 's,git://@@host@@,ssh://@@host@@,' $MR_REPO/.git/config
-
+# Make it easy to run this command on all repositories:
+remote_add_upstream =
+ xsf-remote-add-upstream
commit d776bc65820793901fb1ea4ddd4b73e18b110df8
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 18 14:39:01 2010 +0100
Update repositories.
+ Move doc-hackers.git and git-migration.git under debian/.
+ Move lib/drm-snapshot.git under attic/.
+ Remove empty pkg-xorg.git repository.
diff --git a/mrconfig b/mrconfig
index b5f6f2b..e84d150 100644
--- a/mrconfig
+++ b/mrconfig
@@ -71,6 +71,7 @@ git2ssh =
#[attic/driver/xserver-xorg-video-sunbw2.git]
#[attic/driver/xserver-xorg-video-vga.git]
#[attic/driver/xserver-xorg-video-via.git]
+#[attic/lib/drm-snapshot.git]
#[attic/lib/libxevie.git]
#[attic/lib/libxfontcache.git]
#[attic/lib/libxkbui.git]
@@ -93,9 +94,10 @@ git2ssh =
[data/xbitmaps.git]
[data/xcursor-themes.git]
[data/xkb-data.git]
+[debian/doc-hackers.git]
+[debian/git-migration.git]
[debian/xorg.git]
[debian/xsf-tools.git]
-[doc-hackers.git]
[doc/xorg-docs.git]
[doc/xorg-sgml-doctools.git]
[driver/xserver-xorg-input-acecad.git]
@@ -166,8 +168,6 @@ git2ssh =
[font/xfonts-encodings.git]
[font/xfonts-scalable.git]
[font/xfonts-utils.git]
-[git-migration.git]
-[lib/drm-snapshot.git]
[lib/libdmx.git]
[lib/libdrm.git]
[lib/libfontenc.git]
@@ -207,7 +207,6 @@ git2ssh =
[lib/pixman.git]
[lib/xft.git]
[lib/xtrans.git]
-[pkg-xorg.git]
[proto/x11proto-bigreqs.git]
[proto/x11proto-composite.git]
[proto/x11proto-core.git]
Reply to: