[SCM] vlc/master: Refresh patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Tue Nov 1 11:40:59 UTC 2016
The following commit has been merged in the master branch:
commit 323eedf07a5d02162dcfac262ee1efe6c21c7345
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Tue Nov 1 12:38:12 2016 +0100
Refresh patches
diff --git a/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch b/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
index bbf8fd5..7578484 100644
--- a/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
+++ b/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
@@ -13,11 +13,9 @@ This reverts commit ceacef3bbb0c34d67aa84e6ca91b360cbe2419e5.
share/Makefile.am | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
-diff --git a/share/Makefile.am b/share/Makefile.am
-index 9894ebb..7f56458 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
-@@ -77,10 +77,7 @@ skins2_default_vlt_FILES = \
+@@ -78,10 +78,7 @@
skins2/default.vlt: $(skins2_default_vlt_FILES)
mkdir -p skins2
@@ -29,6 +27,3 @@ index 9894ebb..7f56458 100644
#
# LUA
---
-2.10.2
-
diff --git a/debian/patches/fix-translation.patch b/debian/patches/fix-translation.patch
index c92d809..39660fd 100644
--- a/debian/patches/fix-translation.patch
+++ b/debian/patches/fix-translation.patch
@@ -4,7 +4,7 @@ Bug-Debian: https://bugs.debian.org/814258
--- a/po/mr.po
+++ b/po/mr.po
-@@ -21567,7 +21567,7 @@
+@@ -21589,7 +21589,7 @@
#: modules/gui/qt4/menus.cpp:491
msgid "Ctrl+L"
@@ -13,7 +13,7 @@ Bug-Debian: https://bugs.debian.org/814258
#: modules/gui/qt4/menus.cpp:494
msgid "Docked Playlist"
-@@ -21579,7 +21579,7 @@
+@@ -21601,7 +21601,7 @@
#: modules/gui/qt4/menus.cpp:506
msgid "Ctrl+H"
@@ -22,7 +22,7 @@ Bug-Debian: https://bugs.debian.org/814258
#: modules/gui/qt4/menus.cpp:515
msgid "&Fullscreen Interface"
-@@ -21735,7 +21735,7 @@
+@@ -21757,7 +21757,7 @@
#: modules/gui/qt4/menus.cpp:918
msgid "Ctrl+T"
diff --git a/debian/patches/skins-implement-silent-mode-make.patch b/debian/patches/skins-implement-silent-mode-make.patch
index abe6d11..13621bc 100644
--- a/debian/patches/skins-implement-silent-mode-make.patch
+++ b/debian/patches/skins-implement-silent-mode-make.patch
@@ -8,11 +8,9 @@ Subject: [PATCH 4/5] skins: implement silent mode make
share/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/share/Makefile.am b/share/Makefile.am
-index 06bfa1c..a24d729 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
-@@ -76,8 +76,8 @@ skins2_default_vlt_FILES = \
+@@ -77,8 +77,8 @@
skins2/default/subX/vol_slider.png
skins2/default.vlt: $(skins2_default_vlt_FILES)
@@ -23,6 +21,3 @@ index 06bfa1c..a24d729 100644
tar cvvzf skins2/default.vlt \
--owner=root --group=root --directory="$(srcdir)/skins2" \
default/
---
-2.10.2
-
diff --git a/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch b/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch
index 4558883..8667d8c 100644
--- a/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch
+++ b/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch
@@ -8,11 +8,9 @@ Subject: [PATCH 3/5] skins: remove timestamp from default.vlt (fixes #4562)
share/Makefile.am | 1 +
1 file changed, 1 insertion(+)
-diff --git a/share/Makefile.am b/share/Makefile.am
-index ef78505..06bfa1c 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
-@@ -77,6 +77,7 @@ skins2_default_vlt_FILES = \
+@@ -78,6 +78,7 @@
skins2/default.vlt: $(skins2_default_vlt_FILES)
mkdir -p skins2
@@ -20,6 +18,3 @@ index ef78505..06bfa1c 100644
tar cvvzf skins2/default.vlt \
--owner=root --group=root --directory="$(srcdir)/skins2" \
default/
---
-2.10.2
-
diff --git a/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch b/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch
index 68767bb..ecf8026 100644
--- a/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch
+++ b/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch
@@ -8,11 +8,9 @@ Subject: [PATCH 5/5] skins2: do not generate (broken) default.vlt on error
share/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/share/Makefile.am b/share/Makefile.am
-index a24d729..b08b3e8 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
-@@ -77,10 +77,12 @@ skins2_default_vlt_FILES = \
+@@ -78,10 +78,12 @@
skins2/default.vlt: $(skins2_default_vlt_FILES)
$(AM_V_at)mkdir -p skins2
@@ -26,6 +24,3 @@ index a24d729..b08b3e8 100644
#
# LUA
---
-2.10.2
-
diff --git a/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch b/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch
index f4da33e..fb73a04 100644
--- a/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch
+++ b/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch
@@ -9,11 +9,9 @@ Subject: [PATCH 2/5] skins2: do not save user and group names in the default
share/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/share/Makefile.am b/share/Makefile.am
-index 7f56458..ef78505 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
-@@ -77,7 +77,9 @@ skins2_default_vlt_FILES = \
+@@ -78,7 +78,9 @@
skins2/default.vlt: $(skins2_default_vlt_FILES)
mkdir -p skins2
@@ -24,6 +22,3 @@ index 7f56458..ef78505 100644
#
# LUA
---
-2.10.2
-
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list