[Pkg-voip-commits] r6065 - in /dahdi-linux/trunk: ./ dahdi/ dahdi/drivers/ dahdi/drivers/cwain/ dahdi/drivers/oslec/ dahdi/drivers/qozap/ dahdi/drivers/vzaphfc/ dahdi/drivers/zaphfc/ dahdi/drivers/ztgsm/ debian/ debian/patches/ kernel/ kernel/cwain/ kernel/oslec/ kernel/qozap/ kernel/vzaphfc/ kernel/zaphfc/ kernel/ztgsm/

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Sun Aug 24 18:36:37 UTC 2008 

Author: tzafrir-guest
Date: Sun Aug 24 18:36:37 2008
New Revision: 6065

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6065
Log:
A package that builds.
* Extra stuff moved from kernel/ to drivers/dahdi/
* Bristuff and other extra modules disabled for now.
* All patches removed. They'll have to be re-created if necessary.
* Still osme other zaptel->dahdi-linux renames and changes.

Added:
    dahdi-linux/trunk/dahdi/
    dahdi-linux/trunk/dahdi/drivers/
    dahdi-linux/trunk/dahdi/drivers/cwain/   (props changed)
      - copied from r6060, dahdi-linux/trunk/kernel/cwain/
    dahdi-linux/trunk/dahdi/drivers/ds1x1f.c   (props changed)
      - copied unchanged from r6060, dahdi-linux/trunk/kernel/ds1x1f.c
    dahdi-linux/trunk/dahdi/drivers/opvxa1200.c   (props changed)
      - copied unchanged from r6060, dahdi-linux/trunk/kernel/opvxa1200.c
    dahdi-linux/trunk/dahdi/drivers/oslec/   (props changed)
      - copied from r6060, dahdi-linux/trunk/kernel/oslec/
    dahdi-linux/trunk/dahdi/drivers/qozap/   (props changed)
      - copied from r6060, dahdi-linux/trunk/kernel/qozap/
    dahdi-linux/trunk/dahdi/drivers/vzaphfc/   (props changed)
      - copied from r6060, dahdi-linux/trunk/kernel/vzaphfc/
    dahdi-linux/trunk/dahdi/drivers/wcopenpci.c   (props changed)
      - copied unchanged from r6060, dahdi-linux/trunk/kernel/wcopenpci.c
    dahdi-linux/trunk/dahdi/drivers/zaphfc/   (props changed)
      - copied from r6060, dahdi-linux/trunk/kernel/zaphfc/
    dahdi-linux/trunk/dahdi/drivers/ztgsm/   (props changed)
      - copied from r6060, dahdi-linux/trunk/kernel/ztgsm/
    dahdi-linux/trunk/debian/dahdi-linux-source.dirs   (props changed)
      - copied unchanged from r6060, dahdi-linux/trunk/debian/zaptel-source.dirs
    dahdi-linux/trunk/debian/dahdi-linux.install   (contents, props changed)
      - copied, changed from r6060, dahdi-linux/trunk/debian/zaptel.install
Removed:
    dahdi-linux/trunk/debian/libtonezone-dev.install
    dahdi-linux/trunk/debian/libtonezone-dev.links
    dahdi-linux/trunk/debian/libtonezone1.docs
    dahdi-linux/trunk/debian/libtonezone1.install
    dahdi-linux/trunk/debian/libtonezone1.links
    dahdi-linux/trunk/debian/patches/chan_release_check
    dahdi-linux/trunk/debian/patches/oslec_zaptel
    dahdi-linux/trunk/debian/patches/xpp_fxs_power
    dahdi-linux/trunk/debian/patches/zaptel_perl
    dahdi-linux/trunk/debian/patches/ztcfg-start_stop
    dahdi-linux/trunk/debian/zaptel-source.dirs
    dahdi-linux/trunk/debian/zaptel-source.links
    dahdi-linux/trunk/debian/zaptel.dirs
    dahdi-linux/trunk/debian/zaptel.doc-base.astribank
    dahdi-linux/trunk/debian/zaptel.doc-base.readme
    dahdi-linux/trunk/debian/zaptel.doc-base.zaptel.conf
    dahdi-linux/trunk/debian/zaptel.install
    dahdi-linux/trunk/kernel/cwain/
    dahdi-linux/trunk/kernel/ds1x1f.c
    dahdi-linux/trunk/kernel/opvxa1200.c
    dahdi-linux/trunk/kernel/oslec/
    dahdi-linux/trunk/kernel/qozap/
    dahdi-linux/trunk/kernel/vzaphfc/
    dahdi-linux/trunk/kernel/wcopenpci.c
    dahdi-linux/trunk/kernel/zaphfc/
    dahdi-linux/trunk/kernel/ztgsm/
    dahdi-linux/trunk/ztpty.c
Modified:
    dahdi-linux/trunk/debian/   (props changed)
    dahdi-linux/trunk/debian/TODO.Debian
    dahdi-linux/trunk/debian/control.modules.in
    dahdi-linux/trunk/debian/docs
    dahdi-linux/trunk/debian/modulestest
    dahdi-linux/trunk/debian/patches/series
    dahdi-linux/trunk/debian/rules
    dahdi-linux/trunk/debian/watch

Propchange: dahdi-linux/trunk/dahdi/drivers/cwain/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/dahdi/drivers/ds1x1f.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/dahdi/drivers/opvxa1200.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/dahdi/drivers/oslec/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/dahdi/drivers/qozap/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/dahdi/drivers/vzaphfc/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/dahdi/drivers/wcopenpci.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/dahdi/drivers/zaphfc/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/dahdi/drivers/ztgsm/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-linux/trunk/debian/
            ('svn:mergeWithUpstream' removed)

Modified: dahdi-linux/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/TODO.Debian?rev=6065&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/TODO.Debian (original)
+++ dahdi-linux/trunk/debian/TODO.Debian Sun Aug 24 18:36:37 2008
@@ -1,6 +1,3 @@
-* Set the list of utilities to build. Probably through some menuselect var.
-* Rename sethdlc-new to sethdlc.
-* Missing man page for fxstest .
-* Missing man page for ztdiag .
-* Add ds1x1f.c to the list of modules (note: it breaks kernel 2.4 building).
-* Apply the conglomerate_fixes patch from trunk.
+* Sort out names . Probably use dahdi-{source,modules} rather than dahdi-linux*
+* Make dahdi-linux arch-indep . No arch-dependent here (only the modules).
+* Fix other modules.

Modified: dahdi-linux/trunk/debian/control.modules.in
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/control.modules.in?rev=6065&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/control.modules.in (original)
+++ dahdi-linux/trunk/debian/control.modules.in Sun Aug 24 18:36:37 2008
@@ -1,15 +1,15 @@
-Source: zaptel
+Source: dahdi-linux
 Section: comm
 Priority: extra
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kk at verfaction.de>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Santiago Ruano Rincon <santiago at unicauca.edu.co>
 Build-Depends: debhelper (>> 3.0.0), bzip2
-Standards-Version: 3.6.1.1
+Standards-Version: 3.8.0.0
 
-Package: zaptel-modules-_KVERS_
+Package: dahdi-linux-modules-_KVERS_
 Architecture: any
-Provides: zaptel-modules
-Description: zaptel modules for Linux (kernel _KVERS_).
+Provides: dahdi-modules
+Description: DAHDI modules for Linux (kernel _KVERS_).
  This package contains the set of loadable kernel modules for the
  zapata telephony API.
  This package contains the compiled kernel modules for _KVERS_

