[Pkg-voip-commits] r4472 - in /zaptel1.2/trunk/debian: changelog patches/Makefile_bristuff.dpatch patches/Makefile_targets.dpatch patches/Makefile_uname.dpatch patches/Makefile_vzaphfc.dpatch patches/conglomerate_fixes.dpatch patches/zaptel_perl.dpatch
kilian at alioth.debian.org
kilian at alioth.debian.org
Tue Sep 11 09:09:17 UTC 2007
Author: kilian
Date: Tue Sep 11 09:09:16 2007
New Revision: 4472
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4472
Log:
* Fix patches applying.
Modified:
zaptel1.2/trunk/debian/changelog
zaptel1.2/trunk/debian/patches/Makefile_bristuff.dpatch
zaptel1.2/trunk/debian/patches/Makefile_targets.dpatch
zaptel1.2/trunk/debian/patches/Makefile_uname.dpatch
zaptel1.2/trunk/debian/patches/Makefile_vzaphfc.dpatch
zaptel1.2/trunk/debian/patches/conglomerate_fixes.dpatch
zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch
Modified: zaptel1.2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel1.2/trunk/debian/changelog?rev=4472&op=diff
==============================================================================
--- zaptel1.2/trunk/debian/changelog (original)
+++ zaptel1.2/trunk/debian/changelog Tue Sep 11 09:09:16 2007
@@ -22,8 +22,9 @@
[ Kilian Krause ]
* Use ${binary:Version} for binNMU-safe uploads.
Add dpkg-dev (>= 1.13.19) to Build-Depends
-
- -- Kilian Krause <kilian at debian.org> Fri, 24 Aug 2007 17:15:02 +0200
+ * Fix patches applying.
+
+ -- Kilian Krause <kilian at debian.org> Tue, 11 Sep 2007 11:06:41 +0200
zaptel (1:1.2.16~dfsg-1) unstable; urgency=low
Modified: zaptel1.2/trunk/debian/patches/Makefile_bristuff.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel1.2/trunk/debian/patches/Makefile_bristuff.dpatch?rev=4472&op=diff
==============================================================================
--- zaptel1.2/trunk/debian/patches/Makefile_bristuff.dpatch (original)
+++ zaptel1.2/trunk/debian/patches/Makefile_bristuff.dpatch Tue Sep 11 09:09:16 2007
@@ -6,12 +6,12 @@
## DP: Also adds two unrelated modules: opvxa1200
@DPATCH@
-diff -urNad zaptel-1.2.9.1.dfsg~/Makefile zaptel-1.2.9.1.dfsg/Makefile
---- zaptel-1.2.9.1.dfsg~/Makefile 2006-09-23 13:48:37.000000000 +0100
-+++ zaptel-1.2.9.1.dfsg/Makefile 2006-09-23 13:48:37.000000000 +0100
-@@ -129,6 +129,11 @@
- MODULES+=ztdummy
- endif
+diff -urNad zaptel1.2-1.2.20.1~dfsg~/Makefile zaptel1.2-1.2.20.1~dfsg/Makefile
+--- zaptel1.2-1.2.20.1~dfsg~/Makefile 2007-09-11 11:02:05.517309374 +0200
++++ zaptel1.2-1.2.20.1~dfsg/Makefile 2007-09-11 11:02:45.192498201 +0200
+@@ -75,6 +75,11 @@
+
+ MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
+BRIMODS=cwain qozap zaphfc ztgsm
+MODULES+=$(BRIMODS)
@@ -21,20 +21,19 @@
MODULESO:=$(MODULES:%=%.o)
MODULESKO:=$(MODULES:%=%.ko)
ifeq ($(BUILDVER),linux26)
-@@ -164,6 +169,8 @@
- usbfxstest fxstest fxotune fxsdump ztdiag
- UTILSO:=$(UTILS:%=%.o)
+@@ -226,6 +231,8 @@
+ endif
+ MAN_PAGES = $(wildcard $(BINS:%=doc/%.8))
+BINS+=ztpty
+
- all: modules $(LIBTONEZONE_SO)
+ all: programs modules
- programs: $(BINS) $(LIBTONEZONE_SO)
-@@ -209,6 +216,29 @@
- wctdm24xxp.o: wctdm.h
+ programs: utils libs
+@@ -291,6 +298,29 @@
pciradio.o: radfw.h
-+
+
+$(BRIMODS:%=%.o): %.o: %.h
+ifneq (,$(wildcard /usr/src/modules/rtai/base/include/rtai.h))
+zaphfc.o: KFLAGS+=-DRTAITIMING \
@@ -57,6 +56,7 @@
+cwain.%: cwain/cwain.%
+ cp $^ $@
+
-
++
ztdummy.o: ztdummy.h
+ zaptel.o: zaptel-base.o $(ZAPTEL_HPEC)
Modified: zaptel1.2/trunk/debian/patches/Makefile_targets.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel1.2/trunk/debian/patches/Makefile_targets.dpatch?rev=4472&op=diff
==============================================================================
--- zaptel1.2/trunk/debian/patches/Makefile_targets.dpatch (original)
+++ zaptel1.2/trunk/debian/patches/Makefile_targets.dpatch Tue Sep 11 09:09:16 2007
@@ -7,10 +7,10 @@
## -- will be fixed later on.. still pending.
@DPATCH@
-diff -urNad zaptel-1.2.13~dfsg~/Makefile zaptel-1.2.13~dfsg/Makefile
---- zaptel-1.2.13~dfsg~/Makefile 2007-02-10 00:59:31.000000000 +0200
-+++ zaptel-1.2.13~dfsg/Makefile 2007-02-10 01:09:53.000000000 +0200
-@@ -64,6 +64,16 @@
+diff -urNad zaptel1.2-1.2.20.1~dfsg~/Makefile zaptel1.2-1.2.20.1~dfsg/Makefile
+--- zaptel1.2-1.2.20.1~dfsg~/Makefile 2007-09-11 11:00:32.193808347 +0200
++++ zaptel1.2-1.2.20.1~dfsg/Makefile 2007-09-11 11:00:32.401825067 +0200
+@@ -77,6 +77,16 @@
MODULESO:=$(MODULES:%=%.o)
MODULESKO:=$(MODULES:%=%.ko)
@@ -25,33 +25,9 @@
+INC_DIR:=$(INSTALL_PREFIX)/usr/include
+MOD_DIR:=$(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc
- # add this later, so it doesn't become part of MODULESO/MODULESKO
- MODULES+=wct4xxp wctc4xxp
-@@ -161,15 +171,17 @@
- BINS+=zttool
- endif
-
--ifeq ($(BUILDVER),linux24)
--all: prereq $(MODULESO) wct4xxp/wct4xxp.o $(BINS) $(LIBTONEZONE_SO)
--endif
-+all: modules $(LIBTONEZONE_SO)
-
--ifeq ($(BUILDVER),linux26)
--all: prereq $(BINS) $(LIBTONEZONE_SO)
-+programs: $(BINS) $(LIBTONEZONE_SO)
-+
-+modules: $(BUILDVER)
-+
-+linux24: $(MODULESO) wct4xxp/wct4xxp.o
-+
-+linux26: prereq $(BINS) $(LIBTONEZONE_SO)
- @if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) modules
--endif
-
- ifeq ($(HPEC_PRESENT),yes)
- ifeq ($(ARCH),i386)
-@@ -430,6 +442,21 @@
+ ifeq ($(BUILDVER),linux26)
+ MODULESO+=$(SUBDIRS_EXTRA:%=%/)
+@@ -539,6 +549,21 @@
echo "Not under version control"; \
fi
Modified: zaptel1.2/trunk/debian/patches/Makefile_uname.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel1.2/trunk/debian/patches/Makefile_uname.dpatch?rev=4472&op=diff
==============================================================================
--- zaptel1.2/trunk/debian/patches/Makefile_uname.dpatch (original)
+++ zaptel1.2/trunk/debian/patches/Makefile_uname.dpatch Tue Sep 11 09:09:16 2007
@@ -7,12 +7,12 @@
## DP: Applied by upstream in zaptel 1.4.
@DPATCH@
-diff -urNad zaptel-1.2.13~dfsg~/Makefile zaptel-1.2.13~dfsg/Makefile
---- zaptel-1.2.13~dfsg~/Makefile 2007-02-09 23:27:13.000000000 +0200
-+++ zaptel-1.2.13~dfsg/Makefile 2007-02-10 00:01:10.000000000 +0200
-@@ -13,6 +13,11 @@
-
- ARCH:=$(shell uname -m | sed -e s/i.86/i386/)
+diff -urNad zaptel1.2-1.2.20.1~dfsg~/Makefile zaptel1.2-1.2.20.1~dfsg/Makefile
+--- zaptel1.2-1.2.20.1~dfsg~/Makefile 2007-08-21 20:55:44.000000000 +0200
++++ zaptel1.2-1.2.20.1~dfsg/Makefile 2007-09-11 11:00:08.675917989 +0200
+@@ -17,6 +17,11 @@
+ # FIXME: this variable sets ARCH in the kernel Makefile.
+ ARCH :=$(shell echo $(MACHINE) | sed -e s/i.86/i386/)
+ifeq ($(DEB_HOST_GNU_TYPE),)
+UNAME_M:=$(shell uname -m)
@@ -22,38 +22,21 @@
# If you want to build for a kernel other than the current kernel, set KVERS
ifndef KVERS
KVERS:=$(shell uname -r)
-@@ -89,20 +95,28 @@
+@@ -108,7 +113,7 @@
- INSTALL_PREFIX:=$(DESTDIR)
+ INSTALL_PREFIX := /usr
-CFLAGS+=-I. -O4 -g -Wall
--CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
--CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
+CFLAGS+=-I. -O2 -g -Wall
-+ifneq (,$(findstring ppc,$(UNAME_M)))
-+CFLAGS_PPC:=-fsigned-char
-+endif
-+ifneq (,$(findstring x86_64,$(UNAME_M)))
-+CFLAGS_X86-64:=-m64
-+endif
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
+ ifneq (,$(findstring ppc,$(MACHINE)))
+ CFLAGS += -fsigned-char
+ KFLAGS += -msoft-float -fsigned-char
+@@ -118,7 +123,7 @@
+ KFLAGS += -mcmodel=kernel
+ endif
LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
-KFLAGS:=-I$(KINCLUDES) -O6
+KFLAGS:=-I$(KINCLUDES) -O2
KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net
ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
- KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
- endif
--KFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-msoft-float -fsigned-char"; fi)
-+ifneq (,$(findstring ppc,$(UNAME_M)))
-+KFLAGS_PPC:=-msoft-float -fsigned-char
-+endif
- KFLAGS+=$(KFLAGS_PPC)
--KFLAGS+=$(shell if uname -r | grep -q 2.4; then if uname -m | grep -q x86_64; then echo "-mcmodel=kernel"; fi; fi)
-+ifneq (,$(findstring x86_64,$(UNAME_M)))
-+ KFLAGS+=-mcmodel=kernel
-+endif
-
- #
- # Features are now configured in zconfig.h
Modified: zaptel1.2/trunk/debian/patches/Makefile_vzaphfc.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel1.2/trunk/debian/patches/Makefile_vzaphfc.dpatch?rev=4472&op=diff
==============================================================================
--- zaptel1.2/trunk/debian/patches/Makefile_vzaphfc.dpatch (original)
+++ zaptel1.2/trunk/debian/patches/Makefile_vzaphfc.dpatch Tue Sep 11 09:09:16 2007
@@ -5,12 +5,12 @@
## DP: Add vzaphfc to linux-2.6 modules
@DPATCH@
-diff -urNad zaptel-1.2.13~dfsg~/Makefile.kernel26 zaptel-1.2.13~dfsg/Makefile.kernel26
---- zaptel-1.2.13~dfsg~/Makefile.kernel26 2007-02-08 20:13:41.000000000 +0200
-+++ zaptel-1.2.13~dfsg/Makefile.kernel26 2007-02-10 02:58:58.000000000 +0200
+diff -urNad zaptel1.2-1.2.20.1~dfsg~/Makefile.kernel26 zaptel1.2-1.2.20.1~dfsg/Makefile.kernel26
+--- zaptel1.2-1.2.20.1~dfsg~/Makefile.kernel26 2007-09-11 11:03:08.000000000 +0200
++++ zaptel1.2-1.2.20.1~dfsg/Makefile.kernel26 2007-09-11 11:03:49.729685099 +0200
@@ -1,5 +1,6 @@
obj-m := $(MODULESO)
- obj-m += wct4xxp/ wctc4xxp/
+ obj-m += wct4xxp/ wctc4xxp/ wctdm24xxp/
+obj-m += vzaphfc/
# Also build xpp in the subdirectory xpp/ . But only for >=2.6.8 and only
Modified: zaptel1.2/trunk/debian/patches/conglomerate_fixes.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel1.2/trunk/debian/patches/conglomerate_fixes.dpatch?rev=4472&op=diff
==============================================================================
--- zaptel1.2/trunk/debian/patches/conglomerate_fixes.dpatch (original)
+++ zaptel1.2/trunk/debian/patches/conglomerate_fixes.dpatch Tue Sep 11 09:09:16 2007
@@ -7,10 +7,10 @@
## DP: 2. Make sure that the value of HOTPLUG_FIRMWARE gets to subdirs.
@DPATCH@
-diff -urNad zaptel-1.2.15~dfsg~/Makefile zaptel-1.2.15~dfsg/Makefile
---- zaptel-1.2.15~dfsg~/Makefile 2007-03-10 04:15:13.000000000 +0200
-+++ zaptel-1.2.15~dfsg/Makefile 2007-03-10 04:17:06.000000000 +0200
-@@ -50,6 +50,7 @@
+diff -urNad zaptel1.2-1.2.20.1~dfsg~/Makefile zaptel1.2-1.2.20.1~dfsg/Makefile
+--- zaptel1.2-1.2.20.1~dfsg~/Makefile 2007-09-11 11:05:14.104466056 +0200
++++ zaptel1.2-1.2.20.1~dfsg/Makefile 2007-09-11 11:06:08.732856199 +0200
+@@ -54,6 +54,7 @@
# Hotplug firmware loading is not supported on any other version then 2.6
HOTPLUG_FIRMWARE:=no
endif
@@ -18,25 +18,25 @@
ifeq ($(HOTPLUG_FIRMWARE),yes)
CFLAGS+=-DHOTPLUG_FIRMWARE
-@@ -140,7 +141,7 @@
+@@ -149,7 +150,7 @@
#
KFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
+KMAKE:= $(MAKE) -C $(KSRC) M=$(PWD)
- KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
+ KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=misc modules_install
- CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf
-@@ -189,7 +190,7 @@
-
- linux26: prereq $(BINS) $(LIBTONEZONE_SO)
- @if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
+ CONFIG_FILE:=/etc/zaptel.conf
+@@ -247,7 +248,7 @@
+ ifeq (,$(wildcard $(KSRC)/.config))
+ @echo "You do not appear to have the sources for the $(KVERS) kernel installed (under $(KSRC))."; exit 1
+ endif
- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) modules
+ $(MAKE) -C $(KSRC) M=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) modules
+ endif
ifeq ($(HPEC_PRESENT),yes)
- ifeq ($(ARCH),i386)
-@@ -498,7 +499,7 @@
+@@ -603,7 +604,7 @@
rm -f patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
@@ -44,13 +44,13 @@
+ $(MAKE) -C $(KSRC) M=$(PWD) clean
$(MAKE) -C wct4xxp clean
$(MAKE) -C wctc4xxp clean
- rm -rf .tmp_versions
-diff -urNad zaptel-1.2.15~dfsg~/xpp/Makefile zaptel-1.2.15~dfsg/xpp/Makefile
---- zaptel-1.2.15~dfsg~/xpp/Makefile 2007-03-02 22:40:06.000000000 +0200
-+++ zaptel-1.2.15~dfsg/xpp/Makefile 2007-03-10 04:17:41.000000000 +0200
+ $(MAKE) -C wctdm24xxp clean
+diff -urNad zaptel1.2-1.2.20.1~dfsg~/xpp/Makefile zaptel1.2-1.2.20.1~dfsg/xpp/Makefile
+--- zaptel1.2-1.2.20.1~dfsg~/xpp/Makefile 2007-09-11 11:05:04.000000000 +0200
++++ zaptel1.2-1.2.20.1~dfsg/xpp/Makefile 2007-09-11 11:05:15.000538069 +0200
@@ -1,4 +1,4 @@
-ZAPTEL_DIR = $(SUBDIRS)
+ZAPTEL_DIR = $(M)
EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \
- -g3 -I$(ZAPTEL_DIR) \
+ -I$(ZAPTEL_DIR) \
Modified: zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch?rev=4472&op=diff
==============================================================================
--- zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch (original)
+++ zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch Tue Sep 11 09:09:16 2007
@@ -6,15 +6,15 @@
## DP: which to install perl modules.
@DPATCH@
-diff -urNad zaptel1.2-1.2.18~dfsg~/xpp/utils/Makefile zaptel1.2-1.2.18~dfsg/xpp/utils/Makefile
---- zaptel1.2-1.2.18~dfsg~/xpp/utils/Makefile 2007-05-17 22:34:32.000000000 +0300
-+++ zaptel1.2-1.2.18~dfsg/xpp/utils/Makefile 2007-06-11 09:51:13.000000000 +0300
-@@ -24,7 +24,7 @@
+diff -urNad zaptel1.2-1.2.20.1~dfsg~/xpp/utils/Makefile zaptel1.2-1.2.20.1~dfsg/xpp/utils/Makefile
+--- zaptel1.2-1.2.20.1~dfsg~/xpp/utils/Makefile 2007-09-11 11:04:00.000000000 +0200
++++ zaptel1.2-1.2.20.1~dfsg/xpp/utils/Makefile 2007-09-11 11:04:51.710666364 +0200
+@@ -23,7 +23,7 @@
MANDIR = $(mandir)/man8
HOTPLUG_USB_DIR = /etc/hotplug/usb
UDEV_RULES_DIR = /etc/udev/rules.d
--PERLLIBDIR = $(shell eval `perl -V:sitelib`; echo "$$sitelib")
+-PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib")
+PERLLIBDIR = $(shell eval `perl -V:vendorlib`; echo "$$vendorlib")
- PERL_DIRS := Zaptel Zaptel/Hardware Zaptel/Xpp
+ PERL_DIRS := $(shell cd zconf; find * -name '[A-Z]*' -type d| xargs)
PERL_MODS_PAT := *.pm $(PERL_DIRS:%=%/*.pm)
PERL_MODS := $(shell cd zconf; echo $(PERL_MODS_PAT))
More information about the Pkg-voip-commits
mailing list