* ./debian/rules: more Debian Woody fixes. Grrrr!

diff --git a/debian/rules b/debian/rules
index 977d68a99c88930caac3322b72b25fbea24cde7e..eda3d584643d13cb78c1a449ec4414501efc1bb9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -278,8 +278,8 @@ binary-arch: build install
        dh_installman doc/vlc.1 -p vlc
        dh_installman doc/vlc-config.1 -p libvlc0-dev
 #      dh_installchangelogs ChangeLog -p vlc
-       cp ChangeLog debian/tmp/usr/share/doc/vlc/changelog
-       cp debian/changelog debian/tmp/usr/share/doc/vlc/changelog.Debian
+       cp ChangeLog debian/vlc/usr/share/doc/vlc/changelog
+       cp debian/changelog debian/vlc/usr/share/doc/vlc/changelog.Debian
        dh_link
        dh_strip
        dh_compress

diff --git a/debian/woody-buildpackage b/debian/woody-buildpackage
index f15ae995228951cb66eb3d8b74413d9daaad99c8..4d8b0edbd9fac0b8dc10a8a4a43f28bf296e2cd3 100755 (executable)
--- a/debian/woody-buildpackage
+++ b/debian/woody-buildpackage
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $Id: woody-buildpackage,v 1.3 2003/02/03 01:32:37 sam Exp $
+# $Id: woody-buildpackage,v 1.4 2003/02/03 02:26:28 sam Exp $
 # Build VLC for a Woody Debian system
 
 if test ! -d debian
@@ -9,22 +9,23 @@ then
   exit 1
 fi
 
-# replace (1.2.3-4) with (1.2.3-0woody.4)
+# changelog: replace (1.2.3-4) with (1.2.3-0woody.4)
 sed -e 's/^vlc (\([^)]*\)-\([^-)]*\))/vlc (\1-0woody.\2)/' \
     < debian/changelog > debian/changelog.woody
 
-# replace liba52-*-dev with a52dec-dev (>=0.7.3)
-#         libdv*-dev with libdv-dev
-#         libwxgtk2.4-dev with (nil)
+# control: replace liba52-*-dev with a52dec-dev (>=0.7.3)
+#                  libdv*-dev with libdv-dev
+#          remove libwxgtk2.4-dev
 sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \
     -e 's/libdv[0-9]*-dev/libdv-dev/' \
     -e 's/, libwx[^,]*//' \
     -e '/Package: wxvlc/,/^ *$/d' \
     < debian/control > debian/control.woody
 
-# remove wxwindows stuff, change changelog path
+# rules: remove wxwindows stuff
+#        change changelog path
 sed -e '/# Package: wxvlc/,/^ *$/d' \
-    -e '/--enable-wxwindows/d' \
+    -e 's,--enable-wxwindows,--disable-wxwindows,' \
     -e 's, debian/changelog , debian/changelog.woody ,' \
     -e 's,dh_gencontrol[^#]*,& -- -ldebian/changelog.woody,' \
     < debian/rules > debian/rules.woody