diff options
24 files changed, 39 insertions, 91 deletions
diff --git a/debian/escputil.install b/debian/escputil.install new file mode 100644 index 0000000..64cf87c --- /dev/null +++ b/debian/escputil.install @@ -0,0 +1,2 @@ +usr/bin/escputil +usr/share/man/man1/escputil.1 diff --git a/debian/escputil.install.in b/debian/escputil.install.in deleted file mode 100644 index 75d88a3..0000000 --- a/debian/escputil.install.in +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/bin/escputil usr/bin -debian/install/usr/share/man/man1/escputil.1 usr/share/man/man1 diff --git a/debian/foomatic-db-gutenprint.install b/debian/foomatic-db-gutenprint.install new file mode 100644 index 0000000..dbac047 --- /dev/null +++ b/debian/foomatic-db-gutenprint.install @@ -0,0 +1,2 @@ +usr/share/foomatic/db/source/driver/gutenprint*.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs* diff --git a/debian/foomatic-db-gutenprint.install.in b/debian/foomatic-db-gutenprint.install.in deleted file mode 100644 index dc49f93..0000000 --- a/debian/foomatic-db-gutenprint.install.in +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/share/foomatic/db/source/driver/gutenprint*.xml usr/share/foomatic/db/source/driver -debian/install/usr/share/foomatic/db/source/opt/gutenprint-ijs* usr/share/foomatic/db/source/opt diff --git a/debian/gimp-gutenprint.install b/debian/gimp-gutenprint.install new file mode 100644 index 0000000..935c55d --- /dev/null +++ b/debian/gimp-gutenprint.install @@ -0,0 +1,2 @@ +usr/lib/gimp/2.0/plug-ins/gutenprint +samples/*.png usr/share/doc/gutenprint/samples diff --git a/debian/gimp-gutenprint.install.in b/debian/gimp-gutenprint.install.in deleted file mode 100644 index ba3ece0..0000000 --- a/debian/gimp-gutenprint.install.in +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/lib/gimp/2.0/plug-ins/gutenprint usr/lib/gimp/2.0/plug-ins -samples/*.png usr/share/doc/gutenprint/samples diff --git a/debian/gutenprint-doc.install b/debian/gutenprint-doc.install new file mode 100644 index 0000000..1950f64 --- /dev/null +++ b/debian/gutenprint-doc.install @@ -0,0 +1,2 @@ +usr/share/gutenprint/doc/gutenprint-users-manual.pdf usr/share/doc/gutenprint-doc +usr/share/gutenprint/doc/gutenprint-users-manual.odt usr/share/doc/gutenprint-doc diff --git a/debian/gutenprint-doc.install.in b/debian/gutenprint-doc.install.in deleted file mode 100644 index e76155a..0000000 --- a/debian/gutenprint-doc.install.in +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/share/gutenprint/doc/gutenprint-users-manual.pdf usr/share/doc/gutenprint-doc -debian/install/usr/share/gutenprint/doc/gutenprint-users-manual.odt usr/share/doc/gutenprint-doc diff --git a/debian/gutenprint-locales.install b/debian/gutenprint-locales.install new file mode 100644 index 0000000..3635480 --- /dev/null +++ b/debian/gutenprint-locales.install @@ -0,0 +1 @@ +usr/share/locale diff --git a/debian/gutenprint-locales.install.in b/debian/gutenprint-locales.install.in deleted file mode 100644 index 525d334..0000000 --- a/debian/gutenprint-locales.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/install/usr/share/locale usr/share diff --git a/debian/ijsgutenprint.install b/debian/ijsgutenprint.install new file mode 100644 index 0000000..19d0136 --- /dev/null +++ b/debian/ijsgutenprint.install @@ -0,0 +1,2 @@ +usr/bin/ijsgutenprint.5.2 +usr/share/man/man1/ijsgutenprint.1 diff --git a/debian/ijsgutenprint.install.in b/debian/ijsgutenprint.install.in deleted file mode 100644 index 39e9d13..0000000 --- a/debian/ijsgutenprint.install.in +++ /dev/null @@ -1,2 +0,0 @@ -debian/install/usr/bin/ijsgutenprint.5.2 usr/bin -debian/install/usr/share/man/man1/ijsgutenprint.1 usr/share/man/man1 diff --git a/debian/libgutenprint-dev.install b/debian/libgutenprint-dev.install new file mode 100644 index 0000000..cce42ee --- /dev/null +++ b/debian/libgutenprint-dev.install @@ -0,0 +1,3 @@ +usr/lib/*/libgutenprint.so +usr/lib/*/pkgconfig/gutenprint.pc +usr/include/gutenprint diff --git a/debian/libgutenprint-dev.install.in b/debian/libgutenprint-dev.install.in deleted file mode 100644 index bcdf187..0000000 --- a/debian/libgutenprint-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/@LIBDIR@/libgutenprint.so @LIBDIR@ -debian/install/@LIBDIR@/pkgconfig/gutenprint.pc @LIBDIR@/pkgconfig -debian/install/usr/include/gutenprint usr/include diff --git a/debian/libgutenprint-doc.install.in b/debian/libgutenprint-doc.install index 2864212..2864212 100644 --- a/debian/libgutenprint-doc.install.in +++ b/debian/libgutenprint-doc.install diff --git a/debian/libgutenprint2.install b/debian/libgutenprint2.install new file mode 100644 index 0000000..4e7fa63 --- /dev/null +++ b/debian/libgutenprint2.install @@ -0,0 +1,3 @@ +usr/lib/*/libgutenprint.so.* +usr/lib/*/gutenprint +usr/share/gutenprint/5.2 diff --git a/debian/libgutenprint2.install.in b/debian/libgutenprint2.install.in deleted file mode 100644 index 0a9f0c3..0000000 --- a/debian/libgutenprint2.install.in +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/@LIBDIR@/libgutenprint.so.* @LIBDIR@ -debian/install/@LIBDIR@/gutenprint @LIBDIR@ -debian/install/usr/share/gutenprint/5.2 usr/share/gutenprint diff --git a/debian/libgutenprintui2-1.install b/debian/libgutenprintui2-1.install new file mode 100644 index 0000000..e2a1354 --- /dev/null +++ b/debian/libgutenprintui2-1.install @@ -0,0 +1 @@ +usr/lib/*/libgutenprintui2.so.* diff --git a/debian/libgutenprintui2-1.install.in b/debian/libgutenprintui2-1.install.in deleted file mode 100644 index 6aedeb5..0000000 --- a/debian/libgutenprintui2-1.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/install/@LIBDIR@/libgutenprintui2.so.* @LIBDIR@ diff --git a/debian/libgutenprintui2-dev.install b/debian/libgutenprintui2-dev.install new file mode 100644 index 0000000..f0df560 --- /dev/null +++ b/debian/libgutenprintui2-dev.install @@ -0,0 +1,3 @@ +usr/lib/*/libgutenprintui2.so +usr/lib/*/pkgconfig/gutenprintui2.pc +usr/include/gutenprintui2 diff --git a/debian/libgutenprintui2-dev.install.in b/debian/libgutenprintui2-dev.install.in deleted file mode 100644 index 3c986f6..0000000 --- a/debian/libgutenprintui2-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/@LIBDIR@/libgutenprintui2.so @LIBDIR@ -debian/install/@LIBDIR@/pkgconfig/gutenprintui2.pc @LIBDIR@/pkgconfig -debian/install/usr/include/gutenprintui2 usr/include diff --git a/debian/printer-driver-gutenprint.install b/debian/printer-driver-gutenprint.install new file mode 100644 index 0000000..988517c --- /dev/null +++ b/debian/printer-driver-gutenprint.install @@ -0,0 +1,7 @@ +etc/cups/command.types usr/share/cups/mime +usr/bin/cups-calibrate +usr/sbin/cups-genppdupdate +usr/lib/cups +usr/share/cups/calibrate.ppm +usr/share/man/man8/cups-calibrate.8 +usr/share/man/man8/cups-genppdupdate.8 diff --git a/debian/printer-driver-gutenprint.install.in b/debian/printer-driver-gutenprint.install.in deleted file mode 100644 index a8fb001..0000000 --- a/debian/printer-driver-gutenprint.install.in +++ /dev/null @@ -1,7 +0,0 @@ -debian/install/etc/cups/command.types usr/share/cups/mime -debian/install/usr/bin/cups-calibrate usr/bin -debian/install/usr/sbin/cups-genppdupdate usr/sbin -debian/install/usr/lib/cups usr/lib -debian/install/usr/share/cups/calibrate.ppm usr/share/cups -debian/install/usr/share/man/man8/cups-calibrate.8 usr/share/man/man8 -debian/install/usr/share/man/man8/cups-genppdupdate.8 usr/share/man/man8 diff --git a/debian/rules b/debian/rules index 849baa3..358245b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,33 +1,7 @@ #!/usr/bin/make -f -# rules to package gutenprint -# -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -LIBDIR = usr/lib/$(DEB_HOST_MULTIARCH) - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -DH_OPTIONS = --with autotools_dev --builddirectory=debian/build - -DH_INSTALL_FILES = $(basename $(wildcard debian/*.install.in)) - -# Use debhelper's dh %: - dh $@ $(DH_OPTIONS) - -%.install: %.install.in - sed -e 's;@LIBDIR@;$(LIBDIR);g' <$< >$@ + dh $@ --with autotools_dev --parallel update-patch-series: mkdir -p $(CURDIR)/debian/patches @@ -40,11 +14,8 @@ update-patch-series: mv $${patch}.chomped $$patch; \ done -override_dh_auto_configure: debian/build/config.status -debian/build/config.status: configure debian/control -# Note: manually specifying libdir to work around bug in configure script +override_dh_auto_configure: dh_auto_configure -- \ - --libdir=/$(LIBDIR) \ --disable-static --enable-shared --disable-rpath \ --disable-static-genppd \ --with-modules=dlopen \ @@ -54,34 +25,16 @@ debian/build/config.status: configure debian/control --disable-test \ --enable-nls -override_dh_auto_clean: - dh_auto_clean - rm -f $(DH_INSTALL_FILES) - rm -rf debian/install debian/install-stamp - -override_dh_auto_build: - $(MAKE) -C debian/build - -override_dh_auto_test: -# Testsuite takes too long to run per-build, so skip. - -override_dh_auto_install: debian/install-stamp -debian/install-stamp: - $(MAKE) -C debian/build DESTDIR=$(CURDIR)/debian/install install - touch $@ - -install-arch: build-arch $(DH_INSTALL_FILES) - dh $@ $(DH_OPTIONS) - -install-indep: build-indep $(DH_INSTALL_FILES) - dh $@ $(DH_OPTIONS) - - rm -r debian/cups-driver-gutenprint/usr/share/doc/cups-driver-gutenprint/ - ln -s printer-driver-gutenprint debian/cups-driver-gutenprint/usr/share/doc/cups-driver-gutenprint +override_dh_install-indep: + dh_install -i rm -f debian/gutenprint-locales/usr/share/locale/*/*.po +override_dh_installdocs: + dh_installdocs -pcups-driver-gutenprint --link-doc=printer-driver-gutenprint + dh_installdocs --remaining-packages + override_dh_install-arch: - dh_install + dh_install -a # Remove rpath find debian/printer-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete # Documentation fixup @@ -96,10 +49,5 @@ override_dh_installchangelogs: override_dh_compress: dh_compress -X.pdf -X.odt -override_dh_makeshlibs: - dh_makeshlibs -s -V -X $(LIBDIR)/gutenprint - -override_dh_shlibdeps: - dh_shlibdeps -s -X $(LIBDIR)/gutenprint -l$(CURDIR)/debian/libgutenprint2/$(LIBDIR):$(CURDIR)/debian/libgutenprintui2-1/$(LIBDIR) - -.PHONY: install-arch install-indep update-patch-series override_dh_auto_configure override_dh_auto_clean override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installchangelogs override_dh_compress override_dh_makeshlibs override_dh_shlibdeps +override_dh_auto_test: + - dh_auto_test |