diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2006-04-17 14:47:48 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2006-04-17 14:47:48 +0000 |
| commit | 177ce13498fae9a89e8bd80eb5fd38b764eceaa6 (patch) | |
| tree | ed822f1dafe77a1a3c02c6931d55781bc1a32130 | |
| parent | 0b6006de75d8cb5f1d573ee425e92aa70eba298b (diff) | |
| download | xine-lib-177ce13498fae9a89e8bd80eb5fd38b764eceaa6.tar.gz xine-lib-177ce13498fae9a89e8bd80eb5fd38b764eceaa6.tar.bz2 | |
incorporate NMU
CVS patchset: 7969
CVS date: 2006/04/17 14:47:48
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 43b5b6d01..5c1a22a8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xine-lib (1.1.1-2) unstable; urgency=low - * Use external libmad (Closes: #336437) + [ Reinhard Tartler ] + * Use external libmad, acknowledging NMU (Closes: #336437) * enable support for libxvmc1, now that we have xorg in debian (Closes: #281572) * Conflict/Replaces obsolete package 'xine' (Closes: #300852) @@ -18,6 +19,16 @@ xine-lib (1.1.1-2) unstable; urgency=low -- Reinhard Tartler <siretart@tauware.de> Sun, 09 Apr 2006 02:52:02 +0100 +xine-lib (1.1.1-1.1) unstable; urgency=low + + * NMU. + * Use external libmad, which fixes crashes on amd64 on apps loading both + libxine1 and libmad0. (Closes: #336437) + * Pass --with-xv-path=/usr/lib to configure, since otherwise Xv support was + lost when compiling against modular X. + + -- Adeodato Simó <dato@net.com.org.es> Sat, 15 Apr 2006 19:34:33 +0200 + xine-lib (1.1.1-1) unstable; urgency=low * New upstream release! (Closes: #326936, #353150, #332919) diff --git a/debian/rules b/debian/rules index 49c91900d..39a030499 100755 --- a/debian/rules +++ b/debian/rules @@ -59,7 +59,7 @@ CONFIGURE_FLAGS := --prefix=/usr --mandir=\$${prefix}/share/man --with-external- configure: configure-stamp configure-stamp: dh_testdir - ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ + ./configure --prefix=/usr --mandir=\$${prefix}/share/man --with-external-libmad --with-xv-path=/usr/lib \ $(DEB_BUILD_GNU_OPTION) CFLAGS="$(CFLAGS)" touch configure-stamp |