diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/rules | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9fd991c9e..1cb35e7f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ xine-lib (1.1.1+cvs20060702-2) UNRELEASED; urgency=low * updated README.Debian + [Darren Salt] + * Option to prevent autogen.sh from being run on package build. + Use DEB_BUILD_OPTIONS='noauto'. + -- Reinhard Tartler <siretart@tauware.de> Mon, 3 Jul 2006 11:13:30 +0200 xine-lib (1.1.1+cvs20060702-1) experimental; urgency=low @@ -50,7 +54,7 @@ xine-lib (1.1.1-2) unstable; urgency=medium * enable support for libxvmc1, now that we have xorg in debian (Closes: #281572) * Conflict/Replaces obsolete package 'xine' (Closes: #300852) - * Incorporated Darrens Changes into a new maintainer upload + * Incorporated Darren's changes into a new maintainer upload. * medium urgency, although security fixes a lot of other functionality changes * Some more fixages to inline usage in internal copy of ffmpeg, continuing diff --git a/debian/rules b/debian/rules index 3a5af27ef..889a909db 100755 --- a/debian/rules +++ b/debian/rules @@ -30,6 +30,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_TARGET := install-debug BUILD_TARGET := debug endif +# note also "noauto" to inhibit running of autogen.sh DEB_BUILD_GNU_OPTION := # the "optimize" flag disables compatibility hacks @@ -60,12 +61,16 @@ CONFIGURE_FLAGS := --prefix=/usr \ $(DEB_BUILD_GNU_OPTION) \ CFLAGS="$(CFLAGS)" -configure: configure-stamp +configure: configure-stamp $(AUTOGEN) configure-stamp: dh_testdir +ifeq (,$(findstring noauto,$(DEB_BUILD_OPTIONS)) # let's run autohell on the buildds! chmod +x ./autogen.sh ./autogen.sh $(CONFIGURE_FLAGS) +else + ./configure $(CONFIGURE_FLAGS) +endif touch configure-stamp build: configure-stamp build-stamp |