[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta3-511-g8350c2a

[Per Olofsson]

The following commit has been merged in the master branch:
commit cf9409ed62fcc12fc7b25a9cf9626a85e754f6d3
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Thu Feb 3 17:23:03 2011 +0100

    Use dh_auto_* for building and cleaning.

diff --git a/debian/changelog b/debian/changelog
index 8cb639c..6c65b0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ lyx (2.0.0~beta3-2) UNRELEASED; urgency=low
   * Use "dh --with autotools_dev" instead of replacing
     config.{sub,guess} manually.
   * Use debhelper v8 compat mode.
+  * Use dh_auto_* for building and cleaning.
 
  -- Sven Hoexter <hoexter at debian.org>  Wed, 02 Feb 2011 22:54:55 +0100
 
diff --git a/debian/rules b/debian/rules
index 9ce71b5..8420297 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,50 +1,25 @@
 #!/usr/bin/make -f
 
-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))
-	CONFIGURE_OPTIONS += --build $(DEB_HOST_GNU_TYPE)
-else
-	CONFIGURE_OPTIONS += --build $(DEB_BUILD_GNU_TYPE) \
-		--host $(DEB_HOST_GNU_TYPE)
-endif
-
-CONFIGURE_OPTIONS += \
-	--prefix=/usr \
-	--mandir=/usr/share/man \
-	--disable-dependency-tracking \
-	--disable-rpath \
-	--enable-warnings \
-	--enable-nls \
-	--with-gnu-ld \
-	--without-aspell \
-	--without-hunspell \
-	--with-enchant \
-	--with-x \
-	--without-included-gettext \
-	--without-included-boost \
-
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev --builddirectory
 
 override_dh_auto_configure:
-	test -d build-tree || mkdir build-tree
-	cd build-tree && ../configure $(CONFIGURE_OPTIONS)
-
-override_dh_auto_build:
-	cd build-tree && $(MAKE)
-
-override_dh_auto_clean:
-	! test -e build-tree || rm -r build-tree
-
-# clean out compiled python code left around after building
-	find lib -name '*.pyc' -exec rm -v {} \;
+	dh_auto_configure -- \
+		--disable-rpath \
+		--enable-warnings \
+		--enable-nls \
+		--with-gnu-ld \
+		--without-aspell \
+		--without-hunspell \
+		--with-enchant \
+		--with-x \
+		--without-included-gettext \
+		--without-included-boost \
 
 override_dh_auto_install:
-	cd build-tree && $(MAKE) install DESTDIR=`pwd`/../debian/lyx-common
+	dh_auto_install --destdir=debian/lyx-common
 
 # move binaries to arch package
 	mkdir -p debian/lyx/usr/share

-- 
LyX packaging