Rewrite build process; Refresh symbols file

6 files changed, 28 insertions, 53 deletions

diff --git a/debian/changelog b/debian/changelog
index 041792f..716d214 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-uriparser (0.9.2-1) UNRELEASED; urgency=medium
+uriparser (0.9.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Refresh symbols file.
+    - Rewrite build process.
 
  -- Jörg Frings-Fürst <debian@jff.email>  Fri, 26 Apr 2019 17:58:31 +0200
 
diff --git a/debian/control b/debian/control
index d5658ca..33b7daf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,16 @@ Section: libs
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- cmake,
  debhelper (>= 11),
  dh-exec (>=0.3),
- libgtest-dev
+ qt5-default
 Build-Depends-Indep:
+ cmake,
  doxygen,
  graphviz,
  qttools5-dev-tools,
  qtbase5-dev,
+ libgtest-dev,
  libqt5sql5-sqlite
 Standards-Version: 4.3.0.1
 Homepage: http://uriparser.sourceforge.net
diff --git a/debian/copyright b/debian/copyright
index 212e9f3..9778c4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: uriparser
 Source: https://github.com/uriparser/uriparser
+Files-Excluded: doc/rfc*.htm
 
 Files: *
 Copyright: 2007      Weijia Song <songweijia@gmail.com>
diff --git a/debian/liburiparser1.symbols b/debian/liburiparser1.symbols
index f70a935..dad3a99 100644
--- a/debian/liburiparser1.symbols
+++ b/debian/liburiparser1.symbols
@@ -1,13 +1,10 @@
 liburiparser.so.1 liburiparser1 #MINVER#
- defaultMemoryManager@Base 0.9.0
  uriAddBaseUriA@Base 0.6.0
  uriAddBaseUriExA@Base 0.8.1
  uriAddBaseUriExMmA@Base 0.9.0
  uriAddBaseUriExMmW@Base 0.9.0
  uriAddBaseUriExW@Base 0.8.1
  uriAddBaseUriW@Base 0.6.0
- uriCompareRangeA@Base 0.8.1
- uriCompareRangeW@Base 0.8.1
  uriCompleteMemoryManager@Base 0.9.0
  uriComposeQueryA@Base 0.7.2
  uriComposeQueryCharsRequiredA@Base 0.7.2
@@ -23,14 +20,6 @@ liburiparser.so.1 liburiparser1 #MINVER#
  uriComposeQueryMallocExW@Base 0.7.2
  uriComposeQueryMallocW@Base 0.7.2
  uriComposeQueryW@Base 0.7.2
- uriConstParentA@Base 0.6.0
- uriConstParentW@Base 0.6.0
- uriConstPwdA@Base 0.6.0
- uriConstPwdW@Base 0.6.0
- uriCopyAuthorityA@Base 0.6.0
- uriCopyAuthorityW@Base 0.6.0
- uriCopyPathA@Base 0.6.0
- uriCopyPathW@Base 0.6.0
  uriDissectQueryMallocA@Base 0.7.2
  uriDissectQueryMallocExA@Base 0.7.2
  uriDissectQueryMallocExMmA@Base 0.9.0
@@ -45,10 +34,6 @@ liburiparser.so.1 liburiparser1 #MINVER#
  uriEscapeExA@Base 0.6.0
  uriEscapeExW@Base 0.6.0
  uriEscapeW@Base 0.6.0
- uriFixAmbiguityA@Base 0.6.0
- uriFixAmbiguityW@Base 0.6.0
- uriFixEmptyTrailSegmentA@Base 0.7.2
- uriFixEmptyTrailSegmentW@Base 0.7.2
  uriFreeQueryListA@Base 0.7.2
  uriFreeQueryListMmA@Base 0.9.0
  uriFreeQueryListMmW@Base 0.9.0
@@ -57,17 +42,6 @@ liburiparser.so.1 liburiparser1 #MINVER#
  uriFreeUriMembersMmA@Base 0.9.0
  uriFreeUriMembersMmW@Base 0.9.0
  uriFreeUriMembersW@Base 0.6.0
- uriGetOctetValue@Base 0.6.0
- uriHexToLetterA@Base 0.6.0
- uriHexToLetterExA@Base 0.7.4
- uriHexToLetterExW@Base 0.7.4
- uriHexToLetterW@Base 0.6.0
- uriHexdigToIntA@Base 0.6.0
- uriHexdigToIntW@Base 0.6.0
- uriIsHostSetA@Base 0.6.0
- uriIsHostSetW@Base 0.6.0
- uriIsUnreserved@Base 0.6.0
- uriMemoryManagerIsComplete@Base 0.9.0
  uriNormalizeSyntaxA@Base 0.6.0
  uriNormalizeSyntaxExA@Base 0.6.0
  uriNormalizeSyntaxExMmA@Base 0.9.0
@@ -90,22 +64,10 @@ liburiparser.so.1 liburiparser1 #MINVER#
  uriParseUriExA@Base 0.6.0
  uriParseUriExW@Base 0.6.0
  uriParseUriW@Base 0.6.0
- uriPushToStack@Base 0.6.0
  uriRemoveBaseUriA@Base 0.6.0
  uriRemoveBaseUriMmA@Base 0.9.0
  uriRemoveBaseUriMmW@Base 0.9.0
  uriRemoveBaseUriW@Base 0.6.0
- uriRemoveDotSegmentsA@Base 0.6.0
- uriRemoveDotSegmentsAbsoluteA@Base 0.6.4
- uriRemoveDotSegmentsAbsoluteW@Base 0.6.4
- uriRemoveDotSegmentsExA@Base 0.7.4
- uriRemoveDotSegmentsExW@Base 0.7.4
- uriRemoveDotSegmentsW@Base 0.6.0
- uriResetUriA@Base 0.6.0
- uriResetUriW@Base 0.6.0
- uriSafeToPointToA@Base 0.6.0
- uriSafeToPointToW@Base 0.6.0
- uriStackToOctet@Base 0.6.0
  uriTestMemoryManager@Base 0.9.0
  uriToStringA@Base 0.6.0
  uriToStringCharsRequiredA@Base 0.6.0
@@ -123,8 +85,3 @@ liburiparser.so.1 liburiparser1 #MINVER#
  uriUriStringToWindowsFilenameW@Base 0.6.0
  uriWindowsFilenameToUriStringA@Base 0.6.0
  uriWindowsFilenameToUriStringW@Base 0.6.0
- uriWriteQuadToDoubleByte@Base 0.6.0
- uri_TESTING_ONLY_ParseIpFourA@Base 0.6.0
- uri_TESTING_ONLY_ParseIpFourW@Base 0.6.0
- uri_TESTING_ONLY_ParseIpSixA@Base 0.6.0
- uri_TESTING_ONLY_ParseIpSixW@Base 0.6.0
diff --git a/debian/patches/0001-missing_pthread.patch b/debian/patches/0001-missing_pthread.patch
index 3054ce9..8afe6ae 100644
--- a/debian/patches/0001-missing_pthread.patch
+++ b/debian/patches/0001-missing_pthread.patch
@@ -2,12 +2,30 @@ Index: trunk/CMakeLists.txt
 ===================================================================
 --- trunk.orig/CMakeLists.txt
 +++ trunk/CMakeLists.txt
-@@ -209,7 +209,7 @@ if(URIPARSER_BUILD_TOOLS)
+@@ -212,7 +212,8 @@ if(URIPARSER_BUILD_TOOLS)
          tool/uriparse.c
      )
  
 -    target_link_libraries(uriparse PUBLIC uriparser)
