libice: Changes to 'debian-unstable'
debian/changelog | 7 +++-
debian/control | 17 ++++++++++-
debian/libice-dev.install | 2 -
debian/libice-doc.install | 1
debian/rules | 69 ++++++++++++++++++++++++++++------------------
5 files changed, 64 insertions(+), 32 deletions(-)
New commits:
commit 25a6fbc379a663690989366eb1f7d378e8c804e1
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 17:01:18 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index c673440..9c960fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libice (2:1.0.8-1) UNRELEASED; urgency=low
+libice (2:1.0.8-1) unstable; urgency=low
* New upstream release.
* Bump xutils-dev, xmlto and xorg-sgml-doctools build-deps.
@@ -9,7 +9,7 @@ libice (2:1.0.8-1) UNRELEASED; urgency=low
Disable the docs in the build-arch target.
* Mark libice-dev as multi-arch capable.
- -- Julien Cristau <jcristau@debian.org> Sun, 25 Mar 2012 19:08:24 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2012 17:01:09 +0200
libice (2:1.0.7-2) unstable; urgency=low
commit 82a6d1244c76c3720aa67f24cfd30429b1a68f37
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 17:00:16 2012 +0200
Strip libICE.a
diff --git a/debian/rules b/debian/rules
index 79d8300..cb70914 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,6 +84,7 @@ binary-arch: build-arch install
dh_installchangelogs -a ChangeLog
dh_link -a
dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -a -N$(PACKAGE)
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a -V'$(PACKAGE) (>= 1:1.0.0)'
commit 8907811ef6c98e3dd17d1174d78c28726e347d26
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 16:54:31 2012 +0200
Fix up dh_install line and Multi-Arch for libice-doc
diff --git a/debian/control b/debian/control
index 42b0b3a..effbebf 100644
--- a/debian/control
+++ b/debian/control
@@ -76,6 +76,7 @@ Description: X11 Inter-Client Exchange library (development headers)
Package: libice-doc
Architecture: all
+Multi-Arch: foreign
Section: doc
Depends:
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index c299736..79d8300 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ binary-indep: build-indep install
dh_testdir
dh_testroot
dh_installdocs -i
- dh_install -i --sourcedir=debian/tmp --list-missing
+ dh_install -i --sourcedir=debian/tmp --fail-missing --exclude=libICE.la
dh_installchangelogs -i ChangeLog
dh_link -i
dh_compress -i
commit ddcdb0c581d71296575af6a133fccf15548b98eb
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 16:51:03 2012 +0200
Add missing ${misc:Depends} for the new libice-doc package
diff --git a/debian/control b/debian/control
index 9a72bb9..42b0b3a 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Description: X11 Inter-Client Exchange library (development headers)
Package: libice-doc
Architecture: all
Section: doc
+Depends:
+ ${misc:Depends},
Description: documentation for the X11 ICE protocol and library
The Inter-Client Exchange (ICE) Protocol allows for communication of data
between X clients.
commit df18f934a0ebad548747c0aa2a7960829ab88b00
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 16:48:27 2012 +0200
Mark libice-dev as multi-arch capable.
diff --git a/debian/changelog b/debian/changelog
index c917bf3..c673440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libice (2:1.0.8-1) UNRELEASED; urgency=low
* Don't require (fake)root for debian/rules clean.
* Split the protocol spec and API doc to a separate libice-doc package.
Disable the docs in the build-arch target.
+ * Mark libice-dev as multi-arch capable.
-- Julien Cristau <jcristau@debian.org> Sun, 25 Mar 2012 19:08:24 +0200
diff --git a/debian/control b/debian/control
index e3879bc..9a72bb9 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,7 @@ Description: X11 Inter-Client Exchange library (debug package)
Package: libice-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libice6 (= ${binary:Version}), x11proto-core-dev
Suggests: libice-doc
commit a3df20526a341af85978c474010234c8aae98706
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 16:46:15 2012 +0200
Split the protocol spec and API doc to a separate libice-doc package.
Disable the docs in the build-arch target.
diff --git a/debian/changelog b/debian/changelog
index 0170901..c917bf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libice (2:1.0.8-1) UNRELEASED; urgency=low
* Pass the shlib version to dh_makeshlibs instead of using a .shlibs file.
* Stop installing xorg.css, it's no longer shipped.
* Don't require (fake)root for debian/rules clean.
+ * Split the protocol spec and API doc to a separate libice-doc package.
+ Disable the docs in the build-arch target.
-- Julien Cristau <jcristau@debian.org> Sun, 25 Mar 2012 19:08:24 +0200
diff --git a/debian/control b/debian/control
index df1eaef..e3879bc 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.6+2),
-# doc:
+# doc: can be moved to b-d-i once we can depend on dpkg-dev 1.16.2
xmlto (>= 0.0.22),
xorg-sgml-doctools (>= 1:1.8),
w3m,
@@ -59,6 +59,7 @@ Package: libice-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libice6 (= ${binary:Version}), x11proto-core-dev
+Suggests: libice-doc
Description: X11 Inter-Client Exchange library (development headers)
This package provides the main interface to the X11 Inter-Client Exchange
library, which allows for communication of data between X clients.
@@ -71,3 +72,13 @@ Description: X11 Inter-Client Exchange library (development headers)
.
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libICE
+
+Package: libice-doc
+Architecture: all
+Section: doc
+Description: documentation for the X11 ICE protocol and library
+ The Inter-Client Exchange (ICE) Protocol allows for communication of data
+ between X clients.
+ .
+ This package contains the ICE protocol specification and documentation for the
+ ICE library.
diff --git a/debian/libice-dev.install b/debian/libice-dev.install
index 6d22c7b..df17b76 100644
--- a/debian/libice-dev.install
+++ b/debian/libice-dev.install
@@ -2,5 +2,3 @@ usr/include/X11/*
usr/lib/*/libICE.a
usr/lib/*/libICE.so
usr/lib/*/pkgconfig/ice.pc
-usr/share/doc/libICE/*.html usr/share/doc/libice-dev/
-usr/share/doc/libICE/*.txt usr/share/doc/libice-dev/
diff --git a/debian/libice-doc.install b/debian/libice-doc.install
new file mode 100644
index 0000000..f7ac7d9
--- /dev/null
+++ b/debian/libice-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libice-dev
diff --git a/debian/rules b/debian/rules
index 163fd3f..c299736 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,15 +37,20 @@ configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
-build: build-stamp
+build: build-indep
+build-arch: build-stamp
+build-arch: docflags = --disable-docs --disable-specs
+build-indep: build-stamp
+build-indep: docflags = --enable-docs --enable-specs
build-stamp: configure
dh_testdir
-
- test -d build || mkdir build
+ mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--infodir=\$${prefix}/share/info $(confflags) \
+ --docdir=\$${datadir}/doc/libice-dev \
+ $(docflags) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
>$@
@@ -53,7 +58,6 @@ build-stamp: configure
clean: xsfclean
dh_testdir
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -61,41 +65,51 @@ clean: xsfclean
rm -rf build
rm -f aclocal.m4 config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs INSTALL
- rm -f $$(find -name Makefile.in)
-
+ find -name Makefile.in -delete
dh_clean
-install: build
+install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
-
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- find debian/tmp/usr/share/doc/libICE/ -name '*.xml' -delete
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
dh_testdir
dh_testroot
-
- dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing --exclude=libICE.la
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip --dbg-package=$(PACKAGE)-dbg
- dh_compress
- dh_fixperms
- dh_makeshlibs -V'$(PACKAGE) (>= 1:1.0.0)'
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installdocs -a
+ dh_install -a --sourcedir=debian/tmp --fail-missing --exclude=libICE.la
+ dh_installchangelogs -a ChangeLog
+ dh_link -a
+ dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a -V'$(PACKAGE) (>= 1:1.0.0)'
+ dh_shlibdeps -a
+ dh_installdeb -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
+binary-indep: build-indep install
+ dh_testdir
+ dh_testroot
+ dh_installdocs -i
+ dh_install -i --sourcedir=debian/tmp --list-missing
+ dh_installchangelogs -i ChangeLog
+ dh_link -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: build clean binary-indep binary-arch binary install
+
+.PHONY: build-indep build-arch build
+.PHONY: binary-indep binary-arch binary
+.PHONY: install clean
Reply to: