[xine-cvs] CVS: xine-lib/debian changelog, 1.95, 1.96 rules, 1.38, 1.39

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/xine-lib/debian
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31984/debian

Modified Files:
	changelog rules 
Log Message:
Complete the auto*-running prevention option.
Make the "noopt" option also --disable-optimizations.
Assume that the next upload will be of 1.1.2.

Index: changelog
===================================================================
RCS file: /cvsroot/xine/xine-lib/debian/changelog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- changelog	9 Jul 2006 13:37:55 -0000	1.95
+++ changelog	11 Jul 2006 22:41:51 -0000	1.96
@@ -1,10 +1,15 @@
-xine-lib (1.1.1+cvs20060702-2) UNRELEASED; urgency=low
+xine-lib (1.1.2-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
+  [Reinhard Tartler]
   * updated README.Debian
 
   [Darren Salt]
-  * Option to prevent autogen.sh from being run on package build.
-    Use DEB_BUILD_OPTIONS='noauto'.
+  * Option to prevent autogen.sh from being run on package build and the
+    generated files from being removed on cleanup.
+    Use DEB_BUILD_OPTIONS='noauto' at build time to invoke this behaviour.
+  * Make DEB_BUILD_OPTIONS='noopt' also use --disable-optimizations.
 
  -- Reinhard Tartler <sir...@ta...>  Mon,  3 Jul 2006 11:13:30 +0200
 

Index: rules
===================================================================
RCS file: /cvsroot/xine/xine-lib/debian/rules,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rules	9 Jul 2006 13:37:55 -0000	1.38
+++ rules	11 Jul 2006 22:41:51 -0000	1.39
@@ -20,9 +20,12 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+DEB_BUILD_CONFIG_OPTIONS :=
+
 CFLAGS += -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
+	DEB_BUILD_CONFIG_OPTIONS += --disable-optimizations
 endif
 INSTALL_TARGET := install
 BUILD_TARGET := all
@@ -52,23 +55,26 @@
   $(warning          ignoring DEB_HOST_GNU_TYPE = $(DEB_HOST_GNU_TYPE))
   DEB_HOST_GNU_TYPE := $(DEB_BUILD_GNU_TYPE)
  endif
- DEB_BUILD_GNU_OPTION := --build=$(DEB_BUILD_GNU_TYPE)
+ DEB_BUILD_CONFIG_OPTIONS += --build=$(DEB_BUILD_GNU_TYPE)
 endif
 
+# --mandir - remove after etch released (autoconf >= 2.59c gets it right)
 CONFIGURE_FLAGS := --prefix=/usr \
 	--mandir=\$${prefix}/share/man \
 	--with-external-libmad \
-	$(DEB_BUILD_GNU_OPTION) \
+	$(DEB_BUILD_CONFIG_OPTIONS) \
 	CFLAGS="$(CFLAGS)"
 
-configure: configure-stamp $(AUTOGEN)
+configure: configure-stamp
 configure-stamp:
 	dh_testdir
-ifeq (,$(findstring noauto,$(DEB_BUILD_OPTIONS))
+ifeq (,$(findstring noauto,$(DEB_BUILD_OPTIONS)))
 	# let's run autohell on the buildds!
+	-rm -f .noauto
 	chmod +x ./autogen.sh
 	./autogen.sh $(CONFIGURE_FLAGS)
 else
+	touch .noauto
 	./configure $(CONFIGURE_FLAGS)
 endif
 	touch configure-stamp
@@ -91,8 +97,8 @@
 	rm -f build-stamp configure-stamp po/*.gmo po/stamp-po
 	-$(MAKE) distclean
 	# remove more cruft leftover by autohell
-	-find . -name Makefile.in -print | xargs rm
-	rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing
+	-test -f .noauto || find . -name Makefile.in -print | xargs rm
+	test -f .noauto || rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing
 	dh_clean
 
 install: build