X Strike Force X.Org X11 SVN commit: r1238 - branches/modular/app/xbase-clients/debian
Author: dnusinow
Date: 2006-02-19 19:48:05 -0500 (Sun, 19 Feb 2006)
New Revision: 1238
Modified:
branches/modular/app/xbase-clients/debian/changelog
branches/modular/app/xbase-clients/debian/rules
Log:
* Divide packages that we process in debian/rules by category so we can pass
the xkb packages the proper configure flags
Modified: branches/modular/app/xbase-clients/debian/changelog
===================================================================
--- branches/modular/app/xbase-clients/debian/changelog 2006-02-20 00:32:55 UTC (rev 1237)
+++ branches/modular/app/xbase-clients/debian/changelog 2006-02-20 00:48:05 UTC (rev 1238)
@@ -1,5 +1,10 @@
xbase-clients (1:1.0.1-1) experimental; urgency=low
+ [ David Nusinow ]
* First modular upload to Debian
- -- David Nusinow <dnusinow@debian.org> Mon, 30 Jan 2006 20:36:47 -0500
+ [ Eugene Konev ]
+ * Divide packages that we process in debian/rules by category so we can pass
+ the xkb packages the proper configure flags
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 19 Feb 2006 19:46:46 -0500
Modified: branches/modular/app/xbase-clients/debian/rules
===================================================================
--- branches/modular/app/xbase-clients/debian/rules 2006-02-20 00:32:55 UTC (rev 1237)
+++ branches/modular/app/xbase-clients/debian/rules 2006-02-20 00:48:05 UTC (rev 1238)
@@ -14,7 +14,10 @@
# This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list each
# subdirectory explicitly so that the build system knows what to build
-SUBDIRS="appres-X11R7.0-1.0.0 beforelight-X11R7.0-1.0.1 bitmap-X11R7.0-1.0.1 editres-X11R7.0-1.0.1 fstobdf-X11R7.0-1.0.1 iceauth-X11R7.0-1.0.1 ico-X11R7.0-1.0.1 listres-X11R7.0-1.0.1 oclock-X11R7.0-1.0.1 setxkbmap-X11R7.0-1.0.1 smproxy-X11R7.0-1.0.1 viewres-X11R7.0-1.0.1 x11perf-X11R7.0-1.0.1 xauth-X11R7.0-1.0.1 xbiff-X11R7.0-1.0.1 xcalc-X11R7.0-1.0.1 xclipboard-X11R7.0-1.0.1 xclock-X11R7.0-1.0.1 xcmsdb-X11R7.0-1.0.1 xconsole-X11R7.0-1.0.1 xcursorgen-X11R7.0-1.0.0 xdbedizzy-X11R7.0-1.0.1 xditview-X11R7.0-1.0.1 xdpyinfo-X11R7.0-1.0.1 xdriinfo-X11R7.0-1.0.0 xedit-X11R7.0-1.0.1 xev-X11R7.0-1.0.1 xeyes-X11R7.0-1.0.1 xf86dga-X11R7.0-1.0.1 xfd-X11R7.0-1.0.1 xfontsel-X11R7.0-1.0.1 xgamma-X11R7.0-1.0.1 xgc-X11R7.0-1.0.1 xhost-X11R7.0-1.0.0 xinit-X11R7.0-1.0.1 xkbcomp-X11R7.0-1.0.1 xkbevd-X11R7.0-1.0.1 xkbprint-X11R7.0-1.0.1 xkbutils-X11R7.0-1.0.1 xkill-X11R7.0-1.0.1 xload-X11R7.0-1.0.1 xlogo-X11R7.0-1.0.1 xlsatoms-X11R7.0-1.0.1 xlsclients-X11R7.0-1.0.1 xlsfonts-X11R7.0-1.0.1 xmag-X11R7.0-1.0.1 xman-X11R7.0-1.0.1 xmessage-X11R7.0-1.0.1 xmodmap-X11R7.0-1.0.0 xmore-X11R7.0-1.0.1 xprop-X11R7.0-1.0.1 xrandr-X11R7.0-1.0.1 xrdb-X11R7.0-1.0.1 xrefresh-X11R7.0-1.0.1 xsetmode-X11R7.0-1.0.0 xsetpointer-X11R7.0-1.0.0 xsetroot-X11R7.0-1.0.1 xset-X11R7.0-1.0.1 xsm-X11R7.0-1.0.1 xstdcmap-X11R7.0-1.0.1 xtrap-X11R7.0-1.0.1 xvidtune-X11R7.0-1.0.1 xvinfo-X11R7.0-1.0.1 xwd-X11R7.0-1.0.1 xwininfo-X11R7.0-1.0.1 xwud-X11R7.0-1.0.1"
+DEF_SUBDIRS=appres-X11R7.0-1.0.0 beforelight-X11R7.0-1.0.1 bitmap-X11R7.0-1.0.1 editres-X11R7.0-1.0.1 fstobdf-X11R7.0-1.0.1 iceauth-X11R7.0-1.0.1 ico-X11R7.0-1.0.1 listres-X11R7.0-1.0.1 oclock-X11R7.0-1.0.1 smproxy-X11R7.0-1.0.1 viewres-X11R7.0-1.0.1 x11perf-X11R7.0-1.0.1 xauth-X11R7.0-1.0.1 xbiff-X11R7.0-1.0.1 xcalc-X11R7.0-1.0.1 xclipboard-X11R7.0-1.0.1 xclock-X11R7.0-1.0.1 xcmsdb-X11R7.0-1.0.1 xconsole-X11R7.0-1.0.1 xcursorgen-X11R7.0-1.0.0 xdbedizzy-X11R7.0-1.0.1 xditview-X11R7.0-1.0.1 xdpyinfo-X11R7.0-1.0.1 xdriinfo-X11R7.0-1.0.0 xedit-X11R7.0-1.0.1 xev-X11R7.0-1.0.1 xeyes-X11R7.0-1.0.1 xf86dga-X11R7.0-1.0.1 xfd-X11R7.0-1.0.1 xfontsel-X11R7.0-1.0.1 xgamma-X11R7.0-1.0.1 xgc-X11R7.0-1.0.1 xhost-X11R7.0-1.0.0 xinit-X11R7.0-1.0.1 xkill-X11R7.0-1.0.1 xload-X11R7.0-1.0.1 xlogo-X11R7.0-1.0.1 xlsatoms-X11R7.0-1.0.1 xlsclients-X11R7.0-1.0.1 xlsfonts-X11R7.0-1.0.1 xmag-X11R7.0-1.0.1 xman-X11R7.0-1.0.1 xmessage-X11R7.0-1.0.1 xmodmap-X11R7.0-1.0.0 xmore-X11R7.0-1.0.1 xprop-X11R7.0-1.0.1 xrandr-X11R7.0-1.0.1 xrdb-X11R7.0-1.0.1 xrefresh-X11R7.0-1.0.1 xsetmode-X11R7.0-1.0.0 xsetpointer-X11R7.0-1.0.0 xsetroot-X11R7.0-1.0.1 xset-X11R7.0-1.0.1 xsm-X11R7.0-1.0.1 xstdcmap-X11R7.0-1.0.1 xtrap-X11R7.0-1.0.1 xvidtune-X11R7.0-1.0.1 xvinfo-X11R7.0-1.0.1 xwd-X11R7.0-1.0.1 xwininfo-X11R7.0-1.0.1 xwud-X11R7.0-1.0.1
+XKB_SUBDIRS1=setxkbmap-X11R7.0-1.0.1
+XKB_SUBDIRS2=xkbcomp-X11R7.0-1.0.1 xkbevd-X11R7.0-1.0.1 xkbprint-X11R7.0-1.0.1 xkbutils-X11R7.0-1.0.1
+SUBDIRS=$(DEF_SUBDIRS) $(XKB_SUBDIRS1) $(XKB_SUBDIRS2)
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -39,7 +42,7 @@
build: genscripts patch build-stamp
build-stamp:
dh_testdir
- for FILE in "$(SUBDIRS)"; do \
+ for FILE in $(DEF_SUBDIRS); do \
echo "$$FILE" ; \
mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
(cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
@@ -49,6 +52,28 @@
$(MAKE)) || exit 1; \
done
+ for FILE in $(XKB_SUBDIRS1); do \
+ echo "$$FILE" ; \
+ mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
+ (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
+ ../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ --with-xkb-config-root=/etc/X11/xkb \
+ CFLAGS="$(CFLAGS)" && \
+ $(MAKE)) || exit 1; \
+ done
+
+ for FILE in $(XKB_SUBDIRS2); do \
+ echo "$$FILE" ; \
+ mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
+ (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
+ ../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ --datadir=/etc \
+ CFLAGS="$(CFLAGS)" && \
+ $(MAKE)) || exit 1; \
+ done
+
touch build-stamp
clean: xsfclean
@@ -70,7 +95,7 @@
dh_clean -k
dh_installdirs
- for FILE in "$(SUBDIRS)"; do \
+ for FILE in $(SUBDIRS); do \
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
Reply to: