libx11: Changes to 'debian-unstable'
debian/changelog | 6 ++++--
debian/control | 7 ++++++-
debian/libx11-dev.install | 1 +
debian/rules | 15 ++++++++++++---
4 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit 9876d2166a39a0948d4c3f1e2cb8af96d944f102
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 23 20:50:08 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 1020a9f..b2898b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.3.2-1) UNRELEASED; urgency=low
+libx11 (2:1.3.2-1) unstable; urgency=low
[ Julien Cristau ]
* libx11-6.symbols: _XkbReadBufferCopy32, _XkbReadCopyData32 and
@@ -10,12 +10,13 @@ libx11 (2:1.3.2-1) UNRELEASED; urgency=low
- _XInitKeysymDB
- _Xevent_to_mask
* Build the Xlib specs and install them in libx11-dev.
+ * Upload to unstable.
[ Timo Aaltonen ]
* New upstream release.
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 12:50:15 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 23 Nov 2009 20:50:03 +0100
libx11 (2:1.3-1) experimental; urgency=low
commit 876430f4b4f69190cfe3cce94445eaf305e68faf
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 23 20:44:14 2009 +0100
Don't install the html docs
diff --git a/debian/rules b/debian/rules
index d336066..406822d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,9 @@ install: build
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ # groff seems to produce ugly html, so only include the pdf and txt
+ # versions
+ rm -f debian/tmp/usr/share/doc/libX11/*.html
# Build architecture-dependent files here.
binary-arch: build install
commit ee2b0f7fbadca7fddc2cd85fc282bf70b54784bf
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 23 18:15:21 2009 +0100
Build the Xlib specs and install them in libx11-dev.
diff --git a/debian/changelog b/debian/changelog
index 2705e67..1020a9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libx11 (2:1.3.2-1) UNRELEASED; urgency=low
- _XUnregisterFilter
- _XInitKeysymDB
- _Xevent_to_mask
+ * Build the Xlib specs and install them in libx11-dev.
[ Timo Aaltonen ]
* New upstream release.
diff --git a/debian/control b/debian/control
index 391b704..1bdde04 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,12 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.5~1)
+ xutils-dev (>= 1:7.5~1),
+# specs
+ groff,
+ ghostscript,
+ netpbm,
+ psutils,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git
diff --git a/debian/libx11-dev.install b/debian/libx11-dev.install
index de639f6..5d38303 100644
--- a/debian/libx11-dev.install
+++ b/debian/libx11-dev.install
@@ -3,3 +3,4 @@ usr/share/man/man3/*
usr/lib/libX11.a
usr/lib/libX11.so
usr/lib/pkgconfig/x11.pc
+usr/share/doc/libX11/* usr/share/doc/libx11-dev
diff --git a/debian/rules b/debian/rules
index 620485a..d336066 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,9 +54,13 @@ build-stamp: configure $(STAMP_DIR)/genscripts
mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ ../configure \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --enable-specs \
+ $(confflags) \
+ CFLAGS="$(CFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
@@ -74,6 +78,8 @@ clean: xsfclean
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f src/config.h.in
rm -f $$(find -name Makefile.in)
+ # leftovers from the specs build
+ rm -f specs/*.png
dh_clean
Reply to: