[Pkg-voip-commits] r6112 - in /zaptel/trunk/debian: ./ backports/

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Thu Aug 28 20:00:15 UTC 2008 

Author: tzafrir-guest
Date: Thu Aug 28 20:00:15 2008
New Revision: 6112

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6112
Log:
* Using dh_lintian for lintian overrides, hence requiring debhelper 6.0.7.
* Lintian: we know we have direct changes. Too bad we're half-upstream :-(
* Fix doc-base section names. 

Added:
    zaptel/trunk/debian/source.lintian-overrides
    zaptel/trunk/debian/zaptel-source.lintian-overrides
    zaptel/trunk/debian/zaptel.lintian-overrides   (contents, props changed)
      - copied, changed from r6103, zaptel/trunk/debian/zaptel.lintian
Removed:
    zaptel/trunk/debian/zaptel.lintian
Modified:
    zaptel/trunk/debian/backports/etch
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/control
    zaptel/trunk/debian/modulestest
    zaptel/trunk/debian/rules
    zaptel/trunk/debian/zaptel.dirs
    zaptel/trunk/debian/zaptel.doc-base.astribank
    zaptel/trunk/debian/zaptel.doc-base.readme
    zaptel/trunk/debian/zaptel.doc-base.zaptel.conf

Modified: zaptel/trunk/debian/backports/etch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/backports/etch?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/backports/etch (original)
+++ zaptel/trunk/debian/backports/etch Thu Aug 28 20:00:15 2008
@@ -2,4 +2,10 @@
 
 # depend on plain asciidoc. No need to work around one specific 
 # transitional Lenny version.
