[SCM] mpg123/master: Use dh_autoreconf.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Mar 27 22:54:18 UTC 2012


The following commit has been merged in the master branch:
commit f0f2e086ac334389b32f04980f22fa7d53724f27
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 28 00:54:01 2012 +0200

    Use dh_autoreconf.

diff --git a/debian/control b/debian/control
index 834f23f..8512ebb 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  automake,
  autotools-dev,
  debhelper (>= 9),
+ dh-autoreconf,
  libasound2-dev [linux-any],
  libaudio-dev,
  libjack-dev,
diff --git a/debian/rules b/debian/rules
index 337b3f8..435c582 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,19 +87,7 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	if test -f "$(CURDIR)/build/config.sub"; then \
-		mv "$(CURDIR)/build/config.sub" "$(CURDIR)/debian/"; \
-	fi
-	if test -f "$(CURDIR)/build/config.guess"; then \
-		mv "$(CURDIR)/build/config.guess" "$(CURDIR)/debian/"; \
-	fi
-
-	ln -sf /usr/share/misc/config.sub "$(CURDIR)/build/"
-	ln -sf /usr/share/misc/config.guess "$(CURDIR)/build/"
-
-	# One patch touches configure.ac, so we need to regenerate the
-        # configure script.
-	autoreconf --verbose
+	dh_autoreconf --verbose
 
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	  ./configure $(CONF_COMMON) $(CONF_$(ARCH)) || \
@@ -115,18 +103,7 @@ clean:
 	-rm -f $(WRAPPER_TARGETS)
 	test ! -f Makefile || $(MAKE) distclean
 
-	if test -L "$(CURDIR)/build/config.sub"; then \
-		rm -f "$(CURDIR)/build/config.sub"; \
-		if test -e "$(CURDIR)/debian/config.sub"; then \
-			mv "$(CURDIR)/debian/config.sub" "$(CURDIR)/build/"; \
-		fi; \
-	fi
-	if test -L "$(CURDIR)/build/config.guess"; then \
-		rm -f "$(CURDIR)/build/config.guess"; \
-		if test -e "$(CURDIR)/debian/config.guess"; then \
-			mv "$(CURDIR)/debian/config.guess" "$(CURDIR)/build/"; \
-		fi; \
-	fi
+	dh_autoreconf_clean
 
 	dh_clean
 

-- 
mpg123 packaging



More information about the pkg-multimedia-commits mailing list