x11proto-xext: Changes to 'debian-unstable'
debian/changelog | 14 ++++++++++++--
debian/control | 9 ++++++---
debian/rules | 6 ++++--
debian/x11proto-xext-dev.install | 3 +++
4 files changed, 25 insertions(+), 7 deletions(-)
New commits:
commit bb5e3a2d1718c6c4341df1126c43e2ad6a9aafab
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:12:13 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 25e661f..c1b1c31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
+x11proto-xext (7.1.2-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -19,7 +19,7 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
* No longer pass --disable-shared, this option is gone.
* Add myself to Uploaders.
- -- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
+ -- Cyril Brulebois <kibi@debian.org> Sat, 06 Nov 2010 02:12:03 +0100
x11proto-xext (7.1.1-2) unstable; urgency=low
commit 555211cdd0954f207391245d65ca42b6a9af5958
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:11:54 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 40be5dd..25e661f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
* Ship *.html, *.css, and *.txt from the doc directory.
* Switch from --list-missing to --fail-missing for additional safety.
* No longer pass --disable-shared, this option is gone.
+ * Add myself to Uploaders.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
diff --git a/debian/control b/debian/control
index 0c2662d..2b6b141 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-xext
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
xutils-dev (>= 1:7.5+4),
commit 786b3a21b4de3f761d319710e1852fe5eff16cc1
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:11:34 2010 +0100
No longer pass --disable-shared, this option is gone.
diff --git a/debian/changelog b/debian/changelog
index 38977d9..40be5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
* Kill *.xml in the doc directory, no point in shipping them.
* Ship *.html, *.css, and *.txt from the doc directory.
* Switch from --list-missing to --fail-missing for additional safety.
+ * No longer pass --disable-shared, this option is gone.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
diff --git a/debian/rules b/debian/rules
index c76e476..2430a12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ build/config.status: configure
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --disable-shared \
+ --infodir=\$${prefix}/share/info \
--with-xmlto --without-fop \
$(confflags) CFLAGS="$(CFLAGS)"
commit 0fc81393de3c342dc972bf423d463a787b9e422d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:11:20 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index df65a73..38977d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Kill *.xml in the doc directory, no point in shipping them.
* Ship *.html, *.css, and *.txt from the doc directory.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
diff --git a/debian/rules b/debian/rules
index e0ca0c1..c76e476 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ binary-indep: build install
dh_installdocs
dh_installman
find debian/tmp/usr/share/doc/xextproto -name '*.xml' -delete
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs
dh_link
dh_strip
commit d04b6e2592aeb66dcdc3508ad69317db72ac0306
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:09:43 2010 +0100
Ship *.html, *.css, and *.txt from the doc directory.
diff --git a/debian/changelog b/debian/changelog
index 4730d23..df65a73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Kill *.xml in the doc directory, no point in shipping them.
+ * Ship *.html, *.css, and *.txt from the doc directory.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
diff --git a/debian/x11proto-xext-dev.install b/debian/x11proto-xext-dev.install
index 5f72853..2a0981d 100644
--- a/debian/x11proto-xext-dev.install
+++ b/debian/x11proto-xext-dev.install
@@ -1,2 +1,5 @@
usr/include/X11/extensions/*
usr/lib/pkgconfig/xextproto.pc
+usr/share/doc/xextproto/*.html usr/share/doc/x11proto-xext-dev/
+usr/share/doc/xextproto/*.css usr/share/doc/x11proto-xext-dev/
+usr/share/doc/xextproto/*.txt usr/share/doc/x11proto-xext-dev/
commit 676d8e2a9b7f963817b191708ce0f6c9bc7b3497
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:09:32 2010 +0100
Kill *.xml in the doc directory, no point in shipping them.
diff --git a/debian/changelog b/debian/changelog
index 025666f..4730d23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
* Add pkg-config build-dep.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
* Pass --with-xmlto and --without-fop, we want html and txt only.
+ * Kill *.xml in the doc directory, no point in shipping them.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
diff --git a/debian/rules b/debian/rules
index 36aa211..e0ca0c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,7 @@ binary-indep: build install
dh_installdocs
dh_installman
+ find debian/tmp/usr/share/doc/xextproto -name '*.xml' -delete
dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
commit 2af538f48975cae7251a6100bfc27bcad461c010
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:07:53 2010 +0100
Pass --with-xmlto and --without-fop, we want html and txt only.
diff --git a/debian/changelog b/debian/changelog
index 4181021..025666f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add pkg-config build-dep.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
+ * Pass --with-xmlto and --without-fop, we want html and txt only.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
diff --git a/debian/rules b/debian/rules
index 2c074b1..36aa211 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,7 @@ build/config.status: configure
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --disable-shared \
+ --with-xmlto --without-fop \
$(confflags) CFLAGS="$(CFLAGS)"
build: build-stamp
commit 4d36558fc0a54fb305416a36a4afbd79ab6db8ba
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:07:16 2010 +0100
Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
diff --git a/debian/changelog b/debian/changelog
index 368d0f1..4181021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add pkg-config build-dep.
+ * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
diff --git a/debian/control b/debian/control
index bd4a694..0c2662d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,8 @@ Build-Depends:
autoconf,
automake,
pkg-config,
+# specs:
+ xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xext
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xext.git
commit a2e280b09d96714c27d4a56dd1d6e0349cf26b94
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:06:46 2010 +0100
Add pkg-config build-dep.
diff --git a/debian/changelog b/debian/changelog
index ea6a105..368d0f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ x11proto-xext (7.1.2-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build dep for util-macros 1.10 requirement.
+ [ Cyril Brulebois ]
+ * Add pkg-config build-dep.
+
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 20:06:50 -0400
x11proto-xext (7.1.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0d22d84..bd4a694 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends:
debhelper (>= 5.0.0),
xutils-dev (>= 1:7.5+4),
autoconf,
- automake
+ automake,
+ pkg-config,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xext
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xext.git
commit 112911021b36eb8daee721b0016ae32a8c2ba583
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 02:05:14 2010 +0100
Tweak xutils-dev build-dep.
Not that it matters, but xutils-dev 1:7.5+4 is sufficient, 1:7.5+5 has
1.11.0.
diff --git a/debian/control b/debian/control
index 96332da..0d22d84 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
- xutils-dev (>= 1:7.5+5),
+ xutils-dev (>= 1:7.5+4),
autoconf,
automake
Standards-Version: 3.8.3
Reply to: