* bootstrap:

    + Disabled a redundant BUILT_SOURCES variable.
  * debian/woody-buildpackage:
    + Disable skins for woody (no WxWindows).
    + Do not build a diff since we always use the pristine tarball.

diff --git a/bootstrap b/bootstrap
index f238eb660dc8bae96cafc180ea39e2190fb62005..43bde92246c3b6d23b0ab43b8169ebc99a51e53c 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.63 2003/07/04 13:53:06 sam Exp $
+##  $Id: bootstrap,v 1.64 2003/07/04 14:56:51 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -163,8 +163,7 @@ L${count}b = lib${mod}.a
 L${count}pic = lib${mod}_pic.a
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
-B${count}p = \$(nodist_SOURCES_${mod})
-B${count}b = \$(nodist_SOURCES_${mod})
+B${count} = \$(nodist_SOURCES_${mod})
 EOF
     fi
     cat >> modules/${dir}/Makefile.am << EOF
@@ -172,7 +171,7 @@ endif
 
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
-${PRIVATE}BUILT_SOURCES += \$(B${count}p) \$(B${count}b)
+${PRIVATE}BUILT_SOURCES += \$(B${count})
 EOF
     fi
     cat >> modules/${dir}/Makefile.am << EOF

diff --git a/debian/woody-buildpackage b/debian/woody-buildpackage
index 252dc984f64098d5a25fbafacb53e1763e7bed0c..4cfe571288555e1f53a2279fd75b3adfc7aa727e 100755 (executable)
--- a/debian/woody-buildpackage
+++ b/debian/woody-buildpackage
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: woody-buildpackage,v 1.14 2003/04/11 19:15:36 sam Exp $
+# $Id: woody-buildpackage,v 1.15 2003/07/04 14:56:51 sam Exp $
 # Build VLC on a Debian woody system
 
 set -x
@@ -49,6 +49,7 @@ sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \
 sed -e '/# Package: wxvlc/,/^ *$/d' \
     -e 's,^ARCH_EXCLUDE =,& -Nwxvlc,' \
     -e 's,--enable-wxwindows,--disable-wxwindows,' \
+    -e 's,--enable-skins,--disable-skins,' \
     -e 's,--enable-flac,--disable-flac,' \
     -e 's, debian/changelog , debian/changelog.woody ,' \
     -e 's,dh_gencontrol[^#]*,& -- -ldebian/changelog.woody,' \
@@ -71,7 +72,7 @@ chg=../"$pva.changes"
 # Do the real work
 dpkg-checkbuilddeps -B debian/control.woody || exit 1
 fakeroot debian/rules.woody clean
-cd ..; dpkg-source -l"$dirn"/debian/changelog.woody -b "$dirn"; cd "$dirn"
+#cd ..; dpkg-source -l"$dirn"/debian/changelog.woody -b "$dirn"; cd "$dirn"
 debian/rules.woody build
 fakeroot debian/rules.woody binary
 dpkg-genchanges -ldebian/changelog.woody -cdebian/control.woody >"$chg"