-sed -i -e 's/\(asciidoc\) *([^)]*)/\1/' debian/control
+# Also no need to depend on newer debhelper for dh_lintian.
+sed -i \
+	-e 's/\(asciidoc\) *([^)]*)/\1/' \
+	-e 's/\(debhelper\) *([^)]*)/\1/' \
+	debian/control
+
+sed -i -e '/dh_lintian/d' debian/rules

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Thu Aug 28 20:00:15 2008
@@ -15,8 +15,11 @@
   * Patch xpp_fxs_dtmf_leak: Don't play DTMFs to the wrong channel.
   * Patch wctdm_fix_alarm: Fix sending channel alarms.
   * Patch device_class_2626: Fix building 2.6.26 (Closes: #493397).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 27 Aug 2008 17:10:18 +0300
+  * Using dh_lintian for lintian overrides, hence requiring debhelper 6.0.7.
+  * Lintian: we know we have direct changes. Too bad we're half-upstream :-(
+  * Fix doc-base section names. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 28 Aug 2008 22:58:23 +0300
 
 zaptel (1:1.4.11~dfsg-1) unstable; urgency=medium
 

Modified: zaptel/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/control?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/control (original)
+++ zaptel/trunk/debian/control Thu Aug 28 20:00:15 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper, libnewt-dev, quilt, bzip2, libusb-dev, asciidoc (>= 8.2.6-1.1) 
+Build-Depends: debhelper (>= 6.0.7~), libnewt-dev, quilt, bzip2, libusb-dev, asciidoc (>= 8.2.6-1.1) 
 Standards-Version: 3.8.0
 Homepage: http://www.asterisk.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/zaptel/trunk/

Modified: zaptel/trunk/debian/modulestest
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/modulestest?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/modulestest (original)
+++ zaptel/trunk/debian/modulestest Thu Aug 28 20:00:15 2008
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 # debian/modulestest: a postbuild script to build zaptel modules
 # example usage:

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Thu Aug 28 20:00:15 2008
@@ -166,9 +166,7 @@
 	install -D -m 644 tonezone.h $(CURDIR)/debian/tmp/usr/include/zaptel/tonezone.h
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp 
-
-	cp debian/$(PREFIX).lintian \
-	  $(CURDIR)/debian/$(PREFIX)/usr/share/lintian/overrides/$(PREFIX)
+	dh_lintian -a
 
 TARPARDIR=$(CURDIR)/debian/tmp
 TARDIR=$(TARPARDIR)/modules/$(PREFIX)
@@ -187,7 +185,8 @@
 	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/
-	
+	dh_lintian -i
+
 	# Packaging infrastructure
 	cp -r debian/rules debian/changelog debian/copyright\
 	  debian/control debian/compat \

Added: zaptel/trunk/debian/source.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/source.lintian-overrides?rev=6112&op=file
==============================================================================
--- zaptel/trunk/debian/source.lintian-overrides (added)
+++ zaptel/trunk/debian/source.lintian-overrides Thu Aug 28 20:00:15 2008
@@ -1,0 +1,56 @@
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/Makefile
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/TODO
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/cwain.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/cwain.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/zapata.conf
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/zapata.conf.doubleE1
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/zaptel.conf
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/zaptel.conf.doubleE1
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/zaptel.conf.hdlcnet
+zaptel source: patch-system-but-direct-changes-in-diff kernel/cwain/zaptel.conf.hdlcnet.doubleE1
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ds1x1f.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/opvxa1200.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/Kbuild
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/echo.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/oslec-ctrl-panel.sh
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/oslec.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/oslec_wrap.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/spandsp/bit_operations.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/spandsp/echo.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/spandsp/fir.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/oslec/spandsp/mmx.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/Makefile
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/TODO
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/qozap.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/qozap.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/zapata.conf
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/zapata.conf.duoBRI
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/zapata.conf.octoBRI
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/zaptel.conf
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/zaptel.conf.duoBRI
+zaptel source: patch-system-but-direct-changes-in-diff kernel/qozap/zaptel.conf.octoBRI
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/ChangeLog
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/Makefile
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/README
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/fifo.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/fifo.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/lapd.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/lapd.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/vzaphfc.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/vzaphfc/vzaphfc_main.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/wcopenpci.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/zaphfc/Makefile
+zaptel source: patch-system-but-direct-changes-in-diff kernel/zaphfc/zapata.conf
+zaptel source: patch-system-but-direct-changes-in-diff kernel/zaphfc/zaphfc.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/zaphfc/zaphfc.h
+zaptel source: patch-system-but-direct-changes-in-diff kernel/zaphfc/zaptel.conf
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/Makefile
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/zapata.conf.duoGSM
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/zapata.conf.quadGSM
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/zapata.conf.unoGSM
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/zaptel.conf.duoGSM
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/zaptel.conf.quadGSM
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/zaptel.conf.unoGSM
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/ztgsm.c
+zaptel source: patch-system-but-direct-changes-in-diff kernel/ztgsm/ztgsm.h
+zaptel source: patch-system-but-direct-changes-in-diff ztpty.c

Added: zaptel/trunk/debian/zaptel-source.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel-source.lintian-overrides?rev=6112&op=file
==============================================================================
--- zaptel/trunk/debian/zaptel-source.lintian-overrides (added)
+++ zaptel/trunk/debian/zaptel-source.lintian-overrides Thu Aug 28 20:00:15 2008
@@ -1,0 +1,1 @@
+zaptel-source: description-contains-duplicated-word a a

Modified: zaptel/trunk/debian/zaptel.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.dirs?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.dirs (original)
+++ zaptel/trunk/debian/zaptel.dirs Thu Aug 28 20:00:15 2008
@@ -1,3 +1,2 @@
 etc/modprobe.d
 etc/udev/rules.d
-usr/share/lintian/overrides

Modified: zaptel/trunk/debian/zaptel.doc-base.astribank
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.doc-base.astribank?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.doc-base.astribank (original)
+++ zaptel/trunk/debian/zaptel.doc-base.astribank Thu Aug 28 20:00:15 2008
@@ -2,7 +2,7 @@
 Title: Xorcom Astribank Documentation
 Author: Tzafrir Cohen
 Abstract: Technical Documentation ofd the Xorcom Astribank
-Section: Comm
+Section: Network/Communication
 
 Format: HTML
 Index: /usr/share/doc/zaptel/README.Astribank.html

Modified: zaptel/trunk/debian/zaptel.doc-base.readme
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.doc-base.readme?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.doc-base.readme (original)
+++ zaptel/trunk/debian/zaptel.doc-base.readme Thu Aug 28 20:00:15 2008
@@ -2,7 +2,7 @@
 Title: Zapata Telephony Interface Driver
 Author: Tzafrir Cohen
 Abstract: Basic documentation of the Zaptel telephony interface
-Section: Comm
+Section: Network/Communication
 
 Format: HTML
 Index: /usr/share/doc/zaptel/README.html

Modified: zaptel/trunk/debian/zaptel.doc-base.zaptel.conf
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.doc-base.zaptel.conf?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.doc-base.zaptel.conf (original)
+++ zaptel/trunk/debian/zaptel.doc-base.zaptel.conf Thu Aug 28 20:00:15 2008
@@ -3,7 +3,7 @@
 Author: Zapata Telephony Project
 Abstract: A sample annotated zaptel.conf . This is the closest
  thing to a reference for zaptel.conf (used by ztcfg(1) ).
-Section: Comm
+Section: Network/Communication
 
 Format: text
 Files: /usr/share/doc/zaptel/examples/zaptel.conf.sample.gz

Copied: zaptel/trunk/debian/zaptel.lintian-overrides (from r6103, zaptel/trunk/debian/zaptel.lintian)
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.lintian-overrides?rev=6112&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.lintian (original)
+++ zaptel/trunk/debian/zaptel.lintian-overrides Thu Aug 28 20:00:15 2008
@@ -1,2 +1,1 @@
 zaptel: mknod-in-maintainer-script postinst:16
-zaptel-source: description-contains-duplicated-word a a

Propchange: zaptel/trunk/debian/zaptel.lintian-overrides
------------------------------------------------------------------------------
    svn:mergeinfo =

More information about the Pkg-voip-commits mailing list