On Fri, Dec 07, 2001 at 05:19:36AM +0100, Manfred Wassmann wrote:
> I have uploaded my current Debian packages to
> http://www.b.shuttle.de/ncc-1701/foomatic/
Well, it appears the shoe is on the other foot when it comes to
activity :-). Sorry for taking so long; a sustained dose of real life
around the holidays conspired to derail me.
The latest packages as they appear on that site looked OK, except for
the small problem that Defaults.pm wasn't getting installed in
packages built from the source. In looking at that problem, I
discovered a host of other problems in your debian/rules file, and one
thing led to another...
I've attached the patch; it amounts to changes in debian/rules only.
If you approve, I'm ready to upload it. It's lintian clean and
appears to work, though I did have some issues getting test pages
printed with a foomatic-configure configured printer and CUPS. (I'll
look into that later.)
diff --unified --recursive foomatic-0.20011210-old/debian/rules
foomatic-0.20011210/debian/rules
--- foomatic-0.20011210-old/debian/rules Tue Dec 11 02:20:16 2001
+++ foomatic-0.20011210/debian/rules Sun Dec 30 02:46:29 2001
@@ -1,13 +1,12 @@
#!/usr/bin/make -f
-DH_COMPAT=2
+export DH_COMPAT=2
PREFIX=/usr
# CUPS_FILTERS=$(PREFIX)/sbin
-ARCH_INSTALLPREFIX=$(CURDIR)/debian/tmp
+ARCH_INSTALLPREFIX=$(CURDIR)/debian/foomatic-bin
INDEP_INSTALLPREFIX=$(CURDIR)/debian/foomatic-db
-export INSTALLPREFIX
MAKEFLAGS:=$(MAKEFLAGS) PREFIX=$(PREFIX) PERL_INSTALLDIRS=vendor
@@ -15,38 +14,25 @@
all: binary
-install-indep: INSTALLPREFIX=$(INDEP_INSTALLPREFIX)
-install-indep:
- dh_clean -k -i
+install-indep:
+install-indep: build
dh_installdirs -i
+ INSTALLPREFIX=$(INDEP_INSTALLPREFIX) $(MAKE) -ef Makefile install-db
-install-arch: INSTALLPREFIX=$(ARCH_INSTALLPREFIX)
-install-arch:
- dh_clean -k -a
+install-arch:
+install-arch: build
dh_installdirs -a
+ INSTALLPREFIX=$(ARCH_INSTALLPREFIX) $(MAKE) -ef Makefile install-bin
# FIXME: Why doesn't this get installed through lib/Makefile
- cp -pv lib/Foomatic/Defaults.pm
$(INSTALLPREFIX)/usr/share/perl5/Foomatic
+ cp -pv lib/Foomatic/Defaults.pm
$(ARCH_INSTALLPREFIX)/usr/share/perl5/Foomatic
install: install-indep install-arch
- dh_clean
- dh_installdirs
-
-
-build-indep: INSTALLPREFIX=$(INDEP_INSTALLPREFIX)
-build-indep:
- $(MAKE) -ef Makefile install-db
- touch build-indep
-
-
-build-arch: INSTALLPREFIX=$(ARCH_INSTALLPREFIX)
-build-arch:
- $(MAKE) -ef Makefile build install-bin
- touch build-arch
-build: build-indep build-arch
+build:
+ $(MAKE) -ef Makefile build
touch build
@@ -58,50 +44,48 @@
dh_clean
-binary-indep: DH_OPTIONS=-i INSTALLPREFIX=$(INDEP_INSTALLPREFIX)
-binary-indep:
- dh_installdirs
- dh_installdocs
- dh_installexamples
- dh_installchangelogs
- dh_installmenu
- dh_installcron
+binary-indep: install-indep
+ dh_installdirs -i
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installchangelogs -i
+ dh_installmenu -i
+ dh_installcron -i
# No manpages for the data files yet
# dh_installman -pfoomatic-db
- dh_movefiles
- dh_strip
- dh_compress
- dh_fixperms
- dh_shlibdeps
- dh_perl /usr/share/foomatic
- dh_gencontrol
- dh_makeshlibs
- dh_installdeb
- dh_md5sums
- dh_builddeb
-
-
-binary-arch: DH_OPTIONS=-a INSTALLPREFIX=$(ARCH_INSTALLPREFIX)
-binary-arch:
- dh_installdirs
- dh_installdocs
- dh_installexamples
- dh_installchangelogs
- dh_installmenu
- dh_installcron
- dh_installman
- dh_movefiles
- dh_strip
- dh_compress
- dh_fixperms
- dh_suidregister
- dh_shlibdeps
- dh_perl /usr/share/foomatic
- dh_gencontrol
- dh_makeshlibs
- dh_installdeb
- dh_md5sums
- dh_builddeb
+# dh_movefiles -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_shlibdeps -i
+ dh_perl -i /usr/share/foomatic
+ dh_gencontrol -i
+ dh_makeshlibs -i
+ dh_installdeb -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+
+binary-arch: install-arch
+ dh_installdirs -a
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installchangelogs -a
+ dh_installmenu -a
+ dh_installcron -a
+ dh_installman -a
+# dh_movefiles -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_suidregister -a
+ dh_shlibdeps -a
+ dh_perl -a /usr/share/foomatic
+ dh_gencontrol -a
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-indep binary-arch
