[SCM] audacity/master: Fix docdir path.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Fri Feb 1 23:56:23 UTC 2013


The following commit has been merged in the master branch:
commit 51fdb9bff6b610de9c71a7bfb698ec3e26b0bde2
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Feb 2 00:56:17 2013 +0100

    Fix docdir path.

diff --git a/debian/patches/bp-docdir-fix.patch b/debian/patches/bp-docdir-fix.patch
new file mode 100644
index 0000000..57235a3
--- /dev/null
+++ b/debian/patches/bp-docdir-fix.patch
@@ -0,0 +1,15 @@
+Description: Fix docdir path.
+Author: Benjamin Drung <bdrung at debian.org>
+Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=578
+Applied-Upstream: 2.0.4, https://code.google.com/p/audacity/source/detail?r=12210
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,6 +10,7 @@
+ AUDACITY_NAME = @AUDACITY_NAME@
+ EXTRAINSTALLTARGETS= @EXTRAINSTALLTARGETS@
+ EXTRAUNINSTALLTARGETS= @EXTRAUNINSTALLTARGETS@
++PACKAGE=@AUDACITY_NAME@
+ DOCDIR= @docdir@
+ 
+ .PHONY: all
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..74468f6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bp-docdir-fix.patch
diff --git a/debian/rules b/debian/rules
index 018ff22..f65013d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	dh_auto_install
 	# Don't package unnecessary copy of GPL
-	rm -f debian/tmp/usr/share/doc/audacity/LICENSE.txt
+	rm debian/tmp/usr/share/doc/audacity/LICENSE.txt
 
 override_dh_strip:
 	dh_strip --dbg-package=audacity-dbg

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list