summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog36
-rwxr-xr-xdebian/rules2
2 files changed, 27 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 22a88c335..79371582a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,33 @@
-xine-lib (1.1.2-1) UNRELEASED; urgency=low
-
- * New upstream release.
-
- [Reinhard Tartler]
+xine-lib (1.1.2-2) unstable; urgency=low
+
+ * readd debian/watch file
+ * update debian/rules from CVS. more complete handling of noauto flag
+ to prevent running auto* tools.
+ * disable AC_C_ALWAYS_INLINE from configure.ac. Should fix FTBFS on a
+ number of architectures.
+ * added patch from Darren Salt to fix build with -O0 on at least amd64
+ in src/libffmpeg/libavcodec/i386/Makefile.am
+
+ -- Reinhard Tartler <siretart@tauware.de> Thu, 13 Jul 2006 11:18:10 +0200
+
+xine-lib (1.1.2-1) unstable; urgency=low
+
+ * New upstream release: 1.1.2
+ * use internal ffmpeg for upload to unstable, we will reinvestigate again
+ in experimental later..
+ * [sparc] Upstream fixed '--enable-vis'. So if compiling with vis, we are
+ using -mcpu=v9. This creates binaries, which probably segfault on 'true'
+ sparc32, but these poor old machines are not going to have much fun with
+ xine anyway... If there is an increasing demand for non-vis sparc
+ binaries, please contact me
* updated README.Debian
+ * use AM_MAINTAINER_MODE in configure.ac again
[Darren Salt]
- * 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.
+ * 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
+ -- Reinhard Tartler <siretart@tauware.de> Wed, 12 Jul 2006 09:53:38 +0200
xine-lib (1.1.1+cvs20060702-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index d2c274119..a6751c047 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,9 +33,9 @@ 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
ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS)))
$(warning trying to disable machine-specific optimizations)