tag -1 patch block 976751 by -1 block 830904 by 976751 thanks Dear maintainer,
Since this bug is keeping me from fixing puppetlabs-i18n-clojure (which in turns, keeps me from packaging puppetserver in Debian), I've prepared a patch to fix it. I've successfully built the package with it and I believe it would be trivial to apply it and should not have any negative effect. I've also made sure the patch does indeed fix this bug. I had originally linked the additional jars via gettext-base.links, but that introduced a version in that file that you would've had to update for each new upstream version. Instead, I resorted to copying libintl.jar twice; as it's a very small file (4KB), I don't think this will be a significant burden. It shouldn't be necessary, but since the freeze is very close, if you don't have time to deal with this, I'd also be happy to make an NMU. Thanks for maintaining gettext in Debian! -- ⢀⣴⠾⠻⢶⣦⠀ ⣾⠁⢠⠒⠀⣿⡁ Louis-Philippe Véronneau ⢿⡄⠘⠷⠚⠋ po...@debian.org / veronneau.org ⠈⠳⣄
diff --git a/debian/gettext-base.install b/debian/gettext-base.install deleted file mode 100644 index e69de29..0000000 diff --git a/debian/libintl-0.19.8.1.pom b/debian/libintl-0.19.8.1.pom deleted file mode 100644 index e69de29..0000000 diff --git a/debian/libintl-debian.pom b/debian/libintl-debian.pom new file mode 100644 index 0000000..6e60bdd --- /dev/null +++ b/debian/libintl-debian.pom @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd";> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gnu.gettext</groupId> + <artifactId>libintl</artifactId> + <version>debian</version> + <packaging>jar</packaging> + <properties> + <debian.hasPackageVersion/> + <debian.originalVersion>0.19.8.1</debian.originalVersion> + <debian.package>gettext-base</debian.package> + </properties> +</project> diff --git a/debian/libintl.pom b/debian/libintl.pom new file mode 100644 index 0000000..df5a516 --- /dev/null +++ b/debian/libintl.pom @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd";> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gnu.gettext</groupId> + <artifactId>libintl</artifactId> + <version>0.19.8.1</version> + <packaging>jar</packaging> + <properties> + <debian.hasPackageVersion/> + <debian.originalVersion>0.19.8.1</debian.originalVersion> + <debian.package>gettext-base</debian.package> + </properties> +</project> diff --git a/debian/rules b/debian/rules index e322583..e9c12e3 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') CC = $(DEB_HOST_GNU_TYPE)-gcc CFLAGS := `dpkg-buildflags --get CFLAGS` -Wall @@ -122,6 +123,17 @@ ifeq ($(filter nojava,$(DEB_BUILD_PROFILES)),) install -d debian/$@/usr/share/java cp -p debian/tmp/usr/share/gettext/libintl.jar \ debian/$@/usr/share/java + install -d debian/$@/usr/share/maven-repo/org/gnu/gettext/libintl/$(DEB_UPSTREAM_VERSION) + cp -p debian/tmp/usr/share/gettext/libintl.jar \ + debian/$@/usr/share/maven-repo/org/gnu/gettext/libintl/$(DEB_UPSTREAM_VERSION)/libintl-$(DEB_UPSTREAM_VERSION).jar + cp -p debian/libintl.pom \ + debian/$@/usr/share/maven-repo/org/gnu/gettext/libintl/$(DEB_UPSTREAM_VERSION) + install -d debian/$@/usr/share/maven-repo/org/gnu/gettext/libintl/debian + cp -p debian/tmp/usr/share/gettext/libintl.jar \ + debian/$@/usr/share/maven-repo/org/gnu/gettext/libintl/debian/libintl-debian.jar + cp -p debian/libintl-debian.pom \ + debian/$@/usr/share/maven-repo/org/gnu/gettext/libintl/debian + endif endif
OpenPGP_signature
Description: OpenPGP digital signature
