xorg: Changes to 'debian-unstable'
debian/changelog | 8 ++++----
debian/scripts/vars.armhf | 4 +++-
xsf-docs/index.txt | 6 +++++-
xsf-docs/reference/git-usage.txt | 14 ++++++++++++--
4 files changed, 24 insertions(+), 8 deletions(-)
New commits:
commit f4492a5f80c6f22c5731f9499cfeb30ac0559d00
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 23:25:17 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index dd26853..4afcf28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+7) UNRELEASED; urgency=low
+xorg (1:7.6+7) unstable; urgency=low
* Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks,
Bernhard R. Link!
@@ -15,7 +15,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
- Update: faq/general (firmware for ATI)
- and other minor updates.
- -- Cyril Brulebois <kibi@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
+ -- Cyril Brulebois <kibi@debian.org> Fri, 03 Jun 2011 23:25:11 +0200
xorg (1:7.6+6) unstable; urgency=low
commit 4a61439eac31224007dd3529e66c6b5e87399a31
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 23:24:34 2011 +0200
Keep wacom in Recommends rather than in Depends, though.
diff --git a/debian/changelog b/debian/changelog
index 9275c34..dd26853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
* Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks,
Bernhard R. Link!
* Add support for armhf (Closes: #605841), Thanks, Konstantinos
- Margaritis!
+ Margaritis! Keep wacom in Recommends rather than in Depends, though.
* Set the same permissions on all debian/scripts/vars.* files: no need
to have them +x.
* Remove debian/scripts/validate-posix-sh, unused.
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index db0ec34..ae27e54 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -11,4 +11,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+"
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
commit 9e5ee03726d647f0678a06a605322d321f379b24
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 22:56:43 2011 +0200
Document new merge.
diff --git a/debian/changelog b/debian/changelog
index 30abb2d..9275c34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
* Remove debian/scripts/validate-posix-sh, unused.
* Address description-synopsis-starts-with-article lintian tag.
* Bump Standards-Version (no changes needed).
- * Merge xsf-docs up to the 15ac25a426 commit:
+ * Merge xsf-docs up to the f920810e8f commit:
- Add: reference/experimental
- Add: reference/git-usage
- Update: faq/general (firmware for ATI)
commit f920810e8f160b2560518802bb67b0c121a87f10
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 01:02:01 2011 +0200
index: Mention both URLs.
diff --git a/xsf-docs/index.txt b/xsf-docs/index.txt
index 9e04318..c1043a6 100644
--- a/xsf-docs/index.txt
+++ b/xsf-docs/index.txt
@@ -7,7 +7,11 @@ _The “X Strike Force” takes care of packaging X.Org for Debian._
These documents are shipped in the
http://packages.debian.org/xserver-xorg&exact=1[xserver-xorg]
-metapackage (under `/usr/share/doc/xorg`), starting with `wheezy`.
+metapackage (under `/usr/share/doc/xorg`), starting with
+`wheezy`. They are also available online at
+http://x.debian.net/[x.debian.net], which is an alias for the
+longer-to-type
+http://pkg-xorg.alioth.debian.org/[pkg-xorg.alioth.debian.org].
Getting started
---------------
commit 275ba95baf9c87991b6814c313457fb785d6d664
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 00:48:30 2011 +0200
git-usage: Specify a better title.
diff --git a/xsf-docs/reference/git-usage.txt b/xsf-docs/reference/git-usage.txt
index b9ee868..f2adb1f 100644
--- a/xsf-docs/reference/git-usage.txt
+++ b/xsf-docs/reference/git-usage.txt
@@ -10,8 +10,8 @@ http://wiki.debian.org/XStrikeForce/git-usage[wiki.debian.org/XSF/git-usage];
this documentation is just a draft for now.
-Foreword
---------
+Getting started
+---------------
Upstream repositories are hosted on
http://cgit.freedesktop.org/[git.freedesktop.org]
commit e344e58e55bb4d0016146e05c9b95aa5aaeaa564
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 00:42:16 2011 +0200
git-usage: Mention pushInsteadOf trick.
diff --git a/xsf-docs/reference/git-usage.txt b/xsf-docs/reference/git-usage.txt
index cdf89dd..b9ee868 100644
--- a/xsf-docs/reference/git-usage.txt
+++ b/xsf-docs/reference/git-usage.txt
@@ -33,6 +33,16 @@ so `origin` will likely point to `git.debian.org`. One can use
`upstream` to point to `anongit.freedesktop.org`. The following
documentation assumes this convention.
+The following bits in `~/.gitconfig` will make it possible to fetch
+updates using the `git` protocol (anonymously), and to push updates
+through `ssh` without having to fiddle with the remote’s URL (in other
+words: using `git://git.debian.org` everywhere):
+
+----
+[url "ssh://git.debian.org"]
+ pushInsteadOf = "git://git.debian.org"
+----
+
To get the repository from `git.debian.org` one can run `debcheckout
$package` (or `debcheckout $package $package.git`), which will use the
`Vcs-Git` fields in the APT cache to pick the appropriate git
Reply to: