libxext: Changes to 'debian-unstable'
debian/changelog | 8 +++++
debian/control | 49 ++++++++++++++++++++++++++++++++
debian/libxext-dev.install | 1
debian/libxext-doc.install | 1
debian/rules | 67 +++++++++++++++++++++++++++------------------
5 files changed, 98 insertions(+), 28 deletions(-)
New commits:
commit 4bacc071a7cd3c89515b571b4f92f359f30a8704
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 21:07:28 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6ffd4bc..de2f3cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxext (2:1.3.1-2) UNRELEASED; urgency=low
+libxext (2:1.3.1-2) unstable; urgency=low
* Split docs out to a separate libxext-doc package. libxext-dev is now
Multi-Arch: same, and libxext-doc Multi-Arch: foreign.
* Adjust debian/rules so buildds don't have to build the specs.
- -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 20:52:49 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 21:07:20 +0200
libxext (2:1.3.1-1) unstable; urgency=low
commit 824f8a2ec94a9b293ac1b55d4fd4e6f928e28883
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 21:00:56 2012 +0200
Adjust debian/rules so buildds don't have to build the specs.
diff --git a/debian/changelog b/debian/changelog
index bcafd6d..6ffd4bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxext (2:1.3.1-2) UNRELEASED; urgency=low
* Split docs out to a separate libxext-doc package. libxext-dev is now
Multi-Arch: same, and libxext-doc Multi-Arch: foreign.
+ * Adjust debian/rules so buildds don't have to build the specs.
-- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 20:52:49 +0200
diff --git a/debian/rules b/debian/rules
index ab32cc4..2e9cef8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,10 @@ else
endif
-build: build-indep build-arch
+build: build-indep
+build-indep: docflags = --enable-specs --with-xmlto --without-fop
build-indep: build-stamp
+build-arch: docflags = --disable-specs
build-arch: build-stamp
.PHONY: build build-indep build-arch
@@ -47,9 +49,9 @@ build-stamp:
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--docdir=\$${datadir}/doc/libxext-dev \
- --infodir=\$${prefix}/share/info $(confflags) \
- --with-xmlto \
- --without-fop \
+ --infodir=\$${prefix}/share/info \
+ $(confflags) \
+ $(docflags) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
>$@
@@ -67,7 +69,7 @@ clean: xsfclean
find -name Makefile.in -delete
dh_clean
-install: build
+install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
@@ -75,11 +77,11 @@ install: build
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Kill *.xml, we don't need them:
- find debian/tmp/usr/share/doc/libxext-dev -name '*.xml' -delete
- find debian/tmp/usr/share/doc/libxext-dev -name '*.db' -delete
+ -find debian/tmp/usr/share/doc/libxext-dev -name '*.xml' -delete
+ -find debian/tmp/usr/share/doc/libxext-dev -name '*.db' -delete
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
dh_testdir
dh_testroot
@@ -100,7 +102,7 @@ binary-arch: build install
dh_builddeb -s
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
dh_testdir
dh_testroot
commit 18228324740388f31f7404acb036f777972efdf5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 20:54:19 2012 +0200
Split docs out to a separate libxext-doc package.
libxext-dev is now Multi-Arch: same, and libxext-doc Multi-Arch: foreign.
diff --git a/debian/changelog b/debian/changelog
index a0e5d60..bcafd6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxext (2:1.3.1-2) UNRELEASED; urgency=low
+
+ * Split docs out to a separate libxext-doc package. libxext-dev is now
+ Multi-Arch: same, and libxext-doc Multi-Arch: foreign.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 20:52:49 +0200
+
libxext (2:1.3.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 1e40803..5b3cf7b 100644
--- a/debian/control
+++ b/debian/control
@@ -118,6 +118,7 @@ Description: X11 miscellaneous extensions library (debug package)
Package: libxext-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -125,7 +126,8 @@ Depends:
x11proto-core-dev,
x11proto-xext-dev (>= 7.0.99.2),
libx11-dev,
- xorg-sgml-doctools (>= 1:1.5),
+Suggests:
+ libxext-doc,
Description: X11 miscellaneous extensions library (development headers)
libXext provides an X Window System client interface to several extensions to
the X protocol.
@@ -160,3 +162,48 @@ Description: X11 miscellaneous extensions library (development headers)
.
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXext
+
+Package: libxext-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+Breaks:
+ libxext-dev (<< 2:1.3.1-2),
+Replaces:
+ libxext-dev (<< 2:1.3.1-2),
+Description: X11 miscellaneous extensions library (documentation)
+ libXext provides an X Window System client interface to several extensions to
+ the X protocol.
+ .
+ The supported protocol extensions are:
+ - DOUBLE-BUFFER (DBE), the Double Buffer extension;
+ - DPMS, the VESA Display Power Management System extension;
+ - Extended-Visual-Information (EVI), an extension for gathering extra
+ information about the X server's visuals;
+ - LBX, the Low Bandwidth X extension;
+ - MIT-SHM, the MIT X client/server shared memory extension;
+ - MIT-SUNDRY-NONSTANDARD, a miscellaneous extension by MIT;
+ - Multi-Buffering, the multi-buffering and stereo display extension;
+ - SECURITY, the X security extension;
+ - SHAPE, the non-rectangular shaped window extension;
+ - SYNC, the X synchronization extension;
+ - TOG-CUP, the Open Group's Colormap Utilization extension;
+ - XC-APPGROUP, the X Consortium's Application Group extension;
+ - XC-MISC, the X Consortium's resource ID querying extension;
+ - XTEST, the X test extension (this is one of two client-side
+ implementations; the other is in the libXtst library, provided by the
+ libxtst6 package);
+ .
+ libXext also provides a small set of utility functions to aid authors of
+ client APIs for X protocol extensions.
+ .
+ This package contains the documentation for the included protocol extension
+ libraries. Non-developers likely have little use for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This module can be found at
+ git://anongit.freedesktop.org/git/xorg/lib/libXext
diff --git a/debian/libxext-dev.install b/debian/libxext-dev.install
index c8de106..42deabd 100644
--- a/debian/libxext-dev.install
+++ b/debian/libxext-dev.install
@@ -3,4 +3,3 @@ usr/lib/*/libXext.a
usr/lib/*/libXext.so
usr/lib/*/pkgconfig/xext.pc
usr/include/X11/extensions/
-usr/share/doc/libxext-dev
diff --git a/debian/libxext-doc.install b/debian/libxext-doc.install
new file mode 100644
index 0000000..8854674
--- /dev/null
+++ b/debian/libxext-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libxext-dev
diff --git a/debian/rules b/debian/rules
index 89cb2dd..ab32cc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ endif
build: build-indep build-arch
-build-indep:
+build-indep: build-stamp
build-arch: build-stamp
.PHONY: build build-indep build-arch
@@ -74,34 +74,47 @@ install: build
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ # Kill *.xml, we don't need them:
+ find debian/tmp/usr/share/doc/libxext-dev -name '*.xml' -delete
+ find debian/tmp/usr/share/doc/libxext-dev -name '*.db' -delete
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
- dh_installdocs
- # Kill *.xml, we don't need them:
- find debian/tmp/usr/share/doc/libxext-dev -name '*.xml' -delete
- find debian/tmp/usr/share/doc/libxext-dev -name '*.db' -delete
- dh_install --sourcedir=debian/tmp --fail-missing -XlibXext.la
- dh_installchangelogs ChangeLog
- dh_link
- dh_installman
+ dh_installdocs -s
+ dh_install -s --sourcedir=debian/tmp --fail-missing -XlibXext.la
+ dh_installchangelogs -s ChangeLog
+ dh_link -s
+ dh_installman -s
dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
- dh_strip -N$(PACKAGE)
- dh_compress
- dh_fixperms
- dh_makeshlibs -V"$(PACKAGE) (>= 2:1.3.0)" --add-udeb=$(PACKAGE)-udeb -- -c4
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_strip -s -N$(PACKAGE)
+ dh_compress -s
+ dh_fixperms -s
+ dh_makeshlibs -s -V"$(PACKAGE) (>= 2:1.3.0)" --add-udeb=$(PACKAGE)-udeb -- -c4
+ dh_shlibdeps -s
+ dh_installdeb -s
+ dh_gencontrol -s
+ dh_md5sums -s
+ dh_builddeb -s
# Build architecture-independent files here.
binary-indep: build install
-# Nothing to do
+ dh_testdir
+ dh_testroot
+
+ dh_installdocs -i
+ dh_install -i --sourcedir=debian/tmp --fail-missing -XlibXext.la
+ dh_installchangelogs -i ChangeLog
+ dh_link -i
+ dh_installman -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
binary: binary-indep binary-arch
.PHONY: clean binary-indep binary-arch binary install
Reply to: