[SCM] audacity/master: Patches refreshed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Mon Nov 6 16:23:48 UTC 2017
The following commit has been merged in the master branch:
commit 5e5450d5787db50bb7b997749b41c08e89905813
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Nov 6 17:23:39 2017 +0100
Patches refreshed.
diff --git a/debian/patches/fix-minsrc-autoreconf.patch b/debian/patches/fix-minsrc-autoreconf.patch
index 6df6849..816fc05 100644
--- a/debian/patches/fix-minsrc-autoreconf.patch
+++ b/debian/patches/fix-minsrc-autoreconf.patch
@@ -2,9 +2,11 @@ Description: Fix autoreconf for the minimal audacity source tarball.
The minimal audacity source tarball does not ship every library in lib-src.
Author: Benjamin Drung <bdrung at debian.org>
---- a/lib-src/Makefile.am
-+++ b/lib-src/Makefile.am
-@@ -176,7 +176,7 @@
+Index: audacity/lib-src/Makefile.am
+===================================================================
+--- audacity.orig/lib-src/Makefile.am
++++ audacity/lib-src/Makefile.am
+@@ -180,7 +180,7 @@ SUBDIRS += lib-widget-extra
endif
# Note: These optional libraries will not be distributed in the source tarball.
diff --git a/debian/patches/workaround-wxwidgets-fit-recovery.patch b/debian/patches/workaround-wxwidgets-fit-recovery.patch
index 474bfdc..e3f09b0 100644
--- a/debian/patches/workaround-wxwidgets-fit-recovery.patch
+++ b/debian/patches/workaround-wxwidgets-fit-recovery.patch
@@ -17,9 +17,11 @@ Author: Martin Steghöfer <martin at steghoefer.eu>
Forwarded: lllucius at gmail.com, 2014-10-20
Bug-Debian: http://bugs.debian.org/765341
---- a/src/AutoRecovery.cpp
-+++ b/src/AutoRecovery.cpp
-@@ -42,6 +42,10 @@
+Index: audacity/src/AutoRecovery.cpp
+===================================================================
+--- audacity.orig/src/AutoRecovery.cpp
++++ audacity/src/AutoRecovery.cpp
+@@ -41,6 +41,10 @@ class AutoRecoveryDialog final : public
public:
AutoRecoveryDialog(wxWindow *parent);
@@ -30,7 +32,7 @@ Bug-Debian: http://bugs.debian.org/765341
private:
void PopulateList();
void PopulateOrExchange(ShuttleGui & S);
-@@ -70,6 +74,9 @@
+@@ -69,6 +73,9 @@ BEGIN_EVENT_TABLE(AutoRecoveryDialog, wx
EVT_BUTTON(ID_RECOVER_ALL, AutoRecoveryDialog::OnRecoverAll)
EVT_BUTTON(ID_RECOVER_NONE, AutoRecoveryDialog::OnRecoverNone)
EVT_BUTTON(ID_QUIT_AUDACITY, AutoRecoveryDialog::OnQuitAudacity)
@@ -40,7 +42,7 @@ Bug-Debian: http://bugs.debian.org/765341
END_EVENT_TABLE()
void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui& S)
-@@ -111,6 +118,22 @@
+@@ -110,6 +117,22 @@ void AutoRecoveryDialog::PopulateOrExcha
Center();
}
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list