[pkg-xtuple-maintainers] [postbooks] 05/05: Remove patch applied upstream for csvimp include paths

Daniel Pocock pocock at moszumanska.debian.org
Sat Oct 18 15:34:06 UTC 2014


This is an automated email from the git hooks/post-receive script.

pocock pushed a commit to branch debian-experimental
in repository postbooks.

commit 1c7b7fee44c8462ccad542203b2b94f0e1ee4440
Author: Daniel Pocock <daniel at pocock.pro>
Date:   Sat Oct 18 17:08:59 2014 +0200

    Remove patch applied upstream for csvimp include paths
---
 debian/patches/09-csvimp-headers.patch | 26 --------------------------
 debian/patches/series                  |  1 -
 2 files changed, 27 deletions(-)

diff --git a/debian/patches/09-csvimp-headers.patch b/debian/patches/09-csvimp-headers.patch
deleted file mode 100644
index f0ba1c7..0000000
--- a/debian/patches/09-csvimp-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/common/common.pro b/common/common.pro
-index 7a03d7d..7a5f63e 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -8,6 +8,7 @@ DEFINES     += MAKELIB
- 
- INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib
- INCLUDEPATH += $(QTSRC)/src/3rdparty/zlib
-+INCLUDEPATH += $(CSVIMP_HEADERS)/csvimpcommon $(CSVIMP_HEADERS)/plugin
- 
- DESTDIR = ../lib
- OBJECTS_DIR = tmp
-diff --git a/guiclient/guiclient.pro b/guiclient/guiclient.pro
-index def3865..a806b0e 100644
---- a/guiclient/guiclient.pro
-+++ b/guiclient/guiclient.pro
-@@ -11,7 +11,8 @@ INCLUDEPATH += ../scriptapi \
-                ../../xtuple-build-desktop/common \
-                ../../xtuple-build-desktop/widgets \
-                ../../xtuple-build-desktop/widgets/tmp/lib \
--               ../../xtuple-build-desktop/guiclient .
-+               ../../xtuple-build-desktop/guiclient . \
-+               $(CSVIMP_HEADERS)/csvimpcommon $(CSVIMP_HEADERS)/plugin
- 
- DEPENDPATH  += $${INCLUDEPATH}
- 
diff --git a/debian/patches/series b/debian/patches/series
index 25a1b5a..0b2a901 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 06-correct-edition-data.patch
-09-csvimp-headers.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/postbooks.git



More information about the pkg-xtuple-maintainers mailing list