++    find_package(Threads REQUIRED)
 +    target_link_libraries(uriparse PUBLIC uriparser pthread)
  
      if(HAIKU)
          # Function inet_ntop needs -lsocket or -lnetwork (see pull request #45)
+@@ -245,6 +246,7 @@ if(URIPARSER_BUILD_TESTS)
+     enable_testing()
+ 
+     find_package(GTest 1.8.1 REQUIRED)
++    find_package(Threads REQUIRED)
+ 
+     add_executable(testrunner
+         test/FourSuite.cpp
+@@ -274,7 +276,7 @@ if(URIPARSER_BUILD_TESTS)
+     )
+ 
+     target_link_libraries(testrunner PUBLIC
+-        ${GTEST_BOTH_LIBRARIES}
++        ${GTEST_BOTH_LIBRARIES} pthread
+     )
+ 
+     add_test(
diff --git a/debian/rules b/debian/rules
index 0639e27..68cb768 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,22 +19,18 @@ ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	confflags += --host $(DEB_HOST_GNU_TYPE)
 endif
 
-###
 
 %:
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure --buildsystem=cmake 
-#$(confflags)
-#	./configure $(confflags)
+	dh_auto_configure --buildsystem=cmake
 
 override_dh_auto_build-indep:
 	dh_auto_build
-	make -C doc
 
 override_dh_installdocs-indep:
-	cp -r $(CURDIR)/doc/html/* $(CURDIR)/debian/liburiparser-doc/usr/share/doc/liburiparser-doc/html/
+	cp -r $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)/doc/html/* $(CURDIR)/debian/liburiparser-doc/usr/share/doc/liburiparser-doc/html/
 	$(RM) debian/liburiparser-doc/usr/share/doc/liburiparser-doc/html/*.md5
 	dh_installdocs