Please sync xorg-docs (universe) from Debian unstable (main)

[Bryce Harrington]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 affects ubuntu/xorg-docs
 status confirmed
 subscribe ubuntu-archive

Please sync xorg-docs (universe) from Debian unstable (main).

Changelog since current gutsy version 1:1.4-0ubuntu1:

xorg-docs (1:1.4-2) unstable; urgency=low

  * Fix the name of the XS-Vcs-Browser field.
  * xorg-docs Conflicts/Replaces xprt-xprintorg from sarge (closes: #425461).
  * Add debian/watch.
  * Update to git HEAD, drop patch 01_specs_docs_fixes.diff applied upstream.
  * Install the upstream changelog.
  * Upload to unstable.

 -- Julien Cristau <email address hidden> Thu, 31 May 2007 22:18:53 +0200

xorg-docs (1:1.4-1) experimental; urgency=low

  [ Julien Cristau ]
  * Add XS-Vcs-Git and XS-Vcs-Browse fields to the control file.

  [ David Nusinow ]
  * New upstream version for the Xorg 7.2 release
  * Exclude anything in the "platforms" directory in dh_install
  * Require xorg-sgml-doctools 1.2 or greater to build the release notes
    with the proper dates and version numbers

 -- David Nusinow <email address hidden> Sun, 4 Mar 2007 15:25:48 -0500

xorg-docs (1:1.2+git20061105-3) unstable; urgency=low

  [ Julien Cristau ]
  * Move manpages from xspecs to xorg-docs, and rename some manpages to their
    previous names.
  * Added Build-Dependency on docbook-xml to fix FTBFS if no network is
    available. Thanks to Lucas Nussbaum <email address hidden> and
    the Grid'5000 project for the report, and Frank Küster for the fix
    (closes: #403061).

 -- David Nusinow <email address hidden> Sat, 16 Dec 2006 17:23:17 -0500

xorg-docs (1:1.2+git20061105-2) unstable; urgency=low

  [ Julien Cristau ]
  * Call $(MAKE) distclean in debian/rules clean, ignore if it fails, and
    don't ship files generated by configure (closes: #399732).

  [ David Nusinow ]
  * Add quilt as a build-depend

 -- David Nusinow <email address hidden> Tue, 21 Nov 2006 21:52:30 -0500

xorg-docs (1:1.2+git20061105-1) unstable; urgency=low

  * New source package name to match upstream. This will build the xspecs
    package as well as an xorg-docs package.
  * New upstream version. This is the 7.1 docs with updates to allow it to
    build on Debian.
  * Add the xorg-docs package which will hold the stuff in the sgml subdir
  * Remove Fabio from uploaders with his permission. He's always welcome back.
  * Bump debhelper compat to 5
  * Add build-depends on docbook >= 4.4 and docbook-utils so we can build all
    the sgml stuff
  * Bump policy to 3.7.2.2. No changes needed.
  * Enable building of postscript, pdf, html, and text docs.
    Closes: #383642, #369461
  * Don't bother with building in a separate obj- dir, since this breaks the
    sgml docs

 -- David Nusinow <email address hidden> Thu, 9 Nov 2006 21:32:30 -0500

xspecs (1:1.0.1-2) unstable; urgency=low

  * Upload to unstable

 -- David Nusinow <email address hidden> Tue, 4 Apr 2006 19:30:22 -0400

xspecs (1:1.0.1-1) experimental; urgency=low

  * First modular upload to Debian
  * Port patches from trunk
    + general/023_specs_doc_fixes.diff

 -- David Nusinow <email address hidden> Tue, 28 Feb 2006 22:39:28 -0500

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGed1dEaMBVuDmdhERAnd0AKC3SobMGsjQ6YZWBkrpZ5yrbggcrgCfQGIk
oVvHdTMTXTOee9Oj+oJzBhk=
=X0IK
-----END PGP SIGNATURE-----

[Martin Pitt (pitti)]

What were the Ubuntu changes? Why can they be dropped?

[Bryce Harrington (bryce)]

The only ubuntu changes were trivial tweaks: maintainer field, packaging copyright statement, and specifying pkg-config build-depends version (which isn't really necessary - I'm just being picky).

Debian has done some major reorganization of the package, which makes the merge complicated. It will be easier to just sync the package and add the tweaks back later.

[Sebastien Bacher (seb128)]

[Updating] xorg-docs (1:1.4-0ubuntu1 [Ubuntu] < 1:1.4-2 [Debian])
 * Trying to add xorg-docs...
  - <xorg-docs_1.4-2.diff.gz: downloading from http://ftp.debian.org/debian/>
  - <xorg-docs_1.4.orig.tar.gz: already in distro - downloading from librarian>
  - <xorg-docs_1.4-2.dsc: downloading from http://ftp.debian.org/debian/>
I: xorg-docs [universe] -> xorg-docs_1:1.4-0ubuntu1 [universe].
I: xorg-docs [universe] -> xspecs_1:1.4-0ubuntu1 [universe].