tags 518745 + pending
thanks
Dear maintainer,
I've prepared an NMU for cbmplugs (versioned as 1.2.1-1.1) and uploaded
it to DELAYED/2, as allowed by devref §5.11.1. The patch is those you
can find in the bug log, by Tzafrir Cohen (thanks for the patch,
BTW!). In essence, the patch avoid using hard-coded sed magic and rather
relies on pkg-config information to look up gimp data dir. It also uses
more properly $(DESTDIR).
Cheers.
--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..| . |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u cbmplugs-1.2.1/debian/changelog cbmplugs-1.2.1/debian/changelog
--- cbmplugs-1.2.1/debian/changelog
+++ cbmplugs-1.2.1/debian/changelog
@@ -1,3 +1,12 @@
+cbmplugs (1.2.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Use pkg-config in Makefile instead of relying on hard-coded sed magic
+ to find out gimp data dir. Patch from Tzafrir Cohen. Fix FTBFS.
+ (Closes: #518745)
+
+ -- Stefano Zacchiroli <[email protected]> Wed, 16 Sep 2009 13:20:29 +0200
+
cbmplugs (1.2.1-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- cbmplugs-1.2.1.orig/Makefile
+++ cbmplugs-1.2.1/Makefile
@@ -9,12 +9,12 @@
ifdef GIMP12
GIMPTOOL := gimptool-1.2
-PALETTE_DIR := $(DESTDIR)/usr/share/gimp/1.2/palettes
+PALETTE_DIR := /usr/share/gimp/1.2/palettes
AM_CFLAGS += -DGIMP12
EXTENSION := $(EXTENSION12)
else
GIMPTOOL := gimptool-2.0
-PALETTE_DIR := $(DESTDIR)/usr/share/gimp/2.0/palettes
+PALETTE_DIR := /usr/share/gimp/2.0/palettes
EXTENSION := $(EXTENSION20)
endif
@@ -23,8 +23,7 @@
GIMP_UNINSTALL_BIN := --uninstall-bin
# Use Makefile as plugin to install, to be sure the file exists
PALETTE_DIR := \
- $$($(GIMPTOOL) --dry-run $(GIMP_INSTALL_BIN) Makefile | \
- tail -n 1 | sed -e 's/.* \(.*\)\/Makefile/\1/;s/plug-ins/palettes/')
+ $(shell pkg-config --variable=gimpdatadir gimp-2.0)/palettes
else
GIMP_INSTALL_BIN := --install-admin-bin
GIMP_UNINSTALL_BIN := --uninstall-admin-bin
@@ -32,8 +31,7 @@
# Use Makefile as plugin to install, to be sure the file exists
PLUGIN_DIR := \
- $$($(GIMPTOOL) --dry-run $(GIMP_INSTALL_BIN) Makefile | \
- tail -n 1 | sed -e 's/.* \(.*\)\/Makefile/\1/')
+ $(shell pkg-config --variable=gimplibdir gimp-2.0)/plug-ins
AM_CFLAGS += `$(GIMPTOOL) --cflags-noui`
# AM_CFLAGS += -Werror
@@ -74,16 +72,16 @@
.PHONY: install-plugins
install-plugins:
- $(INSTALL_DIR) $(PLUGIN_DIR) &&\
+ $(INSTALL_DIR) $(DESTDIR)$(PLUGIN_DIR) &&\
for plugin in $(PLUGINS); do \
- $(INSTALL) $$plugin$(EXTENSION) $(PLUGIN_DIR); \
+ $(INSTALL) $$plugin$(EXTENSION) $(DESTDIR)$(PLUGIN_DIR);\
done
.PHONY: install-palettes
install-palettes:
- $(INSTALL_DIR) $(PALETTE_DIR) &&\
+ $(INSTALL_DIR) $(DESTDIR)$(PALETTE_DIR) &&\
for palette in $(PALETTES); do \
- $(INSTALL_DATA) $$palette $(PALETTE_DIR); \
+ $(INSTALL_DATA) $$palette $(DESTDIR)$(PALETTE_DIR); \
done
.PHONY: install
