[pkg-d-commits] [vibe.d] 03/11: Drop all patches: Applied upstream
Matthias Klumpp
mak at moszumanska.debian.org
Wed Aug 30 16:55:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
mak pushed a commit to branch master
in repository vibe.d.
commit 1083d684ff6fd3091ad37e374863978fda4cc5a5
Author: Matthias Klumpp <mak at debian.org>
Date: Wed Aug 30 17:30:34 2017 +0200
Drop all patches: Applied upstream
---
debian/patches/01_include-batch-install.patch | 125 --------------------------
debian/patches/series | 1 -
2 files changed, 126 deletions(-)
diff --git a/debian/patches/01_include-batch-install.patch b/debian/patches/01_include-batch-install.patch
deleted file mode 100644
index aea3791..0000000
--- a/debian/patches/01_include-batch-install.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From c0ef06c652dcf4214488ba4606806fdf90bbe92b Mon Sep 17 00:00:00 2001
-From: Matthias Klumpp <matthias at tenstral.net>
-Date: Tue, 28 Feb 2017 18:48:07 +0100
-Subject: [PATCH] meson: Install includes in one batch
-
----
- meson.build | 22 ++++++++--------------
- 1 file changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 06e0650..8fee01d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -43,13 +43,11 @@ vibe_core_src = [
- 'source/vibe/core/core.d',
- 'source/vibe/core/driver.d'
- ]
--install_headers(vibe_core_src, subdir: 'd/vibe/core')
-
- vibe_crypto_src = [
- 'source/vibe/crypto/passwordhash.d',
- 'source/vibe/crypto/cryptorand.d'
- ]
--install_headers(vibe_crypto_src, subdir: 'd/vibe/crypto')
-
- vibe_inet_src = [
- 'source/vibe/inet/path.d',
-@@ -59,7 +57,6 @@ vibe_inet_src = [
- 'source/vibe/inet/urltransfer.d',
- 'source/vibe/inet/message.d'
- ]
--install_headers(vibe_inet_src, subdir: 'd/vibe/inet')
-
- vibe_stream_src = [
- 'source/vibe/stream/botan.d',
-@@ -75,14 +72,12 @@ vibe_stream_src = [
- 'source/vibe/stream/memory.d',
- 'source/vibe/stream/wrapper.d'
- ]
--install_headers(vibe_stream_src, subdir: 'd/vibe/stream')
-
- vibe_textfilter_src = [
- 'source/vibe/textfilter/markdown.d',
- 'source/vibe/textfilter/urlencode.d',
- 'source/vibe/textfilter/html.d'
- ]
--install_headers(vibe_textfilter_src, subdir: 'd/vibe/textfilter')
-
- vibe_utils_src = [
- 'source/vibe/utils/validation.d',
-@@ -92,7 +87,6 @@ vibe_utils_src = [
- 'source/vibe/utils/memory.d',
- 'source/vibe/utils/string.d'
- ]
--install_headers(vibe_utils_src, subdir: 'd/vibe/utils')
-
- vibe_internal_src = [
- 'source/vibe/internal/win32.d',
-@@ -104,14 +98,12 @@ vibe_internal_src = [
- 'source/vibe/internal/meta/uda.d',
- 'source/vibe/internal/rangeutil.d'
- ]
--install_headers(vibe_internal_src, subdir: 'd/vibe/internal')
-
- vibe_data_src = [
- 'source/vibe/data/bson.d',
- 'source/vibe/data/serialization.d',
- 'source/vibe/data/json.d'
- ]
--install_headers(vibe_data_src, subdir: 'd/vibe/data')
-
- vibe_http_src = [
- 'source/vibe/http/session.d',
-@@ -129,19 +121,16 @@ vibe_http_src = [
- 'source/vibe/http/fileserver.d',
- 'source/vibe/http/status.d'
- ]
--install_headers(vibe_http_src, subdir: 'd/vibe/http')
-
- vibe_mail_src = [
- 'source/vibe/mail/smtp.d',
- ]
--install_headers(vibe_mail_src, subdir: 'd/vibe/mail')
-
- vibe_diet_src = [
- 'source/vibe/templ/parsertools.d',
- 'source/vibe/templ/utils.d',
- 'source/vibe/templ/diet.d'
- ]
--install_headers(vibe_diet_src, subdir: 'd/vibe/templ')
-
- vibe_db_mongo_src = [
- 'source/vibe/db/mongo/connection.d',
-@@ -153,7 +142,6 @@ vibe_db_mongo_src = [
- 'source/vibe/db/mongo/settings.d',
- 'source/vibe/db/mongo/flags.d'
- ]
--install_headers(vibe_db_mongo_src, subdir: 'd/vibe/db/mongo')
-
- vibe_db_redis_src = [
- 'source/vibe/db/redis/idioms.d',
-@@ -161,7 +149,6 @@ vibe_db_redis_src = [
- 'source/vibe/db/redis/sessionstore.d',
- 'source/vibe/db/redis/redis.d'
- ]
--install_headers(vibe_db_redis_src, subdir: 'd/vibe/db/redis')
-
- vibe_web_src = [
- 'source/vibe/web/validation.d',
-@@ -173,7 +160,14 @@ vibe_web_src = [
- 'source/vibe/web/rest.d',
- 'source/vibe/web/i18n.d'
- ]
--install_headers(vibe_web_src, subdir: 'd/vibe/web')
-+
-+#
-+# Includes
-+#
-+# It's easier to just install the whole source-tree then use
-+# install_headers and forget to include all subdirectories
-+# along the way.
-+install_subdir('source/vibe/', install_dir: 'include/d/')
-
- #
- # Dependencies
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0d844b2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_include-batch-install.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/vibe.d.git
More information about the pkg-d-commits
mailing list