diff options
author | Ondřej Surý <ondrej@sury.org> | 2013-07-29 17:15:51 +0200 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2013-07-29 17:15:51 +0200 |
commit | bfddd18876d8b98cd43d3fc09c7f98f85a667b2f (patch) | |
tree | 77be4bb4b85ffec8ffda01908b01f956b3118333 | |
parent | dd76c36e2e09bffb598caf9be436f49503692467 (diff) | |
download | knot-bfddd18876d8b98cd43d3fc09c7f98f85a667b2f.tar.gz |
Remove last upstream patch, all our changes have been merged. Yay\!
-rw-r--r-- | debian/patches/knot-honor-CONFIG_DIR.patch | 20 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 21 deletions
diff --git a/debian/patches/knot-honor-CONFIG_DIR.patch b/debian/patches/knot-honor-CONFIG_DIR.patch deleted file mode 100644 index 835e17d..0000000 --- a/debian/patches/knot-honor-CONFIG_DIR.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 432027f7cd31be315d267e073e1034c9737fc419 Mon Sep 17 00:00:00 2001 -From: Jan Vcelak <jan.vcelak@nic.cz> -Date: Mon, 15 Jul 2013 14:14:49 +0200 -Subject: [PATCH] config: fix default configuration file load path - ---- - src/knot/conf/conf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- knot.orig/src/knot/conf/conf.c -+++ knot/src/knot/conf/conf.c -@@ -37,7 +37,7 @@ - - /*! \brief Default config paths. */ - static const char *DEFAULT_CONFIG[] = { -- SYSCONFDIR "/" "knot.conf", -+ CONFIG_DIR "/" "knot.conf", - }; - - #define DEFAULT_CONF_COUNT 1 /*!< \brief Number of default config paths. */ diff --git a/debian/patches/series b/debian/patches/series index 20e1259..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -knot-honor-CONFIG_DIR.patch |