[Xcb-commit] Branch 'debian' - 3 commits - debian

Jamey Sharp jamey at kemper.freedesktop.org
Sun Oct 8 01:24:05 PDT 2006 

 debian/changelog         |   17 +++++++++++++++++
 debian/control           |    4 +---
 debian/copyright.debian  |    2 +-
 debian/rules             |    2 ++
 debian/watch             |    2 ++
 debian/xcb-proto.install |    2 ++
 6 files changed, 25 insertions(+), 4 deletions(-)

New commits:
diff-tree b5d4b5374a0e33a4592f3c29233aa5632fa7364a (from parents)
Merge: ae2ac93618a37cbe3c0173dd3ba602634561e0ac 2f065ed8c9e96d4f8c6555f6c7e97b362808dfaa
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sun Oct 8 01:12:59 2006 -0700

    Ignore the deletion of debian/ from master.

diff-tree ae2ac93618a37cbe3c0173dd3ba602634561e0ac (from 4b738b87b2e3791877e9e0d6ba66f48282f174f7)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sat Oct 7 23:07:17 2006 -0700

    Update Debian packaging for 1.0 RC2 release.
    
      * New upstream release.
      * No longer installs files to /usr/include/X11, so remove Pre-Depends on
        x11-common.
      * Update to Standards-Version 3.7.2 (no changes required).
      * Point specifically to http://xcb.freedesktop.org/dist in copyright file,
        rather than http://xcb.freedesktop.org .
      * Add debian/watch file.
      * Drop Depends line, which only contained empty substitution variables.
      * Add debian/xcb-proto.install, to install the pkgconfig file to /usr/share
        rather than /usr/lib.  Add DEB_DH_INSTALL_SOURCEDIR and DEB_DESTDIR to
        debian/rules, pointing to debian/tmp, to allow use of dh_install for
        renaming files.
    
    Authors: Josh Triplett <josh at freedesktop.org>, Jamey Sharp <jamey at minilop.net>

diff --git a/debian/changelog b/debian/changelog
index d64f165..bc23001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+xcb-proto (0.9.92-1) experimental; urgency=low
+
+  * New upstream release.
+  * No longer installs files to /usr/include/X11, so remove Pre-Depends on
+    x11-common.
+  * Update to Standards-Version 3.7.2 (no changes required).
+  * Point specifically to http://xcb.freedesktop.org/dist in copyright file,
+    rather than http://xcb.freedesktop.org .
+  * Add debian/watch file.
+  * Drop Depends line, which only contained empty substitution variables.
+  * Add debian/xcb-proto.install, to install the pkgconfig file to /usr/share
+    rather than /usr/lib.  Add DEB_DH_INSTALL_SOURCEDIR and DEB_DESTDIR to
+    debian/rules, pointing to debian/tmp, to allow use of dh_install for
+    renaming files.
+
+ -- Jamey Sharp <sharpone at debian.org>  Sat, 07 Oct 2006 22:55:07 -0700
+
 xcb-proto (0.9-3) experimental; urgency=low
 
   * Stop running autoreconf in debian/rules, and remove Build-Depends for
diff --git a/debian/control b/debian/control
index 248c618..e2ca70c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,10 @@ Priority: optional
 Maintainer: XCB Developers <xcb at lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone at debian.org>, Josh Triplett <josh at freedesktop.org>
 Build-Depends: cdbs, debhelper (>= 4.0.0), libxml2-utils
-Standards-Version: 3.6.1
+Standards-Version: 3.7.2
 
 Package: xcb-proto
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding - protocol descriptions
  xcb-proto contains descriptions of the X Window System core protocol and
  selected extensions in an XML-based data format. The X C Binding (XCB)
diff --git a/debian/copyright.debian b/debian/copyright.debian
index 7cd330a..fa33d3c 100644
--- a/debian/copyright.debian
+++ b/debian/copyright.debian
@@ -3,7 +3,7 @@ Thu, 18 Mar 2004 00:48:42 -0800, and lat
 <josh at freedesktop.org>.  The package is co-maintained by the XCB developers
 via the XCB mailing list <xcb at lists.freedesktop.org>.
 
-It was downloaded from http://xcb.freedesktop.org.
+It was downloaded from http://xcb.freedesktop.org/dist
 
 Upstream Authors: Jamey Sharp <sharpone at debian.org>
                   Josh Triplett <josh at freedesktop.org>
diff --git a/debian/rules b/debian/rules
index 631795d..229aac4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@ include /usr/share/cdbs/1/rules/debhelpe
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_MAKE_CHECK_TARGET=check
+DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+DEB_DESTDIR=$(CURDIR)/debian/tmp
 
 debian/copyright: debian/copyright.debian COPYING
 	cat $+ > $@
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..3d87793
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xcb.freedesktop.org/dist/xcb-proto-([0-9].*)\.tar\.gz
diff --git a/debian/xcb-proto.install b/debian/xcb-proto.install
new file mode 100644
index 0000000..4fbbf54
--- /dev/null
+++ b/debian/xcb-proto.install
@@ -0,0 +1,2 @@
+usr/lib/pkgconfig/xcb-proto.pc usr/share/pkgconfig
+usr/share/xcb
diff-tree 2f065ed8c9e96d4f8c6555f6c7e97b362808dfaa (from 4b738b87b2e3791877e9e0d6ba66f48282f174f7)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sat Oct 7 22:49:45 2006 -0700

    Move debian/ directory to new branch "debian".

diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index 5e2160e..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-compat
-stamp-*
-tmp
-files
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index d64f165..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,44 +0,0 @@
-xcb-proto (0.9-3) experimental; urgency=low
-
-  * Stop running autoreconf in debian/rules, and remove Build-Depends for
-    autoconf and automake.
-  * Debian X11R7 transition:
-    * Install protocol descriptions to /usr/include/X11, not
-      /usr/X11R6/include/X11.
-    * Pre-Depends: x11-common (>= 1:1.09).
-  * Validate the protocol descriptions during the build:
-    * Set DEB_MAKE_CHECK_TARGET=check in debian/rules.
-    * Add Build-Depends on libxml2-utils for xmllint.
-  * Remove Bugs field in control, so bugs go to the Debian BTS.
-  * Set distribution to experimental.
-
- -- Josh Triplett <josh at freedesktop.org>  Sat, 29 Apr 2006 10:57:24 -0700
-
-xcb-proto (0.9-2) unstable; urgency=low
-
-  * Change Architecture from any to all; these protocol descriptions are
-    architecture-independent.
-  * Remove fd.o prefix from package name.
-  * Change Maintainer to xcb at lists.freedesktop.org, move myself to
-    Uploaders, and add Jamey Sharp to Uploaders.  Update copyright.debian
-    accordingly.
-  * Add Bugs field pointing to xcb at lists.freedesktop.org.
-  * Update homepage URL in description and copyright.debian to
-    http://xcb.freedesktop.org, and put it in a Homepage: field in the
-    description.
-
- -- Josh Triplett <josh at freedesktop.org>  Wed, 23 Mar 2005 13:03:45 -0800
-
-fd.o-xcb-proto (0.9-1) unstable; urgency=low
-
-  * New version with XML protocol descriptions.
-  * Updated Debian packaging.
-
- -- Josh Triplett <josh at freedesktop.org>  Fri, 29 Oct 2004 15:11:09 -0700
-
-fd.o-xcb-proto (0.8-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Jamey Sharp <sharpone at debian.org>  Thu, 18 Mar 2004 00:09:03 -0800
-
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 248c618..0000000
--- a/debian/control
+++ /dev/null
@@ -1,31 +0,0 @@
-Source: xcb-proto
-Section: libdevel
-Priority: optional
-Maintainer: XCB Developers <xcb at lists.freedesktop.org>
-Uploaders: Jamey Sharp <sharpone at debian.org>, Josh Triplett <josh at freedesktop.org>
-Build-Depends: cdbs, debhelper (>= 4.0.0), libxml2-utils
-Standards-Version: 3.6.1
-
-Package: xcb-proto
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: x11-common (>= 1:1.09)
-Description: X C Binding - protocol descriptions
- xcb-proto contains descriptions of the X Window System core protocol and
- selected extensions in an XML-based data format. The X C Binding (XCB)
- library uses these descriptions to generate much of its code. You only need
- this package if you want to compile XCB or otherwise make use of these
- protocol descriptions.
- .
- The XCB library provides an interface to the X Window System protocol,
- designed to replace the Xlib interface.  XCB provides several advantages over
- Xlib:
- .
-  * Size: small library and lower memory footprint
-  * Latency hiding: batch several requests and wait for the replies later
-  * Direct protocol access: one-to-one mapping between interface and protocol
-  * Thread support: access XCB from multiple threads, with no explicit locking
-  * Easy creation of new extensions: automatically generates interface from
-    machine-parsable protocol descriptions
- .
- Homepage: http://xcb.freedesktop.org
diff --git a/debian/copyright.debian b/debian/copyright.debian
deleted file mode 100644
index 7cd330a..0000000
--- a/debian/copyright.debian
+++ /dev/null
@@ -1,12 +0,0 @@
-This package was debianized by Jamey Sharp <sharpone at debian.org> on
-Thu, 18 Mar 2004 00:48:42 -0800, and later updated by Josh Triplett
-<josh at freedesktop.org>.  The package is co-maintained by the XCB developers
-via the XCB mailing list <xcb at lists.freedesktop.org>.
-
-It was downloaded from http://xcb.freedesktop.org.
-
-Upstream Authors: Jamey Sharp <sharpone at debian.org>
-                  Josh Triplett <josh at freedesktop.org>
-
-Copyright:
-
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index b580384..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/xml-xcb.txt
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 631795d..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-DEB_MAKE_CHECK_TARGET=check
-
-debian/copyright: debian/copyright.debian COPYING
-	cat $+ > $@
-
-clean::
-	-rm -f debian/copyright
-
-common-install-prehook-arch common-install-prehook-indep:: debian/copyright

More information about the xcb-commit mailing list