[SCM] gmerlin-avdecoder/master: Fix declare DEB_AUTO_UPDATE_* variables before including CDBS snippets: Used in ifeq conditionals so need to be resolved early.

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Mar 25 17:35:35 UTC 2012


The following commit has been merged in the master branch:
commit 4db17d70a1ecfbad8c00eddc1ad32c1e38b0c011
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 18:12:18 2012 +0200

    Fix declare DEB_AUTO_UPDATE_* variables before including CDBS snippets: Used in ifeq conditionals so need to be resolved early.

diff --git a/debian/rules b/debian/rules
index a711ffd..0f81138 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+DEB_AUTO_UPDATE_LIBTOOL = pre
+DEB_AUTO_UPDATE_ACLOCAL = 1.10
+DEB_AUTO_UPDATE_AUTOCONF = 2.67
+DEB_AUTO_UPDATE_AUTOHEADER = 2.67
+DEB_AUTO_UPDATE_AUTOMAKE = 1.10
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -46,12 +51,6 @@ DEB_DH_MAKESHLIBS_ARGS_ALL := -- -v$(DEB_UPSTREAM_VERSION)
 DEB_MAKE_CLEAN_TARGET = distclean
 DEB_AUTOMAKE_ARGS = --add-missing --copy
 
-DEB_AUTO_UPDATE_LIBTOOL = pre
-DEB_AUTO_UPDATE_ACLOCAL = 1.10
-DEB_AUTO_UPDATE_AUTOCONF = 2.67
-DEB_AUTO_UPDATE_AUTOHEADER = 2.67
-DEB_AUTO_UPDATE_AUTOMAKE = 1.10
-
 .PHONY: storefiles restorefiles
 
 post-patches:: storefiles

-- 
gmerlin-avdecoder packaging



More information about the pkg-multimedia-commits mailing list