Bug#377928: diff for 8.15.1.dfsg.1-2.1 NMU
Package: gs-esp
Version: 8.15.1.dfsg.1-2
Severity: normal
Tags: patch
Hi,
Attached is the diff for my gs-esp 8.15.1.dfsg.1-2.1 NMU.
diff -u gs-esp-8.15.1.dfsg.1/debian/changelog gs-esp-8.15.1.dfsg.1/debian/changelog
--- gs-esp-8.15.1.dfsg.1/debian/changelog
+++ gs-esp-8.15.1.dfsg.1/debian/changelog
@@ -1,3 +1,12 @@
+gs-esp (8.15.1.dfsg.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * When installing, don't use $install_prefix, as it's applied multiple times
+ in some situations; instead, hard-code all the destinations. Fixes FTBFS.
+ (Closes: #376484)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Wed, 12 Jul 2006 00:09:41 +0200
+
gs-esp (8.15.1.dfsg.1-2) unstable; urgency=low
* Updated KRGB support to 1.2, thanks hmh - closes: #354394
diff -u gs-esp-8.15.1.dfsg.1/debian/rules gs-esp-8.15.1.dfsg.1/debian/rules
--- gs-esp-8.15.1.dfsg.1/debian/rules
+++ gs-esp-8.15.1.dfsg.1/debian/rules
@@ -80,23 +80,16 @@
# Add here commands to install the package into debian/gs-esp.
$(MAKE) install \
- install_prefix=$(CURDIR)/debian/gs-esp/usr \
prefix=$(CURDIR)/debian/gs-esp/usr \
datadir=$(CURDIR)/debian/gs-esp/usr/share \
- cups_serverroot=$(CURDIR)/debian/gs-esp/etc/cups \
+ docdir=$(CURDIR)/debian/gs-esp/usr/share/doc/gs-esp \
+ exdir=$(CURDIR)/debian/gs-esp/usr/share/doc/gs-esp/examples \
cups_serverbin=$(CURDIR)/debian/gs-esp/usr/lib/cups \
+ CUPSSERVER=$(CURDIR)/debian/gs-esp/usr/lib/cups \
+ CUPSCONFIG=$(CURDIR)/debian/gs-esp/etc/cups \
+ CUPSDATA=$(CURDIR)/debian/gs-esp/usr/share/cups \
$(FT_OPTS)
-
- # Correct the incorrect locations for the pstoraster stuff.
- mv $(CURDIR)/debian/gs-esp/usr/usr/lib/cups $(CURDIR)/debian/gs-esp/usr/lib
- mv $(CURDIR)/debian/gs-esp/usr/usr/share/cups $(CURDIR)/debian/gs-esp/usr/share
- mv $(CURDIR)/debian/gs-esp/usr/usr/share/gs-esp $(CURDIR)/debian/gs-esp/usr/share
- mv $(CURDIR)/debian/gs-esp/usr/usr/share/doc/gs-esp/* $(CURDIR)/debian/gs-esp/usr/share/doc/gs-esp
- mv $(CURDIR)/debian/gs-esp/usr/etc $(CURDIR)/debian/gs-esp/etc
-
- rm -rf $(CURDIR)/debian/gs-esp/usr/usr/share
- rm -rf $(CURDIR)/debian/gs-esp/usr/usr
-
+
# We only need gs-esp binary (others are in gs-common)
rm -f $(CURDIR)/debian/gs-esp/usr/bin/*
cp bin/* $(CURDIR)/debian/gs-esp/usr/bin
Reply to: