[vlc-devel] commit: Fix Win32 packaging and NEWS about libpng (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Tue Oct 21 10:37:07 2008 +0200| [0474537c56ce205d49688af3255722bc9a3df240] | committer: Jean-Baptiste Kempf 

Fix Win32 packaging and NEWS about libpng

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0474537c56ce205d49688af3255722bc9a3df240
---

 Makefile.am |    8 +++-----
 NEWS        |    2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9d152b0..9868e79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -750,7 +750,7 @@ package-win32-base-debug: package-win-common
 	  fi ; done
 
 # Contrib *.dll's
-	cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/"
+	cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true 
 
 # Copy the lua scripts (HTTP)
 if BUILD_LUA
@@ -885,10 +885,8 @@ endif
 
 #strip exe and main dll
 package-win-common-strip: package-win32-base-debug
-	$(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
-	$(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
-	$(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
-	$(STRIP) "vlc-$(VERSION)/pthreadGC2$(LIBEXT)"
+	for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
+	  do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done
 if BUILD_MOZILLA
 	$(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
 endif
diff --git a/NEWS b/NEWS
index feb2623..7417501 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Changes between 0.9.4 and 0.9.5-git:
 ------------------------------------
 Security updates:
  * Fixed buffer overflow in TiVo demuxer (SA-0809)
+ * Fixed libpng CVE-2008-3964 in Win32 and MacOS builds
 
 Features:
  * Closed Caption EIA 608/708 parsing enabled for libmpeg2
@@ -17,6 +18,7 @@ Windows port:
 Qt Interface:
  * Fix bug when the resetting of preferences didn't reset the dialog states
  * Right-click menu to select playlist columns reenabled
+ * Various fixed in playlist
 
 Access:
  * MMAP module is now deactivated by default