debian/changelog | 70 ++++
debian/control | 15 -
debian/rules | 11
debian/scripts/validate-posix-sh | 63 ----
debian/scripts/vars.amd64 | 9
debian/scripts/vars.arm | 16 +
debian/scripts/vars.hurd-i386 | 2
debian/scripts/vars.i386 | 10
debian/scripts/vars.powerpc | 2
debian/x11-common.postinst.in | 2
debian/x11-common.postrm.in | 2
debian/x11-common.preinst.in | 2
debian/xserver-xorg.postrm.in | 2
xsf-docs/.gitignore | 1
xsf-docs/Makefile | 51 +--
xsf-docs/asciidoc-xhtml11.css | 424 ++++++++++++++++++++++++++++++
xsf-docs/asciidoc-xhtml11.js | 128 +++++++++
xsf-docs/faq/general.mdwn | 58 ----
xsf-docs/faq/general.txt | 91 ++++++
xsf-docs/howto/build-mesa.mdwn | 201 --------------
xsf-docs/howto/build-mesa.txt | 221 +++++++++++++++
xsf-docs/howto/configure-input.mdwn | 176 ------------
xsf-docs/howto/configure-input.txt | 193 +++++++++++++
xsf-docs/howto/report-bugs.mdwn | 38 --
xsf-docs/howto/report-bugs.txt | 51 +++
xsf-docs/howto/triage-bugs.mdwn | 95 ------
xsf-docs/howto/triage-bugs.txt | 104 +++++++
xsf-docs/howto/use-gdb.mdwn | 141 ---------
xsf-docs/howto/use-gdb.txt | 176 ++++++++++++
xsf-docs/howto/use-xrandr.mdwn | 173 ------------
xsf-docs/howto/use-xrandr.txt | 214 +++++++++++++++
xsf-docs/index.mdwn | 34 --
xsf-docs/index.txt | 50 +++
xsf-docs/mdwn2html | 63 ----
xsf-docs/reference/dependencies.mdwn | 221 ---------------
xsf-docs/reference/dependencies.txt | 242 +++++++++++++++++
xsf-docs/reference/experimental.txt | 98 ++++++
xsf-docs/reference/git-usage.txt | 200 ++++++++++++++
xsf-docs/reference/squeeze-backports.mdwn | 65 ----
xsf-docs/reference/squeeze-backports.txt | 76 +++++
xsf-docs/reference/upstream-contacts.mdwn | 43 ---
xsf-docs/reference/upstream-contacts.txt | 46 +++
xsf-docs/upstream-features.mdwn | 16 -
xsf-docs/upstream-features.txt | 17 +
xsf-docs/xsf.css | 96 ------
45 files changed, 2463 insertions(+), 1546 deletions(-)
New commits:
commit 00f8b1bb33decd67684a1be9e33a4d37ac7c3043
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Jun 9 16:43:41 2011 +0300
Add a note about the merge to the changelog
diff --git a/debian/changelog b/debian/changelog
index 7149141..8a6dc27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,27 @@
xorg (1:7.6+7ubuntu1) UNRELEASED; urgency=low
+ * Merge from Debian unstable, remaining changes:
+ - Add apport hook
+ - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
+ Recommends.
+ - debian/local/Xsession:
+ Truncate xsession-errors on startup if too big
+ - debian/local/Xsession.d/20x11-common_process-args:
+ Add support for session command containing args.
+ - debian/local/Xsession.d/60x11-common_localhost:
+ Authorise all processes running with the user's credentials to connect
+ to the server.
+ - debian/rules, debian/control:
+ Add dependencies on x11-common, and symlink /usr/share/doc directories
+ of all packages to x11-common's.
+ - debian/scripts/vars.*:
+ + Don't drop wacom from input-all.
+ + Add -vmmouse to input-all for amd64 and i386.
+ + Add -qxl to video-all for amd64 and i386.
+ + Add -geode to video-all for i386.
+ + Drop video drivers that are likely irrelevant for ARM.
+ - debian/xserver-xorg.postinst.in: Also migrate users from psb → vesa.
+
[ Bryce Harrington ]
* apport/source_xorg.py:
- Move Failsafe-X out of the xorg package to xdiagnose
commit 9dbfbea11b93f0f773f68550413c207438ba48c1
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Jun 9 16:12:32 2011 +0300
Bump the version in checking for x11-common failsafe conffile removals
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index 2e86601..b834efa 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -23,7 +23,7 @@
XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE"
case "$1" in
configure)
- if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu4"; then
+ if dpkg --compare-versions "$2" lt-nl "1:7.6+7ubuntu1"; then
remove_conffile_commit "/etc/gdm/failsafe-xorg.conf"
remove_conffile_commit "/etc/gdm/failsafeBlacklist"
remove_conffile_commit "/etc/gdm/failsafeDexconf"
diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in
index 6d54cfb..af470e8 100644
--- a/debian/x11-common.postrm.in
+++ b/debian/x11-common.postrm.in
@@ -20,7 +20,7 @@
XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster"
case "$1" in
abort-install|abort-upgrade)
- if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu4"; then
+ if dpkg --compare-versions "$2" lt-nl "1:7.6+7ubuntu1"; then
remove_conffile_rollback "/etc/gdm/failsafe-xorg.conf"
remove_conffile_rollback "/etc/gdm/failsafeBlacklist"
remove_conffile_rollback "/etc/gdm/failsafeDexconf"
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
index 6fbfae1..3609fa2 100644
--- a/debian/x11-common.preinst.in
+++ b/debian/x11-common.preinst.in
@@ -16,7 +16,7 @@ CONFIG_DIR=/etc/X11
#INCLUDE_SHELL_LIB#
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu4"; then
+ if dpkg --compare-versions "$2" lt-nl "1:7.6+7ubuntu1"; then
remove_conffile_lookup x11-common "/etc/gdm/failsafe-xorg.conf"
remove_conffile_lookup x11-common "/etc/gdm/failsafeBlacklist"
remove_conffile_lookup x11-common "/etc/gdm/failsafeDexconf"
commit 4db0182ea314f56521789da490a059498056186b
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Jun 9 16:05:49 2011 +0300
scripts/vars.{amd64,i386,powerpc}: drop drivers from -video-all
Remove apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo from
xserver-xorg-video-all dependencies. They are unmaintained and obsolete.
diff --git a/debian/changelog b/debian/changelog
index 30968c1..7149141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ xorg (1:7.6+7ubuntu1) UNRELEASED; urgency=low
it.
* Rework the x11-common.{postinst,postrm,preinst} failsafe conffile
handling, the previous ones added in 1:7.6+4ubuntu1 were wrong too.
+ * scripts/vars.{amd64,i386,powerpc}: Remove apm, ark, chips, i128, i740,
+ rendition, s3virge, tseng, voodoo from xserver-xorg-video-all
+ dependencies. They are unmaintained and obsolete.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 20 May 2011 17:07:13 +0300
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index c4da200..dcc028d 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -3,31 +3,24 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
- xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-ati, \
- xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-i128, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
xserver-xorg-video-qxl, \
- xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index a255aa2..06ec95c 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -3,33 +3,25 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
- xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-ati, \
- xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-geode, \
- xserver-xorg-video-i128, \
- xserver-xorg-video-i740, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
xserver-xorg-video-qxl, \
- xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware, \
"
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 65e45d7..eedc237 100644
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -4,12 +4,10 @@
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
- xserver-xorg-video-chips, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
commit f4492a5f80c6f22c5731f9499cfeb30ac0559d00
Author: Cyril Brulebois <k...@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 <k...@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
+ -- Cyril Brulebois <k...@debian.org> Fri, 03 Jun 2011 23:25:11 +0200
xorg (1:7.6+6) unstable; urgency=low
commit 4a61439eac31224007dd3529e66c6b5e87399a31
Author: Cyril Brulebois <k...@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 <k...@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 <k...@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 <k...@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 <k...@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
commit 19f60cacb0faee0f4ed4770fbf8ae19fdf7a0f19
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 2 23:08:17 2011 +0200
Document the merge.
diff --git a/debian/changelog b/debian/changelog
index 1670d93..30abb2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ 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:
+ - Add: reference/experimental
+ - Add: reference/git-usage
+ - Update: faq/general (firmware for ATI)
+ - and other minor updates.
-- Cyril Brulebois <k...@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
commit 15ac25a426af414f2cc3fdec1da8aa49d23c06b7
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 2 21:16:05 2011 +0200
reference/git-usage: New doc.
diff --git a/xsf-docs/reference/git-usage.txt b/xsf-docs/reference/git-usage.txt
new file mode 100644
index 0000000..cdf89dd
--- /dev/null
+++ b/xsf-docs/reference/git-usage.txt
@@ -0,0 +1,190 @@
+Git usage
+=========
+:toc:
+Cyril Brulebois <k...@debian.org>
+
+
+[NOTE]
+The old documentation is still available on the wiki:
+http://wiki.debian.org/XStrikeForce/git-usage[wiki.debian.org/XSF/git-usage];
+this documentation is just a draft for now.
+
+
+Foreword
+--------
+
+Upstream repositories are hosted on
+http://cgit.freedesktop.org/[git.freedesktop.org]
+
+Debian repositories are hosted on
+http://git.debian.org/[git.debian.org] under the `pkg-xorg/*`
+namespace. Each repository is about a single Debian source package.
+
+We have two types of repositories:
+
+* *regular* packages: 1 upstream repository → 1 Debian repository → 1
+ Debian source package (non-native).
+* *bundle* packages: multiple upstream repositories → 1 Debian
+ repository → 1 Debian source package (native).
+
+A local git repository can have several remotes. In the context of
+Debian packaging, one usually starts by cloning the Debian repository,
+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.
+
+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
+location. To add the `upstream` remote (using the info stored in
+`debian/watch`), one can use `xsf-remote-add-upstream` script from the
+http://git.debian.org/?p=pkg-xorg/debian/xsf-tools.git[pkg-xorg/debian/xsf-tools.git]
+repository.
+
+**TODO:** There will be more information about how to deal with the
+many repositories maintained by the X Strike Force in a later chapter.
+
+The usual workflow is to keep the target suite in `debian/changelog`
+to `UNRELEASED` until the upload happens, the last commit before a
+commit being only `dch -r`. To achieve that, and to avoid noise since
+those packages are comaintained, it’s advised to set the following
+variable in `~/.devscripts`:
+
+----
+DEBCHANGE_RELEASE_HEURISTIC=changelog
+----
+
+
+Regular packages
+----------------
+
+For most packages (exceptions include `xorg-server`), development is
+linear, and happens in a `master` branch. That `master` branch is
+pushed in the Debian repository as `upstream-$suite`
+(e.g. `upstream-unstable`), depending on the target suite. Usually,
+`upstream-unstable` tracks `upstream/master`.
+
+The packaging is kept in `debian-$suite` branches, branched from
+`upstream-$suite`. When cloning a Debian repository, the default
+branch is `debian-unstable`.
+
+To create the initial packaging from the `upstream-unstable` branch,
+just run `git checkout -b debian-unstable`, add packaging files
+(`changelog`, `control`, `copyright`, `rules` etc. under `debian/`),
+and that’s it.
+
+Here’s how to merge from upstream (`$foo` being a tag or
+`upstream/master`):
+
+----
+ git checkout upstream-unstable
+ git merge $foo
+ git log $foo > ChangeLog
+ dch -v $debianrevision
+ git commit -am 'Bump changelogs.'
+----
+
+`$debianrevision` is usually `$foo` with `-1` appended (first upload),
+and sometimes prepended with a epoch (for example `2:`). Passing
+`$foo-1` is usually a good rule of thumb, since `dch` will complain if
+the epoch is missing (given the specified version string wouldn’t be
+newer than the current one).
+
+When development isn’t linear
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For packages like `xorg-server` and `libx11`, there are stable
+branches which receive updates for a while. Trying to switch from
+`1.10.2` to `1.11.0` might trigger a lot of conflicts. But in the end
+what matters is the changes between `upstream-$suite` and
+`debian-$suite`. Here’s an example, supposing `upstream-unstable` and
+`debian-unstable` are pointing to the “old” branches, and supposing
+the new branch is `upstream/master`:
+
+----
+git checkout -b debian-unstable-new upstream/master
+git merge -s ours upstream-unstable
+git merge debian-unstable
+git branch -d debian-unstable
+git branch -m debian-unstable
+----
+
+Subtitles:
+
+* Create a `debian-unstable-new` branch starting with the upstream
+ `master` branch, and switch to it.
+* “Merge” the old `upstream-unstable` branch, actually keeping only
+ the new upstream branch.
+* Merge the old packaging on top of it.
+* Remove the old branch (so that the name can be reused).
+* Rename the current `debian-unstable-new` branch into
+ `debian-unstable`.
+
+Since the tip of the new `debian-unstable` branch is a descendant of
+the tip of the old `debian-unstable` one, it can be pushed normally.
+
+Since old `upstream-unstable` and new `upstream-unstable` diverged,
+this branch has to be pushed with a `-f` to force the update (it’s not
+a fast-forward).
+
+
+Bundle packages
+---------------
+
+One bundle package is a Debian native package, with just a (Debian)
+tarball, instead of an upstream tarball plus a Debian diff.
+
+There is no upstream branches here, only `debian-$suite`.
+
+The repository contains a `debian/` directory for the packaging, and
+one directory per upstream source. Merging a new upstream release
+means updating the contents of the relevant directory with the
+contents of the new upstream tarball. Fetching new tarballs is
+automated through a specific target: `make -f debian/rules
+get-tarballs`
+
+To perform an update, first run `dch -i` to create a new changelog
+entry if the previous commit was an upload (the new entry targets the
+`UNRELEASED` suite, see “Foreword”).
+
+Assuming `get-tarballs` made `foo-bar.tar.gz` appear in the top-level
+directory, here’s how to update (trailing slashes are not needed, just
+there to clarify we’re working on directories):
+
+----
+git rm -r foo/
+tar xf foo-bar.tar.gz
+mv foo-bar/ foo/
+git add foo/
+dch "foo bar"
+debcommit -a
+----
+
+Using the `xsf-remote-add-upstream` script will create several
+`upstream-$foo` remotes, using info stored in `debian/watch*`. This
+helps browsing the history of a given repository (rather than having
+to look at a big fat diff with autogenerated files in the middle).
+
+
+Upgrade checklist
+-----------------
+
+[NOTE]
+Since it’s likely for a reader of this page to be on her way to update
+a package, here’s a tiny upgrade checklist.
+
+Basic checks include looking into what happened to those files since
+the last packaging update:
+
+* `COPYING`: Update `debian/copyright` accordingly.
+* `configure.ac` (or `configure.in`): Update (build-)dependencies
+ accordingly.
+
+About xorg macros (they show up very often in the diff), they’re
+shipped in the `xutils-dev` package, which contains a file to help map
+macro versions and package versions:
+`/usr/share/doc/xutils-dev/versions`
+
+Some packages might have more specific instructions. That’s the case
+for at least `xorg-server`. See its `debian/README.source`, below the
+generic “how to use quilt” blurb.
commit 7cbdcdd618ab1462f19aad8c5ff50d1c9791ba4e
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 2 19:53:43 2011 +0200
Bump Standards-Version (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index d9a99c5..1670d93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
to have them +x.
* Remove debian/scripts/validate-posix-sh, unused.
* Address description-synopsis-starts-with-article lintian tag.
+ * Bump Standards-Version (no changes needed).
-- Cyril Brulebois <k...@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
diff --git a/debian/control b/debian/control
index 74c9c29..ce58f68 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois
<k...@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Build-Depends:
debhelper (>= 7),
po-debconf,
commit aba1a28f7b8abde0014d6e748fe88895ed6e2957
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 2 19:53:15 2011 +0200
Address description-synopsis-starts-with-article lintian tag.
diff --git a/debian/changelog b/debian/changelog
index f41203d..d9a99c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
* Set the same permissions on all debian/scripts/vars.* files: no need
to have them +x.
* Remove debian/scripts/validate-posix-sh, unused.
+ * Address description-synopsis-starts-with-article lintian tag.
-- Cyril Brulebois <k...@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
diff --git a/debian/control b/debian/control
index c3492ae..74c9c29 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Depends:
x11-xkb-utils
Recommends:
libgl1-mesa-dri,
-Description: the X.Org X server
+Description: X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server. It does not provide the actual server itself.
@@ -55,7 +55,7 @@ Recommends:
${F:XServer-Xorg-Video-Recommends},
Replaces: xserver-xorg-driver-all
Conflicts: xserver-xorg-driver-all
-Description: the X.Org X server -- output driver metapackage
+Description: X.Org X server -- output driver metapackage
This package depends on the full suite of output drivers for the X.Org X
server
(Xorg). It does not provide any drivers itself, and may be removed if you
wish
to only have certain drivers installed.
@@ -67,7 +67,7 @@ Depends:
${misc:Depends},
Recommends:
${F:XServer-Xorg-Input-Recommends},
-Description: the X.Org X server -- input driver metapackage
+Description: X.Org X server -- input driver metapackage
This package depends on the full suite of input drivers for the X.Org X server
(Xorg). It does not provide any drivers itself, and may be removed if you
wish
to only have certain drivers installed.
@@ -170,7 +170,7 @@ Depends:
xserver-xorg-dev,
xtrans-dev,
${misc:Depends},
-Description: the X.Org X Window System development libraries
+Description: X.Org X Window System development libraries
This metapackage provides the development libraries for the X.Org X Window
System.
.
commit 46831401f5ff822fdc9b9e3f719900ba95dd1e0a
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 2 19:24:43 2011 +0200
Remove debian/scripts/validate-posix-sh, unused.
diff --git a/debian/changelog b/debian/changelog
index 07d5df8..f41203d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
Margaritis!
* Set the same permissions on all debian/scripts/vars.* files: no need
to have them +x.
+ * Remove debian/scripts/validate-posix-sh, unused.
-- Cyril Brulebois <k...@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
diff --git a/debian/scripts/validate-posix-sh b/debian/scripts/validate-posix-sh
deleted file mode 100644
index d799369..0000000
--- a/debian/scripts/validate-posix-sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-
-# Run this before committing changes to shell scripts.
-
-PROGNAME=${0##*/}
-
-ASH="ash -n"
-BASH="bash --posix -n"
-DASH="dash -n"
-KSH="ksh -n"
-POSH="posh -n"
-ERROR=""
-
-usage () {
- cat <<EOF
-Usage: $PROGNAME SCRIPT ...
-Perform syntax checks on each SCRIPT with POSIX-compatible shells available on
-the system.
-EOF
-}
-
-howl () {
- echo "$PROGNAME: error; $*" >&2
-}
-
-warn () {
- echo "$PROGNAME: warning; $*" >&2
-}
-
-if [ -z "$1" ]; then
- usage >&2
- exit 2
-fi
-
-while [ -n "$1" ]; do
- if ! [ -r "$1" ]; then
- howl "\"$1\" does not exist or is not readable"
- usage >&2
- exit 2
- fi
- for SH in "$BASH" "$DASH" "$KSH" "$POSH"; do
- CMD=${SH%% *}
- if which "$CMD" >/dev/null 2>&1; then
- if ! $SH "$1"; then
- echo "$PROGNAME: \"$1\" failed syntax check with $CMD"
- error="yes"
- fi
- else
- warn "cannot verify correctness of \"$1\" with $CMD; shell not" \
- "available"
- fi
- done
- shift
-done
-
-if [ -n "$ERROR" ]; then
- exit 1
-fi
-
-exit 0
-
-# vim:set ai et sts=4 sw=4 tw=80:
commit d25035b59bd5e02c06757c2f1b7064692e263e5a
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 2 19:23:56 2011 +0200
Set the same permissions on all debian/scripts/vars.* files: no need to
have them +x.
diff --git a/debian/changelog b/debian/changelog
index afefbd3..07d5df8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
Bernhard R. Link!
* Add support for armhf (Closes: #605841), Thanks, Konstantinos
Margaritis!
+ * Set the same permissions on all debian/scripts/vars.* files: no need
+ to have them +x.
-- Cyril Brulebois <k...@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.kfreebsd-amd64
b/debian/scripts/vars.kfreebsd-amd64
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.kfreebsd-i386
b/debian/scripts/vars.kfreebsd-i386
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.s390 b/debian/scripts/vars.s390
old mode 100755
new mode 100644
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
old mode 100755
new mode 100644
commit 65aa191aaee83413b22c00aa7057bf9aa6ab8604
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jun 2 19:16:07 2011 +0200
Add support for armhf (Closes: #605841), Thanks, Konstantinos Margaritis!
diff --git a/debian/changelog b/debian/changelog
index f7c0eba..afefbd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ 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!
-- Cyril Brulebois <k...@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
new file mode 100644
index 0000000..db0ec34
--- /dev/null
+++ b/debian/scripts/vars.armhf
@@ -0,0 +1,14 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-nouveau, \
+ xserver-xorg-video-vesa, \
+"
+
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
commit 1087fbc35e001a3bf5b2524a6d4cb7e386a34c57
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jan 18 21:03:23 2011 +0100
Remove long obsolete XF86Config-4 on purge (Closes: #610450).
Thanks, Bernhard R. Link!
diff --git a/debian/changelog b/debian/changelog
index 3aa6a35..f7c0eba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+7) UNRELEASED; urgency=low
+
+ * Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks,
+ Bernhard R. Link!
+
+ -- Cyril Brulebois <k...@debian.org> Thu, 02 Jun 2011 19:00:42 +0200
+
xorg (1:7.6+6) unstable; urgency=low
* Merge xsf-docs up to the bd39472b0c commit:
diff --git a/debian/xserver-xorg.postrm.in b/debian/xserver-xorg.postrm.in
index 4fd7aca..652629b 100644
--- a/debian/xserver-xorg.postrm.in
+++ b/debian/xserver-xorg.postrm.in
@@ -31,7 +31,7 @@ if [ "$1" = "purge" ]; then
rm -f "$SERVER_SYMLINK"
rm -f "$XORGCONFIG_CHECKSUM" "$XORGCONFIG_ROSTER"
rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER"
- rm -f "$XORGCONFIG"
+ rm -f "$XORGCONFIG" "$XF86CONFIG"
for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do
rmdir "$DIR" 2> /dev/null || true
commit 43b3e3dea1765812360d3750120710f47f9d4450
Author: Cyril Brulebois <k...@debian.org>
Date: Fri May 27 12:41:44 2011 +0200
faq/general: Mention ati+firmware.
diff --git a/xsf-docs/faq/general.txt b/xsf-docs/faq/general.txt
index f2ea07a..015c6af 100644
--- a/xsf-docs/faq/general.txt
+++ b/xsf-docs/faq/general.txt
@@ -30,6 +30,16 @@ All drivers
preferences, through the `-dpi` X server command line option (see
++Xserver++’s manual page), or through ++xrandr++’s `--dpi` option.
+Ati driver
+~~~~~~~~~~
+
+ * _Why is it I’m getting low performances, or even crashes?_ +
+ Make sure you have installed the
+ link:http://packages.debian.org/firmware-linux&exact=1[`firmware-linux`
+ package]. The driver might still be working without the firmware,
+ but using code paths which aren’t supported as well as the “normal”
+ ones.
+
Intel driver
~~~~~~~~~~~~
commit fb2ff93ba6fb6e405626b6c7ae23c2680f5d76d3
Author: Cyril Brulebois <k...@debian.org>
Date: Sun May 1 22:28:08 2011 +0200
reference/squeeze-backports: nouveau can't be backported.
diff --git a/xsf-docs/reference/squeeze-backports.txt
b/xsf-docs/reference/squeeze-backports.txt
index 2104097..11c2e30 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -45,7 +45,7 @@ Video drivers
* `ati`: Drivers for ATI cards.
* `intel`: Driver for Intel cards.
- * `nouveau`: Driver for NVidia cards.
+ * `nouveau`: Driver for NVidia cards. Not possible since upstream’s
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nouveau.git;a=commit;h=a4d580bf05d7aac1d486e5d1ba9a2201c026e5f5[a4d580bf05].
* `fbdev` and `vesa`: Generic drivers.
* `dummy`: Dummy driver, suitable when there’s no monitor connected.
commit fddb111136c1d124e53265d1ee1832e9922ebb57
--
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/e1qufxi-0007x0...@vasks.debian.org
