(Debian packaging) use system utf8proc, ensure bundled source is not in .orig.tar.gz (#1339)

Follow up for 47dc666

Author: rcsanchez97

debian/changelog

@@ -1,3 +1,9 @@
+mongo-c-driver (1.24.2-2) UNRELEASED; urgency=medium
+
+  * use system utf8proc, ensure bundled source is not in .orig.tar.gz
+
+ -- Roberto C. Sanchez <[email protected]>  Mon, 10 Jul 2023 14:04:12 -0400
+
 mongo-c-driver (1.24.2-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 11),
                libicu-dev,
                libsasl2-dev,
                libsnappy-dev,
+               libutf8proc-dev,
                libzstd-dev
 Standards-Version: 4.6.2
 Section: libs
@@ -32,6 +33,7 @@ Depends: libmongoc-1.0-0 (= ${binary:Version}),
          zlib1g-dev,
          libsnappy-dev,
          libsasl2-dev,
+         libutf8proc-dev,
          libzstd-dev,
          ${misc:Depends}
 Description: MongoDB C client library - dev files

debian/gbp.conf

@@ -11,11 +11,13 @@ prebuild = bash -c "
     # Determine list of embedded sources to exclude from Debian source package
     zlib_filter_files=\"$(find src/zlib-* -mindepth 1 -maxdepth 1 \! -name zconf.h.in -printf "mongo-c-driver-\${upstream_version}/%p ")\" &&
     zlib_rm_files=\"$(find src/zlib-* -mindepth 1 -maxdepth 1 \! -name zconf.h.in -printf '%p ')\" &&
+    utf8proc_filter_files=\"$(find src/utf8proc-* -printf "mongo-c-driver-\${upstream_version}/%p ")\" &&
+    utf8proc_rm_files=\"$(find src/utf8proc-* -printf '%p ')\" &&
     # Create upstream tarball from reference, exclude items that do not belong
     pushd $GBP_GIT_DIR/.. &&
-    git archive --format=tar --prefix=mongo-c-driver-\${upstream_version}/ HEAD | tar -f - --delete mongo-c-driver-\${upstream_version}/debian \$zlib_filter_files | gzip > $GBP_BUILD_DIR/../mongo-c-driver_\${upstream_version}.orig.tar.gz &&
+    git archive --format=tar --prefix=mongo-c-driver-\${upstream_version}/ HEAD | tar -f - --delete mongo-c-driver-\${upstream_version}/debian \$zlib_filter_files \$utf8proc_filter_files | gzip > $GBP_BUILD_DIR/../mongo-c-driver_\${upstream_version}.orig.tar.gz &&
     popd &&
-    rm -rf \$zlib_rm_files"
+    rm -rf \$zlib_rm_files \$utf8proc_rm_files"
 
 upstream-tree = BRANCH
 upstream-branch = master

debian/rules

@@ -40,7 +40,8 @@ override_dh_auto_configure:
 	-DENABLE_HTML_DOCS=$(DOCS) \
 	-DENABLE_MAINTAINER_FLAGS=ON \
 	-DENABLE_TESTS=OFF \
-	-DENABLE_ZLIB=SYSTEM
+	-DENABLE_ZLIB=SYSTEM \
+	-DUSE_BUNDLED_UTF8PROC=OFF
 
 override_dh_auto_install:
 	dh_auto_install