[pkg-xtuple-maintainers] [csvimp] 02/08: Remove debian patches applied upstream

[Daniel Pocock]

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

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

commit be725ba7ee988194e5153aa6415721b969ecdefd
Author: Daniel Pocock <daniel at pocock.pro>
Date:   Mon Sep 22 15:32:32 2014 +0200

    Remove debian patches applied upstream
---
 debian/patches/series                     |  2 -
 debian/patches/use-packaged-openrpt.patch | 94 -------------------------------
 debian/patches/use-packaged-plugin.patch  | 14 -----
 debian/rules                              | 13 +++--
 4 files changed, 9 insertions(+), 114 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 65f76f5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-use-packaged-openrpt.patch
-use-packaged-plugin.patch
diff --git a/debian/patches/use-packaged-openrpt.patch b/debian/patches/use-packaged-openrpt.patch
deleted file mode 100644
index 9eab1cd..0000000
--- a/debian/patches/use-packaged-openrpt.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/application/application.pro b/application/application.pro
-index 9924490..d75f403 100644
---- a/application/application.pro
-+++ b/application/application.pro
-@@ -20,22 +20,22 @@ MOC_DIR     = tmp
- UI_DIR      = tmp
- 
- INCLUDEPATH += ../csvimpcommon ../csvimpcommon/images ../plugin \
--               ../$${OPENRPT_DIR}/common ../$${OPENRPT_DIR}/MetaSQL \
--               ../$${OPENRPT_BLD}/common ../$${OPENRPT_BLD}/MetaSQL
-+               $${OPENRPT_DIR}/common $${OPENRPT_DIR}/MetaSQL \
-+               $${OPENRPT_BLD}/common $${OPENRPT_BLD}/MetaSQL
- INCLUDEPATH = $$unique(INCLUDEPATH)
- 
- win32:INCLUDEPATH += .
- DEPENDPATH  += $${INCLUDEPATH}
- 
--LIBS += -L../$${OPENRPT_BLD}/lib -lcommon -lMetaSQL
-+LIBS += -L$${OPENRPT_BLD} -lcommon -lMetaSQL
- 
- win32-msvc* {
-   PRE_TARGETDEPS += ../$${OPENRPT_BLD}/lib/common.lib      \
-                     ../$${OPENRPT_BLD}/lib/MetaSQL.lib     \
- 
- } else {
--  PRE_TARGETDEPS += ../$${OPENRPT_BLD}/lib/libcommon.a      \
--                    ../$${OPENRPT_BLD}/lib/libMetaSQL.a     \
-+  PRE_TARGETDEPS += $${OPENRPT_BLD}/libcommon.a      \
-+                    $${OPENRPT_BLD}/libMetaSQL.a     \
- }
- win32:RC_FILE = application.rc
- 
-diff --git a/global.pri b/global.pri
-index 8f3d0d8..f979dd0 100644
---- a/global.pri
-+++ b/global.pri
-@@ -8,27 +8,9 @@
- # to be bound by its terms.
- #
- 
--exists(../../../../openrpt) {
--  OPENRPT_DIR = ../../../../openrpt
--}
--exists(../../../openrpt) {
--  OPENRPT_DIR = ../../../openrpt
--}
--exists(../../openrpt) {
--  OPENRPT_DIR = ../../openrpt
--}
--exists(../openrpt) {
--  OPENRPT_DIR = ../openrpt
--}
--
--! exists($${OPENRPT_DIR}) {
--  error("Could not set the OPENRPT_DIR qmake variable.")
--}
--
--OPENRPT_BLD=$${OPENRPT_DIR}
--exists($${OPENRPT_DIR}-build-desktop) {
--  OPENRPT_BLD=$${OPENRPT_DIR}-build-desktop
--}
-+OPENRPT_DIR = /usr/include/openrpt
-+OPENRPT_BLD = /usr/lib/$(DEB_HOST_MULTIARCH)
-+#OPENRPT_BLD = /usr/lib/openrpt
- 
- macx:exists(macx.pri) {
-   include(macx.pri)
-diff --git a/plugin/plugin.pro b/plugin/plugin.pro
-index b6cd169..05e8acf 100644
---- a/plugin/plugin.pro
-+++ b/plugin/plugin.pro
-@@ -27,18 +27,18 @@ MOC_DIR     = tmp
- UI_DIR      = tmp
- 
- INCLUDEPATH += ../csvimpcommon ../csvimpcommon/images \
--               ../$${OPENRPT_DIR}/common ../$${OPENRPT_DIR}/MetaSQL
-+               $${OPENRPT_DIR}/common $${OPENRPT_DIR}/MetaSQL
- win32:INCLUDEPATH += .
- DEPENDPATH  += $${INCLUDEPATH}
--LIBS += -L../$${OPENRPT_BLD}/lib -lcommon -lMetaSQL
-+LIBS += -L$${OPENRPT_BLD} -lcommon -lMetaSQL
- 
- win32-msvc* {
-   PRE_TARGETDEPS += ../$${OPENRPT_BLD}/lib/common.lib   \
-                     ../$${OPENRPT_BLD}/lib/MetaSQL.lib  \
- 
- } else {
--  PRE_TARGETDEPS += ../$${OPENRPT_BLD}/lib/libcommon.a  \
--                    ../$${OPENRPT_BLD}/lib/libMetaSQL.a \
-+  PRE_TARGETDEPS += $${OPENRPT_BLD}/libcommon.a  \
-+                    $${OPENRPT_BLD}/libMetaSQL.a \
- }
- 
- FORMS    = csvaddmapinputdialog.ui \
diff --git a/debian/patches/use-packaged-plugin.patch b/debian/patches/use-packaged-plugin.patch
deleted file mode 100644
index 8d7f324..0000000
--- a/debian/patches/use-packaged-plugin.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/application/main.cpp b/application/main.cpp
-index 4364457..9bd7ff1 100644
---- a/application/main.cpp
-+++ b/application/main.cpp
-@@ -35,7 +35,8 @@ CSVImpPluginInterface *csvimpInterface = 0;
- 
- bool loadPlugin()
- {
--  QDir pluginsDir(QApplication::applicationDirPath());
-+  //QDir pluginsDir(QApplication::applicationDirPath());
-+  QDir pluginsDir("/usr/lib/csvimp");
- 
-   while (! pluginsDir.exists("plugins") && pluginsDir.cdUp())
-     ;
diff --git a/debian/rules b/debian/rules
index fc80185..77cf03c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,19 +4,24 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+export HARDCODE_APPLICATION_DIR='"/usr/lib/csvimp"'
+export USE_SHARED_OPENRPT=1
+export OPENRPT_HEADERS=/usr/include/openrpt
+export OPENRPT_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --builddirectory=. --parallel
 
 override_dh_auto_clean:
-	-rm -rf bin/* OpenRPT/Dmtx_Library
+	-rm -rf bin/*
 	-dh_auto_clean
 
-override_dh_auto_configure:
+#override_dh_auto_configure:
 	#lrelease */*/*.ts */*.ts
 #	qmake
 	# convert to use shared libs
-	find . -name '*.pro' -exec sed -i -e 's/lib\([A-Za-z]*\)\.a/lib\1.so/'  {} \;
-	dh_auto_configure
+	#find . -name '*.pro' -exec sed -i -e 's/lib\([A-Za-z]*\)\.a/lib\1.so/'  {} \;
+#	dh_auto_configure
 
 override_dh_auto_install:
 	#mv bin/graph bin/openrpt-graph

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