[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

questions about branches/modular



Hi,

I tried to build part of the x11proto and lib packages from svn, and I
have a few questions.
- x11proto-xext-dev depends on libxi-dev; libxi build-depends on
  libx11-dev; libx11 build-depends on x11proto-xext-dev. This creates a
  cycle, which I broke by installing x11proto-xext-dev without
  libxi-dev, and everything seemed to be fine. Is this dependency really
  needed?
- many configure scripts seem to have been generated without including
  util/macros/xorgversion.m4, and so XORG_RELEASE_VERSION wasn't
  replaced by its definition;
- lib/Xi/configure and lib/xkbfile/configure are not in svn, and I think
  they should be;
- libxi failed to build the manpages. I patched man/Makefile.am,
  ran aclocal -I ../util/macros and autoconf, then patched
  debian/rules and debian/libxi-dev to install them (patch attached).

That's all for now :)

Cheers,
Julien Cristau
Index: lib/Xi/man/Makefile.am
===================================================================
--- lib/Xi/man/Makefile.am	(revision 839)
+++ lib/Xi/man/Makefile.am	(working copy)
@@ -25,6 +25,7 @@
 # from the copyright holders.
 # 
 
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 libmandir = $(mandir)/man$(LIB_MAN_SUFFIX)
 
 libman_SOURCES = \
Index: lib/Xi/debian/rules
===================================================================
--- lib/Xi/debian/rules	(revision 839)
+++ lib/Xi/debian/rules	(working copy)
@@ -64,7 +64,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp LIB_MAN_SUFFIX=3 install
 
 # Build architecture-dependent files here.
 binary-arch: build install
Index: lib/Xi/debian/libxi-dev.install
===================================================================
--- lib/Xi/debian/libxi-dev.install	(revision 839)
+++ lib/Xi/debian/libxi-dev.install	(working copy)
@@ -2,3 +2,4 @@
 usr/lib/libXi.a
 usr/lib/libXi.so
 usr/lib/pkgconfig/xi.pc
+usr/share/man/man3/*

Reply to: