[Pkg-voip-commits] r3620 - asterisk-addons/trunk/debian

Sun May 27 13:29:56 UTC 2007

Author: kilian
Date: 2007-05-27 13:29:56 +0000 (Sun, 27 May 2007)
New Revision: 3620

Modified:
   asterisk-addons/trunk/debian/control
   asterisk-addons/trunk/debian/copyright
   asterisk-addons/trunk/debian/rules
Log:
some cleanup.
Still needs some more touches with debian/copyright and tweaking the configure calls.


Modified: asterisk-addons/trunk/debian/control
===================================================================

--- asterisk-addons/trunk/debian/control	2007-05-27 12:41:08 UTC (rev 3619)
+++ asterisk-addons/trunk/debian/control	2007-05-27 13:29:56 UTC (rev 3620)
@@ -27,7 +27,6 @@
 # A sqlite driven config handler
 # A sqlite cdr_handler
 # A Dialplan based SQL interaction system
- 
 
 Package: asterisk-mp3
 Architecture: any
@@ -40,6 +39,6 @@
 Architecture: any
 Provides: asterisk-h323
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Asterisk H323 channel (ooh323c stack)
- This channel is a re-implementation of the H323 protocol for Asterisk, 
+Description: Asterisk H.323 channel (ooh323c stack)
+ This channel is a re-implementation of the H.323 protocol for Asterisk, 
  independent of OpenH323.

Modified: asterisk-addons/trunk/debian/copyright
===================================================================
--- asterisk-addons/trunk/debian/copyright	2007-05-27 12:41:08 UTC (rev 3619)
+++ asterisk-addons/trunk/debian/copyright	2007-05-27 13:29:56 UTC (rev 3620)
@@ -1,7 +1,7 @@
 This package was debianized by Tzafrir Cohen <tzafrir.cohen at xorcom.com> on
 Mon,  4 Apr 2005 02:26:23 +0300.
 
-It was downloaded from http://ftp.asterisk.org/pub/asterisk
+It was downloaded from http://ftp2.digium.com/pub/asterisk/releases/
 
 NEEDS FURTHER REVIEW!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

Modified: asterisk-addons/trunk/debian/rules
===================================================================
--- asterisk-addons/trunk/debian/rules	2007-05-27 12:41:08 UTC (rev 3619)
+++ asterisk-addons/trunk/debian/rules	2007-05-27 13:29:56 UTC (rev 3620)
@@ -15,7 +15,10 @@
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
+export DH_COMPART = 4
 
+export PROC := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -25,9 +28,9 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+# some generics
+confflags += --prefix=/usr --sysconfdir=/etc/asterisk
 
-export DH_COMPART = 4
-
 PACKEAGE:=asterisk-addons
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
@@ -50,32 +53,34 @@
 endif
 
 autotools-stamp:
-	rm -f $(H323_DIR)/config.sub $(H323_DIR)/config.guess
-	cp /usr/share/misc/config.sub $(H323_DIR)/config.sub
-	cp /usr/share/misc/config.guess $(H323_DIR)/config.guess
+	for dir in . asterisk-ooh323c/config asterisk-ooh323c menuselect; do \
+	rm -f $$dir/config.sub $$dir/config.guess ; \
+	cp /usr/share/misc/config.sub $$dir/config.sub ; \
+	cp /usr/share/misc/config.guess $$dir/config.guess ; \
+	done
 	touch $@
 
-configure: configure-stamp
-configure-stamp: patch-stamp autotools-stamp
+configure: config.status
+config.status: patch-stamp autotools-stamp
 	dh_testdir
 	# Add here commands to configure the package.
 	if [ ! -f asterisk-ooh323c/config.h_dist ]; then \
 	  mv asterisk-ooh323c/config.h asterisk-ooh323c/config.h_dist ; \
 	fi
 	./configure $(confflags)
-	touch $@
+	#./asterisk-ooh323c/configure $(confflags)
+	#./menuselect/configure $(confflags)
 
-#Architecture 
+
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp 
-	$(MAKE) 
+build-arch-stamp: config.status
+	$(MAKE) CFLAGS="$(CFLAGS)"
 	touch $@
 
 build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp 
-
+build-indep-stamp: config.status
 	# Add here commands to compile the indep part of the package.
 	#$(MAKE) doc
 	touch $@
@@ -84,11 +89,8 @@
 clean-unpatched:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-
-	# Add here commands to clean up after the build process.
+	rm -f build-arch-stamp build-indep-stamp config.status
 	-$(MAKE) clean
-
 	dh_clean 
 
 install: install-indep install-arch
@@ -97,11 +99,6 @@
 #	dh_testroot
 #	dh_clean -k -i 
 #	dh_installdirs -i
-#
-#	# Add here commands to install the indep part of the package into
-#	# debian/<package>-doc.
-#	#INSTALLDOC#
-#
 #	dh_install -i
 
 INST_DIR=$(CURDIR)/debian/tmp
@@ -110,11 +107,9 @@
 	dh_testroot
 	dh_clean -k -a 
 	dh_installdirs -a
-	#dh_installdirs -s # no idea why it doesn't work
-
 	# Add here commands to install the arch part of the package into 
 	# debian/tmp.
-	mkdir -p $(INST_DIR)/usr/lib/asterisk/modules
+	install -d -m 755 $(INST_DIR)/usr/lib/asterisk/modules
 	$(MAKE) install DESTDIR=$(INST_DIR)
 	dh_install --sourcedir=$(INST_DIR)
 
@@ -128,22 +123,11 @@
 	dh_installchangelogs asterisk-ooh323c/ChangeLog
 	dh_installdocs
 	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress 
 	dh_fixperms
-#	dh_perl
-#	dh_python
 #	# -n: there are no /usr/lib libraries inthis package
 	dh_makeshlibs -n
 	dh_installdeb
@@ -151,6 +135,7 @@
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+#
 # Build architecture independant packages using the common target.
 binary-indep: build-indep install-indep
 #	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
@@ -170,4 +155,4 @@
 	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch unpatch


