Author: beatle
Date: 2006-09-20 19:43:28 -0400 (Wed, 20 Sep 2006)
New Revision: 3394
Modified:
trunk/app/compiz/debian/
trunk/app/compiz/debian/rules
Log:
Use xsfbs and set svn:externals of the debian directory accordingly.
Fixup the debian/rules file.
Property changes on: trunk/app/compiz/debian
___________________________________________________________________
Name: svn:externals
+ xsfbs svn://necrotic.deadbeast.net/xorg-x11/trunk/xsfbs
Modified: trunk/app/compiz/debian/rules
===================================================================
--- trunk/app/compiz/debian/rules 2006-09-20 21:07:42 UTC (rev 3393)
+++ trunk/app/compiz/debian/rules 2006-09-20 23:43:28 UTC (rev 3394)
@@ -9,40 +9,59 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
-
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+PACKAGE = compiz
+
+include debian/xsfbs/xsfbs.mk
+
CFLAGS = -Wall -g
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- ./autogen.sh --prefix=/usr --sysconfdir=\$${prefix}/share \
- --enable-librsvg --disable-kde \
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="$(LDFLAGS)"
- touch $@
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+INSTALL = /usr/bin/install
+confflags += --enable-librsvg \
+ --disable-kde
+
build: patch build-stamp
+build-stamp:
+ dh_testdir
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
+ mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ ../autogen.sh --prefix=/usr --sysconfdir=\$${prefix}/share $(confflags)
\
+ CFLAGS="$(CFLAGS)"
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+
touch $@
-clean: unpatch
+clean: xsfclean
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) maintainer-clean
+ rm -f build-stamp
+
+ rm -f config.cache config.log config.status
+ rm -f */config.cache */config.log */config.status
+ rm -f conftest* */conftest*
+ rm -rf autom4te.cache */autom4te.cache
+ rm -rf obj-*
+
dh_clean
install: build
@@ -50,32 +69,39 @@
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+ # the upstream build system needs this
+ ln -sf config/mkinstalldirs
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ rm mkinstalldirs
+
mv $(CURDIR)/debian/tmp/usr/bin/compiz
$(CURDIR)/debian/tmp/usr/bin/compiz.real
- install --mode 0755 debian/compiz.wrapper
$(CURDIR)/debian/tmp/usr/bin/compiz
+ $(INSTALL) --mode 0755 debian/compiz.wrapper
$(CURDIR)/debian/tmp/usr/bin/compiz
-# Build architecture-independent files here.
-binary-indep: build install
-
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs ChangeLog
+
dh_installdocs
- dh_install --sourcedir=debian/tmp
+ dh_installchangelogs
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installman
+ dh_link
dh_gconf -pcompiz-plugins
- dh_link
dh_strip
dh_compress
dh_fixperms
+ dh_shlibdeps
dh_installdeb
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
+# Build architecture-independent files here.
+binary-indep: build install
+# Nothing to do
+
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