Propchange: dahdi-linux/trunk/debian/dahdi-linux-source.dirs
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: dahdi-linux/trunk/debian/dahdi-linux.install (from r6060, dahdi-linux/trunk/debian/zaptel.install)
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/dahdi-linux.install?rev=6065&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/zaptel.install (original)
+++ dahdi-linux/trunk/debian/dahdi-linux.install Sun Aug 24 18:36:37 2008
@@ -1,7 +1,1 @@
-sbin/*
-usr/sbin/*
-usr/share/perl5/Zaptel*
-usr/share/zaptel/*
-usr/share/man/man8/*
-etc/hotplug/usb/*
-etc/udev/rules.d/*
+usr/share/dahdi/*

Propchange: dahdi-linux/trunk/debian/dahdi-linux.install
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: dahdi-linux/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/docs?rev=6065&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/docs (original)
+++ dahdi-linux/trunk/debian/docs Sun Aug 24 18:36:37 2008
@@ -1,8 +1,3 @@
 README
-README.html
-README.fxotune
-README.fxsusb
-kernel/xpp/README.Astribank
-kernel/xpp/README.Astribank.html
-kernel/xpp/Changelog_xpp
-tonezones.txt
+UPGRADE.txt
+drivers/dahdi/xpp/Changelog_xpp

Modified: dahdi-linux/trunk/debian/modulestest
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/modulestest?rev=6065&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/modulestest (original)
+++ dahdi-linux/trunk/debian/modulestest Sun Aug 24 18:36:37 2008
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# debian/modulestest: a postbuild script to build zaptel modules
+# debian/modulestest: a postbuild script to build dahdi modules
 # example usage:
 #  
 #  svn-buildpackage --svn-postbuild='debian/modulestest -r' --svn-ignore-new 
@@ -53,7 +53,7 @@
 # $PWD/.. 
 TOP_DIR=`dirname $PWD`
 MODS_DIR=$TOP_DIR/modules
-TAR_BALL=$MODS_DIR/usr/src/zaptel.tar.bz2
+TAR_BALL=$MODS_DIR/usr/src/$PACKAGE.tar.bz2
 DEB=$TOP_DIR/$PACKAGE-source_${TAG_VERSION}_all.deb
 LOG_FILE=$TOP_DIR/$PACKAGE-modules-build-$TAG_VERSION.log
 

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=6065&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Sun Aug 24 18:36:37 2008
@@ -1,10 +1,6 @@
-oslec_zaptel
-bri_dchan
-proc_read
-zt_alarm_notify_no_master_change
-ztcfg-start_stop
-zaphfc-florz
-zaptel_perl
-chan_release_check
-florz-vmalloc
-xpp_fxs_power
+#oslec_zaptel
+#bri_dchan
+#proc_read
+#zt_alarm_notify_no_master_change
+#zaphfc-florz
+#florz-vmalloc

Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=6065&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Sun Aug 24 18:36:37 2008
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-USE_BRISTUFF=1
+USE_BRISTUFF=0
 export HOTPLUG_FIRMWARE=1
 
 -include /usr/share/quilt/quilt.make
@@ -29,22 +29,23 @@
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/')
+DEB_BASE_VERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
+UPVERSION:=$(shell echo $(DEB_BASE_VERSION) | sed -e 's/~dfsg\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/')
 
 UPFILENAME := $(PREFIX)_$(UPVERSION).orig.tar.gz
-FILENAME := $(PREFIX)_$(UPVERSION)~dfsg.orig.tar.gz
+FILENAME := $(PREFIX)_$(DEB_BASE_VERSION).orig.tar.gz
 URL := http://downloads.digium.com/pub/telephony/$(PREFIX)/releases/$(PREFIX)-$(UPVERSION).tar.gz
 
 # If the makefile was properly-writen, there was a good separation 
 # between kernel and userspace. As things stand now I'd like to work
 # around problems with bilding stuff with HOSTCC by simply providing 
 # the generated headers as part of the source:
-GENERATED_SOURCES := version.h
-
-EXTRA_MODS=ds1x1f opvxa1200
+GENERATED_SOURCES := include/dahdi/version.h
+
+#EXTRA_MODS=ds1x1f opvxa1200
 
 ifneq (,$(filter-out powerpc m68k armeb mips,$(shell dpkg-architecture -qDEB_HOST_ARCH)))
-EXTRA_MODS += wcopenpci
+#EXTRA_MODS += wcopenpci
 endif
 
 BRISTUFF_MODULES=cwain qozap zaphfc ztgsm
@@ -75,8 +76,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	cp -a $(CURDIR)/debian/generated/* .
-	./configure
+	#cp -a $(CURDIR)/debian/generated/* .
 	make $(MOD_ARGS) modules KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS) 
 	make $(MOD_ARGS) install-modules KERNELRELEASE=$(KVERS) DESTDIR=$(CURDIR)/debian/$(PKGNAME)
 ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
@@ -101,11 +101,9 @@
 	dh_testdir
 	
 	for mod in $(BRISTUFF_MODULES); do for i in c h; do \
-		ln -s $$mod/$$mod.$$i kernel/$$mod.$$i; \
+		ln -s $$mod/$$mod.$$i drivers/dahdi/$$mod.$$i; \
 	done; done
-	./configure
 	$(MAKE) $(GENERATED_SOURCES)
-	$(MAKE) programs README.html kernel/xpp/README.Astribank.html
 	touch $@
 
 clean: clean-unpatched unpatch
@@ -117,10 +115,7 @@
 	# Delete the generated bristuff symlinks:
 	$(RM) -f $(BRISTUFF_MODULES:%=%.[ch])
 	# Add here commands to clean up after the build process.
-	rm -rf $(MOD_EXAMPLES_DIR)
-	rm -f tonezones.txt
 	rm -f $(GENERATED_SOURCES)
-	rm -rf debian/fake
 	# * Makefile does not exist when running svn-buildpackage
 	#   as the source tree is not there.
 	# FIXME: This will fail with an ugly warning on the clean of the
@@ -141,8 +136,8 @@
 	
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp 
 
-	cp debian/$(PREFIX).lintian \
-	  $(CURDIR)/debian/$(PREFIX)/usr/share/lintian/overrides/$(PREFIX)
+	#cp debian/$(PREFIX).lintian \
+	#  $(CURDIR)/debian/$(PREFIX)/usr/share/lintian/overrides/$(PREFIX)
 
 TARPARDIR=$(CURDIR)/debian/tmp
 TARDIR=$(TARPARDIR)/modules/$(PREFIX)
@@ -154,13 +149,12 @@
 	
 	# driver source code
 	mkdir -p $(TARDIR)/debian/generated
-	cp Makefile configure install-sh makeopts.in .version *.c *.h $(TARDIR)/
-	for dir in build_tools firmware include kernel; do \
+	cp Makefile $(TARDIR)/
+	for dir in build_tools firmware include drivers; do \
 	  if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
 	done
-	cp -a $(GENERATED_SOURCES) $(TARDIR)/debian/generated/
-	dh_install -i kernel/zaptel.h usr/include/zaptel/
-	dh_install -pzaptel-firmware kernel/xpp/firmwares/*.hex usr/share/zaptel/
+	#cp -a $(GENERATED_SOURCES) $(TARDIR)/debian/generated/
+	dh_install -i include/dahdi/* usr/include/dahdi/
 	
 	# Packaging infrastructure
 	cp -r debian/rules debian/changelog debian/copyright\
@@ -186,7 +180,7 @@
 	
 	dh_installdocs -i
 	dh_installchangelogs -i ChangeLog
-	dh_installexamples -i $(BRISTUFF_EXAMPLES)
+	#dh_installexamples -i $(BRISTUFF_EXAMPLES)
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
@@ -206,8 +200,8 @@
 	
 	# should be removed, eventually. Still left for compatibility
 	dh_installinit --update-rcd-params="defaults 15 30"
-	dh_installexamples -a zaptel.conf.sample \
-	  kernel/oslec/oslec-ctrl-panel.sh
+	#dh_installexamples -a system.conf.sample \
+	#  kernel/oslec/oslec-ctrl-panel.sh
 
 	
 	#dh_installmodules -a

Modified: dahdi-linux/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/watch?rev=6065&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/watch (original)
+++ dahdi-linux/trunk/debian/watch Sun Aug 24 18:36:37 2008
@@ -1,5 +1,5 @@
 version=3
 opts=dversionmangle=s/\~dfsg//,downloadurlmangle=s/.*ref=// \
-	http://downloads.digium.com/pub/telephony/zaptel/releases/ \
-	http://www\.digium\.com/elqNow/elqRedir\.htm\?ref=http://downloads\.digium\.com/pub/telephony/zaptel/releases/zaptel-([0-9.]*)\.tar\.gz\
+	http://downloads.digium.com/pub/telephony/dahdi-linux/releases/ \
+	http://www\.digium\.com/elqNow/elqRedir\.htm\?ref=http://downloads\.digium\.com/pub/telephony/dahdi-linux/releases/dahdi-linux-([0-9.]*)\.tar\.gz\
 	debian svn-upgrade

More information about the Pkg-voip-commits mailing list