Skip to content

(Debian packaging) use system uft8proc, ensure bundled source is not … #1339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 13, 2023
Merged

(Debian packaging) use system uft8proc, ensure bundled source is not … #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e149bb9
(Debian packaging) use system uft8proc, ensure bundled source is not …
rcsanchez97 Jul 10, 2023
6df9fe7
fix typo
rcsanchez97 Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions debian/gbp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down