libxaw: Changes to 'debian-unstable'
debian/changelog | 6 ++++--
debian/control | 5 ++++-
debian/libxaw7-dev.README.Debian | 2 --
debian/libxaw7-dev.install | 1 +
debian/rules | 3 +++
5 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit a8faecc7e0d7bced03b28101df7a460b21128f7d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 13:48:05 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index dfd168b..fb9c1d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxaw (2:1.0.7-1) UNRELEASED; urgency=low
+libxaw (2:1.0.7-1) unstable; urgency=low
[ Julien Cristau ]
* Add header to 01_Xaw_StripChart_fix.diff. This way it's not necessary to
@@ -12,7 +12,7 @@ libxaw (2:1.0.7-1) UNRELEASED; urgency=low
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
* Bump Standards-Version to 3.8.3.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 13:00:43 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 25 Nov 2009 13:47:36 +0100
libxaw (2:1.0.6-1) unstable; urgency=low
commit 283739c54721380ab380c7e87c5a37a94217ea32
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 13:46:08 2009 +0100
README.Debian pointed at this doc in xspecs, it's now unnecessary.
diff --git a/debian/changelog b/debian/changelog
index 67f2cf7..dfd168b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxaw (2:1.0.7-1) UNRELEASED; urgency=low
go look at the changelog for xfree86 4.2.1-5 to figure out what this is
about.
* Build the Xaw spec and install it in libxaw7-dev.
+ * README.Debian pointed at this doc in xspecs, it's now unnecessary.
[ Timo Aaltonen ]
* New upstream release.
diff --git a/debian/libxaw7-dev.README.Debian b/debian/libxaw7-dev.README.Debian
deleted file mode 100644
index a3a6b90..0000000
--- a/debian/libxaw7-dev.README.Debian
+++ /dev/null
@@ -1,2 +0,0 @@
-Further documentation may be found among the X specification files, provided by
-the xspecs package (at /usr/share/X11/doc/hardcopy/Xaw).
commit f2d0f3e73e868cb0a6824c62c8971848aa7bb395
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 13:40:20 2009 +0100
Build the Xaw spec and install it in libxaw7-dev.
diff --git a/debian/changelog b/debian/changelog
index e7b7ad7..67f2cf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxaw (2:1.0.7-1) UNRELEASED; urgency=low
* Add header to 01_Xaw_StripChart_fix.diff. This way it's not necessary to
go look at the changelog for xfree86 4.2.1-5 to figure out what this is
about.
+ * Build the Xaw spec and install it in libxaw7-dev.
[ Timo Aaltonen ]
* New upstream release.
diff --git a/debian/control b/debian/control
index b98931d..2c1ecd4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,10 @@ Build-Depends:
autoconf,
automake,
libtool,
- xutils-dev (>= 1:7.5~1)
+ xutils-dev (>= 1:7.5~1),
+# specs
+ groff,
+ ghostscript,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxaw
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxaw.git
diff --git a/debian/libxaw7-dev.install b/debian/libxaw7-dev.install
index 89d9baa..d4e30ed 100644
--- a/debian/libxaw7-dev.install
+++ b/debian/libxaw7-dev.install
@@ -3,3 +3,4 @@ usr/lib/libXaw7.so
usr/lib/pkgconfig/xaw7.pc
usr/include/X11/*
usr/share/man/man3/*
+usr/share/doc/libXaw/* usr/share/doc/libxaw7-dev
diff --git a/debian/rules b/debian/rules
index 305b5c1..cdd6db5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--disable-xaw6 --disable-xaw8 \
+ --enable-docs \
CFLAGS="$(CFLAGS)"
build: build-stamp
@@ -71,6 +72,8 @@ install: build
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ # the generated html looks ugly, don't ship it
+ rm -f debian/tmp/usr/share/doc/libXaw/widgets.html
# Build architecture-dependent files here.
binary-arch: build install
Reply to: