[Pkg-voip-commits] r3649 - zaptel1.2/trunk/debian

[Kilian Krause]

Tzafrir,

On Wed, Jun 06, 2007 at 06:35:11AM +0000, tzafrir-guest at alioth.debian.org wrote:
> Author: tzafrir-guest
> Date: 2007-06-06 06:35:11 +0000 (Wed, 06 Jun 2007)
> New Revision: 3649
>
> Modified: zaptel1.2/trunk/debian/rules
> ===================================================================
> --- zaptel1.2/trunk/debian/rules	2007-06-06 05:04:03 UTC (rev 3648)
> +++ zaptel1.2/trunk/debian/rules	2007-06-06 06:35:11 UTC (rev 3649)
> @@ -32,8 +32,8 @@
>  		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
>  UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
>  
> -UPFILENAME := zaptel1.2_$(UPVERSION).orig.tar.gz
> -FILENAME := zaptel1.2_$(UPVERSION)~dfsg.orig.tar.gz
> +UPFILENAME := $(PREFIX)_$(UPVERSION).orig.tar.gz
> +FILENAME := $(PREFIX)_$(UPVERSION)~dfsg.orig.tar.gz
>  URL := http://ftp2.digium.com/pub/zaptel/releases/zaptel-$(UPVERSION).tar.gz
>  
>  # If the makefile was properly-writen, there was a good separation 
> @@ -64,7 +64,8 @@
>  	make install-modules KERNELRELEASE=$(KVERS) INSTALL_PREFIX=$(CURDIR)/debian/$(PKGNAME)
>  ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
>  	# The 2.6 modules are way too big. This is only in kernel 2.6
> -	find debian/$(PKGNAME)/lib/modules -name '*.ko' |xargs strip -g
> +	# FIXME: Debian surely has a proper way of stipping symbols:
> +	#find $(CURDIR)/debian/$(PKGNAME)/lib/modules -name '*.ko' |xargs strip -g
>  endif
>  	dh_installmodules
>  	dh_installdebconf

any reason to not use dh_strip here?


> @@ -111,6 +118,7 @@
>  
>  install: install-arch install-indep
>  
> +TARGET_DIR=$(CURDIR)/debian/tmp
>  install-arch: build-stamp
>  	dh_testdir
>  	dh_testroot
> @@ -119,17 +127,16 @@
>  	
>  	# Add here commands to install the package into debian/tmp
>  	
> -	$(MAKE) install-programs INSTALL_PREFIX=$(CURDIR)/debian/tmp
> -	$(MAKE) -C xpp/utils install DESTDIR=$(CURDIR)/debian/tmp
> -	/sbin/ldconfig -n $(CURDIR)/debian/tmp/usr/lib
> -	install -m 644 zaptel.conf.sample $(CURDIR)/debian/tmp/etc/zaptel.conf
> +	$(MAKE) install-programs INSTALL_PREFIX=$(TARGET_DIR)
> +	$(MAKE) -C xpp/utils install DESTDIR=$(TARGET_DIR)
> +	/sbin/ldconfig -n $(TARGET_DIR)/usr/lib

why is ldconfig needed at packaging time? It _should_ be run at postinst
time.


Thanks for your work!

-- 
Best regards,
Kilian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-voip-maintainers/attachments/20070606/8faffdf1/attachment.pgp