Control: tags 949422 + patch
Dear maintainer, I've prepared an NMU for osmo (versioned as 0.4.4-1.1). The diff is attached to this message. As this package is marked LowNMU, I will seek sponsorship to upload shortly. Please let me know if you would prefer to upload this version yourself. Kind regards, Hugh
diff -Nru osmo-0.4.4/debian/changelog osmo-0.4.4/debian/changelog --- osmo-0.4.4/debian/changelog 2020-07-15 10:06:11.000000000 +1000 +++ osmo-0.4.4/debian/changelog 2022-09-29 14:59:38.000000000 +1000 @@ -1,3 +1,10 @@ +osmo (0.4.4-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Use pkg-config to find libxml2 (Closes: #949422). + + -- Hugh McMaster <hugh.mcmas...@outlook.com> Thu, 29 Sep 2022 14:59:38 +1000 + osmo (0.4.4-1) unstable; urgency=medium * New upstream version 0.4.4. diff -Nru osmo-0.4.4/debian/patches/libxml2.patch osmo-0.4.4/debian/patches/libxml2.patch --- osmo-0.4.4/debian/patches/libxml2.patch 1970-01-01 10:00:00.000000000 +1000 +++ osmo-0.4.4/debian/patches/libxml2.patch 2022-09-29 12:04:07.000000000 +1000 @@ -0,0 +1,29 @@ +Description: Use pkg-config to find libxml2 +Author: Maxim Gordienko <mgordie...@users.sourceforge.net> +Bug-Debian: https://bugs.debian.org/949422 +Origin: upstream, https://sourceforge.net/p/osmo-pim/osmo/ci/843cf52c73f7fe9e89982b0795a206be1b90784d/ +Last-Update: 2022-09-27 + +--- a/configure.ac ++++ b/configure.ac +@@ -57,8 +57,7 @@ + AM_PATH_GTK_3_0(3.10.0,, + AC_MSG_ERROR([GTK+ not found or too old (version < 3.10)])) + +-AM_PATH_XML2(2.0.0,, +- AC_MSG_ERROR([You do not appear to have libxml2 installed.])) ++PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.9]) + + PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.6.0) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,7 @@ + VERSION_MICRO := $(shell echo $(VERSION) | awk -F "." '{print $$3}') + AM_CPPFLAGS = -DREPO=$(ISREPO) -DREVISION=$(REVISION) -DLOCALEDIR=\"$(datadir)/locale\" -DDATADIR=\"$(datadir)\" \ + -DVERSION_MAJOR=\"$(VERSION_MAJOR)\" -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_MICRO=\"$(VERSION_MICRO)\" \ +- -DSOUNDSDIR=\"$(datadir)/sounds\" @GTK_CFLAGS@ @XML_CPPFLAGS@ -Wall -DGDK_DISABLE_DEPRECATION_WARNINGS \ ++ -DSOUNDSDIR=\"$(datadir)/sounds\" @GTK_CFLAGS@ @XML_CFLAGS@ -Wall -DGDK_DISABLE_DEPRECATION_WARNINGS \ + -DICONSDIR=\"$(datadir)/icons\" -DPIXMAPSDIR=\"$(datadir)/pixmaps\" \ + -DG_DISABLE_CAST_CHECKS + diff -Nru osmo-0.4.4/debian/patches/series osmo-0.4.4/debian/patches/series --- osmo-0.4.4/debian/patches/series 1970-01-01 10:00:00.000000000 +1000 +++ osmo-0.4.4/debian/patches/series 2022-09-29 12:04:07.000000000 +1000 @@ -0,0 +1 @@ +libxml2.patch
