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

[Per Olofsson]

The following commit has been merged in the master branch:
commit f4fccd8ac037bf6196e41fcfcccd573489e59023
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Thu Feb 3 12:49:06 2011 +0100

    Use "dh --with autotools_dev" instead of replacing config.{sub,guess} manually.

diff --git a/debian/changelog b/debian/changelog
index b237411..8c466d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ lyx (2.0.0~beta3-2) UNRELEASED; urgency=low
   * Switch source format to 3.0 (quilt) and remove quilt references in
     rules and control.
   * Compress debs with xz instead of bzip2.
+  * Use "dh --with autotools_dev" instead of replacing
+    config.{sub,guess} manually.
 
  -- Sven Hoexter <hoexter at debian.org>  Wed, 02 Feb 2011 22:54:55 +0100
 
diff --git a/debian/rules b/debian/rules
index 178ca75..444b22f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,14 +28,9 @@ CONFIGURE_OPTIONS += \
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %:
-	dh $@
+	dh --with autotools_dev $@
 
 override_dh_auto_configure:
-	set -e; if ! [ -f config/config.sub.backup ]; then \
-		mv config/config.sub config/config.sub.backup; \
-		ln -s /usr/share/misc/config.sub config/config.sub; \
-	fi
-
 	test -d build-tree || mkdir build-tree
 	cd build-tree && ../configure $(CONFIGURE_OPTIONS)
 

-- 
LyX packaging