* debian/patches/20_configure.dpatch:

    + Don't manage this patch with dpatch since it causes ownership issues.
  * debian/control:
    + Added a missing dpatch build dependency (Closes: #263363).
    + Removed the modplug plugin until libmodplug-dev enters Debian.

debian/Makefile.am

@@ -32,7 +32,6 @@ EXTRA_DIST = \
 	wxvlc.dirs \
 	wxvlc.menu \
 	patches/00list \
-	patches/20_configure.dpatch \
 	patches/20_faad2.dpatch \
 	patches/20_ffmpeg.dpatch \
 	patches/20_interfaces.dpatch \

debian/changelog

+vlc (0.7.2.final-11) unstable; urgency=medium
+
+  * configure.ac:
+    + Fixed an LDFLAGS/CFLAGS confusion.
+    + Don't use -finline-limit since it now tries to inline functions that
+      have not been explicitely inlined (Closes: #265673).
+  * debian/patches/20_configure.dpatch:
+    + Don't manage this patch with dpatch since it causes ownership issues.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sun, 15 Aug 2004 01:35:35 +0200
+
+vlc (0.7.2.final-10) unstable; urgency=medium
+
+  * The "I hope I got it right this time" upload.
+  * configure.ac:
+    + Use -maltivec -mabi=altivec for the memcpyaltivec and deinterlace
+      plugins on PowerPC.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Tue, 10 Aug 2004 18:01:47 +0200
+
+vlc (0.7.2.final-9) unstable; urgency=low
+
+  * debian/control:
+    + Added a missing dpatch build dependency (Closes: #263363).
+    + Removed the modplug plugin until libmodplug-dev enters Debian.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Tue, 10 Aug 2004 11:01:15 +0200
+
+vlc (0.7.2.final-8) unstable; urgency=low
+
+  * debian/control:
+    + Added a missing dpatch build dependency.
+  * configure.ac:
+    + Fixed the powerpc build by conditionally re-enabling -maltivec
+      -mabi=altivec.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 30 Jul 2004 00:05:58 +0200
+
 vlc (0.7.2.final-7) unstable; urgency=low
 
   * debian/rules:

debian/control

@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libmodplug-dev, libxml2-dev, libid3tag0-dev, libtheora-dev
+Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev
 Build-Conflicts: libavcodec-dev
 Standards-Version: 3.6.1.1
 

debian/patches/00list

-20_configure
 20_faad2
 20_ffmpeg
 20_interfaces

debian/rules

@@ -153,7 +153,7 @@ endif
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f configure-stamp build-stamp
@@ -176,8 +176,12 @@ clean:
 	# Remove spurious autotools stuff
 	rm -f config.log confdefs.h
 
+	touch configure.ac -d yesterday
+	touch aclocal.m4 -d yesterday
+	touch configure -d yesterday
+	touch config.h.in -d yesterday
+	touch `find . -name Makefile.in` -d yesterday
 	-$(MAKE) distclean
-	$(MAKE) -f debian/rules unpatch
 
 	dh_clean
 
@@ -198,7 +202,7 @@ install: build
 	#cp doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc
 	#strfile doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc.dat
 
-	rm -Rf debian/vlc/usr/share/vlc/skins
+	rm -Rf debian/vlc/$(VIDDIR)/skins
 	ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz
 
 	# Package: libvlc0-dev
@@ -322,8 +326,7 @@ endif
 	ln -s vlc debian/kvlc/usr/share/doc/kvlc
 	mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \
 	  debian/kvlc/usr/lib/vlc/gui/
-	mv debian/vlc/usr/share/vlc/ui.rc \
-	  debian/kvlc/usr/share/vlc
+	mv debian/vlc/$(VIDDIR)/ui.rc debian/kvlc/$(VIDDIR)
 	ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
 	mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
 	mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
@@ -338,6 +341,7 @@ endif
 	# Package: wxvlc
 	mv debian/vlc/usr/bin/wxvlc debian/wxvlc/usr/bin/
 	ln -s vlc debian/wxvlc/usr/share/doc/wxvlc
+	cp debian/vlc/$(VIDDIR)/vlc.xpm debian/wxvlc/$(VIDDIR)/wxvlc.xpm
 	mv debian/vlc/usr/lib/vlc/gui/libwxwindows_plugin.so \
 	  debian/wxvlc/usr/lib/vlc/gui/
 	ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz

debian/wxvlc.menu

 ?package(wxvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
                 section="Apps/Viewers" title="VLC media player for wxWindows" \
-                icon="/usr/share/vlc/vlc.xpm" hints="Video"
+                icon="/usr/share/vlc/wxvlc.xpm" hints="Video"