[SCM] pd-purest-json/master: Dropped patches applied upstream.

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Tue Aug 9 09:40:15 UTC 2016


The following commit has been merged in the master branch:
commit af90bf8fb96c01d3e097e62a883394eda494b4c4
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Aug 9 11:39:39 2016 +0200

    Dropped patches applied upstream.

diff --git a/debian/patches/system-uthash.patch b/debian/patches/system-uthash.patch
deleted file mode 100644
index e284be9..0000000
--- a/debian/patches/system-uthash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: use system-provided uthash
- rather than using a local copy of uthash (which is not included because the
- upstream tarball is generated from git, and uthash was included as a
- submodule), we use the uthash provided by Debian
-Author: IOhannes m zmölnig
-Bug: https://github.com/residuum/PuRestJson/issues/39
-Last-Update: 2016-01-09
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- PuRestJson-1.4.0.orig/src/json-encode.c
-+++ PuRestJson-1.4.0/src/json-encode.c
-@@ -33,7 +33,7 @@
- #include <stdio.h>
- #include <math.h>
- 
--#include "uthash/src/uthash.h"
-+#include "uthash.h"
- #include "inc/string.c"
- #include "inc/kvp.c"
- 
---- PuRestJson-1.4.0.orig/src/urlparams.c
-+++ PuRestJson-1.4.0/src/urlparams.c
-@@ -31,7 +31,7 @@
- #include "urlparams.h"
- #include <math.h>
- 
--#include "uthash/src/uthash.h"
-+#include "uthash.h"
- #include "inc/string.c"
- #include "inc/kvp.c"
- 

-- 
pd-purest-json packaging



More information about the pkg-multimedia-commits mailing list