[SCM] VLC media player packaging branch, sid, updated. debian/1.0.0.rc2-1-23-g61c84b5

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit 1964f1f9db31ad85ad67a06ead801f0221ad74f9
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Jul 9 13:01:16 2009 +0200

     Fix make distclean
    
    New patch taken upstream

diff --git a/debian/patches/402_share_makefile.diff b/debian/patches/402_share_makefile.diff
new file mode 100644
index 0000000..885da0a
--- /dev/null
+++ b/debian/patches/402_share_makefile.diff
@@ -0,0 +1,42 @@
+commit 3aa5a9f8cd7005aacbdb9211c17fae4570e065a1
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Date:   Mon Jul 6 18:06:18 2009 +0300
+
+    Do not remove static data files when cleaning - fix make clean all
+
+diff --git a/share/Makefile.am b/share/Makefile.am
+index 897f113..486c139 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -1,4 +1,4 @@
+-MOSTLYCLEANFILES = $(nobase_vlcdata_DATA)
++MOSTLYCLEANFILES = $(nodist_EXTRA_DATA)
+ 
+ nobase_dist_data_DATA = applications/vlc.desktop
+ 
+@@ -14,12 +14,13 @@ nobase_dist_vlcdata_SCRIPTS = \
+ 	utils/video-vlc-default.sh \
+ 	$(NULL)
+ 
+-nobase_vlcdata_DATA = $(NULL)
+-
+ EXTRA_DIST = \
++	$(skins2_default_vlt_FILES)
++
++nobase_vlcdata_DATA =
++dist_EXTRA_DATA = \
+ 	$(DIST_rsrc) \
+ 	$(DIST_pda) \
+-	$(skins2_default_vlt_FILES) \
+ 	$(DIST_skins2) \
+ 	$(DIST_http) \
+ 	$(DIST_http_lua) \
+@@ -27,6 +28,8 @@ EXTRA_DIST = \
+ 	$(DIST_osdmenu_default) \
+ 	$(DIST_mozilla) \
+ 	$(DIST_maemo)
++nodist_EXTRA_DATA = \
++	 skins2/default.vlt
+ 
+ if BUILD_SKINS
+ nobase_vlcdata_DATA += skins2/default.vlt
diff --git a/debian/patches/402b_rebootstrap.diff b/debian/patches/402b_rebootstrap.diff
new file mode 100644
index 0000000..ea8635f
--- /dev/null
+++ b/debian/patches/402b_rebootstrap.diff
@@ -0,0 +1,43 @@
+diff --git a/share/Makefile.in b/share/Makefile.in
+index 84090b9..1395603 100644
+--- a/share/Makefile.in
++++ b/share/Makefile.in
+@@ -627,7 +636,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ vlcdatadir = @vlcdatadir@
+ vlclibdir = @vlclibdir@
+-MOSTLYCLEANFILES = $(nobase_vlcdata_DATA)
++MOSTLYCLEANFILES = $(nodist_EXTRA_DATA)
+ nobase_dist_data_DATA = applications/vlc.desktop
+ dist_vlcdata_DATA = \
+ 	$(DIST_icons) \
+@@ -642,13 +651,15 @@ nobase_dist_vlcdata_SCRIPTS = \
+ 	utils/video-vlc-default.sh \
+ 	$(NULL)
+ 
+-nobase_vlcdata_DATA = $(NULL) $(am__append_1) $(am__append_2) \
+-	$(am__append_3) $(am__append_4) $(am__append_5) \
+-	$(am__append_6) $(am__append_7) $(am__append_8)
+ EXTRA_DIST = \
++	$(skins2_default_vlt_FILES)
++
++nobase_vlcdata_DATA = $(am__append_1) $(am__append_2) $(am__append_3) \
++	$(am__append_4) $(am__append_5) $(am__append_6) \
++	$(am__append_7) $(am__append_8)
++dist_EXTRA_DATA = \
+ 	$(DIST_rsrc) \
+ 	$(DIST_pda) \
+-	$(skins2_default_vlt_FILES) \
+ 	$(DIST_skins2) \
+ 	$(DIST_http) \
+ 	$(DIST_http_lua) \
+@@ -657,6 +668,9 @@ EXTRA_DIST = \
+ 	$(DIST_mozilla) \
+ 	$(DIST_maemo)
+ 
++nodist_EXTRA_DATA = \
++	 skins2/default.vlt
++
+ DIST_rsrc = \
+ 	newres.h \
+ 	resource.h \
diff --git a/debian/patches/series b/debian/patches/series
index ca5ad3c..64278e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 200_osdmenu_paths.diff
 300_manpage_syntax.diff
 401_i420_mmx_pic.diff
+402_share_makefile.diff
+402b_rebootstrap.diff

-- 
VLC media player packaging