[SCM] flowblade/master: Drop patch 1001: Adopted upstream.

js at users.alioth.debian.org js at users.alioth.debian.org
Thu Jan 8 00:11:28 UTC 2015


The following commit has been merged in the master branch:
commit cad2d960d4e9ff3d7498f7941e4f3ce6ff19d171
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jan 7 19:37:19 2015 +0100

    Drop patch 1001: Adopted upstream.

diff --git a/debian/patches/1001_installdir.patch b/debian/patches/1001_installdir.patch
deleted file mode 100644
index 42fa9dd..0000000
--- a/debian/patches/1001_installdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Adjust hardcoded library install path to match our actual install
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2012-12-26
-
---- a/flowblade
-+++ b/flowblade
-@@ -34,7 +34,7 @@
- # Update sys.path to include modules
- if launch_dir == "/usr/bin":
-     print "Running from installation..."
--    modules_path = "/usr/share/pyshared/Flowblade"
-+    modules_path = "/usr/share/flowblade/Flowblade"
- else:
-     print "Running from filesystem..."
-     modules_path = launch_dir + "/Flowblade"
diff --git a/debian/patches/README b/debian/patches/README
deleted file mode 100644
index 80c1584..0000000
--- a/debian/patches/README
+++ /dev/null
@@ -1,3 +0,0 @@
-0xxx: Grabbed from upstream development.
-1xxx: Possibly relevant for upstream adoption.
-2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5b901ce..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-1001_installdir.patch

-- 
flowblade packaging



More information about the pkg-multimedia-commits mailing list