[Pkg-voip-commits] r4888 - in /misdn-kernel/trunk/debian: ./ changelog compat control control-template copyright linux-headers-misdn.install misdn-source.install rules rules-template

sjr at alioth.debian.org sjr at alioth.debian.org
Thu Nov 29 13:06:17 UTC 2007


Author: sjr
Date: Thu Nov 29 13:06:17 2007
New Revision: 4888

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4888
Log:
[svn-inject] Applying Debian modifications to trunk

Added:
    misdn-kernel/trunk/debian/   (with props)
    misdn-kernel/trunk/debian/changelog
    misdn-kernel/trunk/debian/compat
    misdn-kernel/trunk/debian/control
    misdn-kernel/trunk/debian/control-template
    misdn-kernel/trunk/debian/copyright
    misdn-kernel/trunk/debian/linux-headers-misdn.install
    misdn-kernel/trunk/debian/misdn-source.install
    misdn-kernel/trunk/debian/rules   (with props)
    misdn-kernel/trunk/debian/rules-template

Propchange: misdn-kernel/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Added: misdn-kernel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/changelog?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/changelog (added)
+++ misdn-kernel/trunk/debian/changelog Thu Nov 29 13:06:17 2007
@@ -1,0 +1,112 @@
+misdn-kernel (1.1.7-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Simon Richter <sjr at debian.org>  Thu, 29 Nov 2007 13:41:34 +0100
+
+misdn-kernel (1.1.6-1) experimental; urgency=low
+
+  * New upstream release
+  * Add missing dependency misdn-source -> debhelper
+
+ -- Simon Richter <sjr at debian.org>  Sun, 04 Nov 2007 02:03:05 +0100
+
+misdn-kernel (1.1.5-1) experimental; urgency=low
+
+  * New upstream release, experimental packages due to popular demand.
+
+ -- Simon Richter <sjr at debian.org>  Tue, 14 Aug 2007 23:54:25 +0200
+
+misdn-kernel (0.0.0+cvs20061029-4) unstable; urgency=low
+
+  * Updated to new kernel ABI
+
+ -- Simon Richter <sjr at debian.org>  Mon, 27 Nov 2006 16:31:25 +0100
+
+misdn-kernel (0.0.0+cvs20061029-3) unstable; urgency=low
+
+  * Fix control file generation and parsing to avoid building modules for
+    flavours that have "modules: false" set, and to avoid the substring match
+    "mips" in "mipsel" (Closes: #385813)
+
+ -- Simon Richter <sjr at debian.org>  Wed,  1 Nov 2006 21:54:52 +0100
+
+misdn-kernel (0.0.0+cvs20061029-2) unstable; urgency=low
+
+  * Adapted toplevel debian/rules to also use $KPKG_DEST_DIR. Interestingly
+    enough, it worked during my testing here.
+
+ -- Simon Richter <sjr at debian.org>  Wed,  1 Nov 2006 20:20:04 +0100
+
+misdn-kernel (0.0.0+cvs20061029-1) unstable; urgency=low
+
+  * New upstream release
+  * Using $KPKG_DEST_DIR instead of $MODDIR as the output directory
+    (Closes: #395245)
+
+ -- Simon Richter <sjr at debian.org>  Wed,  1 Nov 2006 13:33:54 +0100
+
+misdn-kernel (0.0.0+cvs20060902-1) unstable; urgency=low
+
+  * New upstream snapshot
+  * Updated to kernel 2.6.17-2 (Closes: #352121, #343700)
+  * Fix building with module-assistant, should also work with make-kpkg
+    (Closes: #296167, #305197)
+  * Modules are built for standard kernels (Closes: #304511)
+  * Reactivated HFC-S USB, as it appears to be fixed (Closes: #363241)
+  * Activated new NetJet driver
+
+ -- Simon Richter <sjr at debian.org>  Sat,  2 Sep 2006 20:34:39 +0200
+
+misdn-kernel (0.0.0+cvs20060214-1) unstable; urgency=low
+
+  * Updated to 2.6.16
+  * New upstream "release"
+
+ -- Simon Richter <sjr at debian.org>  Tue, 21 Mar 2006 16:33:47 +0100
+
+misdn-kernel (0.0.0+cvs20051212-1) unstable; urgency=low
+
+  * Reworked the build scripting, a lot.
+  * New version (now using "mqueue" branch)
+  * Switched to new kernel packages, dropping sarge support (sorry).
+  * Disabled HFC-USB support for this version, APIs in flux
+
+ -- Simon Richter <sjr at debian.org>  Sun, 12 Feb 2006 01:12:50 +0100
+
+misdn-kernel (0.0.0+cvs20050408-2) unstable; urgency=low
+
+  * Bumped build-dep to point to a newer kernel
+  * Cleaned up debian/rules
+
+ -- Simon Richter <sjr at debian.org>  Sat, 30 Apr 2005 00:43:23 +0200
+
+misdn-kernel (0.0.0+cvs20050408-1) unstable; urgency=low
+
+  * New upstream version
+  * Allow building against 2.6.8 kernel in sarge
+
+ -- Simon Richter <sjr at debian.org>  Fri,  8 Apr 2005 16:30:27 +0200
+
+misdn-kernel (0.0.0+cvs20050402-1) unstable; urgency=low
+
+  * Moved to 2.6.10 (Closes: #302448)
+  * New upstream version
+
+ -- Simon Richter <sjr at debian.org>  Sat,  2 Apr 2005 01:13:07 +0200
+
+misdn-kernel (0.0.0+cvs20041116-1) unstable; urgency=low
+
+  * New upstream version
+  * Moved to 2.6.9
+  * Corrected build dependencies (Closes: #281273)
+  * Fixed dependency of misdn-kernel-source (Closes: #281716)
+
+ -- Simon Richter <sjr at debian.org>  Tue, 16 Nov 2004 15:30:28 +0100
+
+misdn-kernel (0.0.0+cvs20041018-1) unstable; urgency=low
+
+  * Initial Release (Closes: #263085).
+
+ -- Simon Richter <sjr at debian.org>  Mon, 18 Aug 2004 11:11:56 +0200
+

Added: misdn-kernel/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/compat?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/compat (added)
+++ misdn-kernel/trunk/debian/compat Thu Nov 29 13:06:17 2007
@@ -1,0 +1,1 @@
+5

Added: misdn-kernel/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/control?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/control (added)
+++ misdn-kernel/trunk/debian/control Thu Nov 29 13:06:17 2007
@@ -1,0 +1,32 @@
+Source: misdn-kernel
+Section: comm
+Priority: extra
+Maintainer: Simon Richter <sjr at debian.org>
+Build-Depends: debhelper (>= 5.0.0)
+Standards-Version: 3.7.2
+
+Package: misdn-source
+Architecture: all
+Depends: make, debhelper (>> 4)
+Recommends: module-assistant | kernel-package
+Conflicts: misdn-kernel-source (<< ${source:Version})
+Replaces: misdn-kernel-source (<< ${source:Version})
+Provides: misdn-kernel-source
+Description: Source code for the mISDN modules
+ The modular ISDN drivers are the bleeding edge implementation of ISDN support
+ in the Linux kernel. The most prominent new feature is support for ISDN cards
+ in NT mode, so you can connect an ISDN telephone to your computer.
+ .
+ You need this package if you want to compile the mISDN modules to accompany
+ your custom kernel. If you are using a kernel shipped by Debian, you can also
+ install the corresponding misdn-kernel-modules-... package.
+
+Package: linux-headers-misdn
+Architecture: all
+Description: Header files for the mISDN drivers
+ The modular ISDN drivers are the bleeding edge implementation of ISDN support
+ in the Linux kernel. The most prominent new feature is support for ISDN cards
+ in NT mode, so you can connect an ISDN telephone to your computer.
+ .
+ You need this package if you intend to compile userspace applications that
+ access mISDN specific interfaces.

Added: misdn-kernel/trunk/debian/control-template
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/control-template?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/control-template (added)
+++ misdn-kernel/trunk/debian/control-template Thu Nov 29 13:06:17 2007
@@ -1,0 +1,20 @@
+Source: misdn-kernel
+Section: comm
+Priority: extra
+Maintainer: Simon Richter <sjr at debian.org>
+Standards-Version: 3.7.2
+
+Package: misdn-modules-@@Kernel-Version@@
+Architecture: any
+Provides: misdn-modules
+Description: mISDN modules for Linux (kernel @@Kernel-Version@@)
+ The modular ISDN drivers are the bleeding edge implementation of ISDN support
+ in the Linux kernel. The most prominent new feature is support for ISDN cards
+ in NT mode, so you can connect an ISDN telephone to your computer.
+ .
+ This package contains the compiled kernel modules for @@Kernel-Version@@
+ .
+ If you have compiled your own kernel, you will most likely need to build your
+ own mISDN modules.  The misdn-source package has been provided for use with
+ module-assistant or make-kpkg to produce a version of misdn-kernel-module for
+ your kernel.

Added: misdn-kernel/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/copyright?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/copyright (added)
+++ misdn-kernel/trunk/debian/copyright Thu Nov 29 13:06:17 2007
@@ -1,0 +1,38 @@
+This package was debianized by Simon Richter <sjr at debian.org> on
+Tue,  3 Aug 2004 11:11:56 +0200.
+
+It was downloaded from http://www.isdn4linux.de
+
+Upstream Authors: Karsten Keil <kkeil at suse.de>
+                  Werner Cornelius <werner at isdn-development.de>
+                  Andreas Eversberg <jolly at jolly.de>
+                  Fritz Elfert <fritz at isdn4linux.de>
+                  Christian Richter <crich at beronet.de>
+
+Copyright:
+
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Karsten Keil
+Copyright (C) 1999                               Werner Cornelius
+Copyright (C) 2002, 2003                         Andreas Eversberg
+Copyright (C) 2001                               Steve Underwood
+Copyright (C) 2005, 2006                         Christian Richter
+Copyright (C) 2002                               Digium, Inc.
+Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Fritz Elfert
+Copyright (C) 2005, 2006                         Cologne Chip AG
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+

Added: misdn-kernel/trunk/debian/linux-headers-misdn.install
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/linux-headers-misdn.install?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/linux-headers-misdn.install (added)
+++ misdn-kernel/trunk/debian/linux-headers-misdn.install Thu Nov 29 13:06:17 2007
@@ -1,0 +1,1 @@
+include/linux usr/include

Added: misdn-kernel/trunk/debian/misdn-source.install
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/misdn-source.install?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/misdn-source.install (added)
+++ misdn-kernel/trunk/debian/misdn-source.install Thu Nov 29 13:06:17 2007
@@ -1,0 +1,1 @@
+misdn-source.tar.gz				usr/src

Added: misdn-kernel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/rules?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/rules (added)
+++ misdn-kernel/trunk/debian/rules Thu Nov 29 13:06:17 2007
@@ -1,0 +1,132 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+clean:: clean-check
+
+clean-check:
+	dh_testdir
+	dh_testroot
+
+build-misdn-source: stamp-source-archive
+
+.SECONDARY: stamp-source-archive
+clean::
+	$(RM) stamp-source-archive
+
+stamp-source-archive: misdn-source.tar.gz
+	touch $@
+
+.SECONDARY: misdn-source.tar.gz
+clean::
+	$(RM) misdn-source.tar.gz
+
+misdn-source.tar.gz: misdn-source.tar
+	$(RM) $@
+	gzip -9 $<
+
+clean::
+	$(RM) misdn-source.tar
+
+misdn-source.tar: stamp-source
+	tar --transform 's@^source at modules/misdn@' -c source >$@
+
+.SECONDARY: stamp-source
+clean::
+	$(RM) stamp-source
+	$(RM) -r source
+
+stamp-source: debian/control-template
+	$(RM) -r source
+	mkdir -p source
+	cp drivers/isdn/hardware/mISDN/*.[ch] source/
+	cp drivers/isdn/hardware/mISDN/Kconfig.v2.6 source/Kconfig
+	cp drivers/isdn/hardware/mISDN/Makefile.v2.6 source/Makefile
+	cp -r include source/
+	find source -type d -print0 | xargs -r0 chmod 755
+	find source -type f -print0 | xargs -r0 chmod 644
+	mkdir -p source/debian
+	cp debian/control-template source/debian/control.in
+	cp debian/rules-template source/debian/rules
+	chmod +x source/debian/rules
+	cp debian/changelog debian/compat debian/copyright source/debian
+	touch $@
+
+clean::
+	dh_clean
+
+build-arch:
+
+build-indep: build-misdn-source
+
+build: build-arch build-indep
+
+binary-indep: build-indep
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs  -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_install -i
+#	dh_installmenu -i
+#	dh_installdebconf -i
+#	dh_installlogrotate -i
+#	dh_installemacsen -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installinit -i
+#	dh_installcron -i
+#	dh_installinfo -i
+	dh_installman -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+#	dh_perl -i
+#	dh_python -i
+#	dh_makeshlibs -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build-arch
+#	dh_testdir -s
+#	dh_testroot -s
+#	dh_installdebconf -s
+#	dh_installdocs -s
+#	dh_installexamples -s
+#	dh_installmenu -s
+#	dh_installlogrotate -s
+#	dh_installemacsen -s
+#	dh_installpam -s
+#	dh_installmime -s
+#	dh_installinit -s
+#	dh_installcron -s
+#	dh_installman -s
+#	dh_installinfo -s
+#	dh_installchangelogs  -s
+#	dh_strip -s
+#	dh_link -s
+#	dh_compress -s
+#	dh_fixperms -s
+#	dh_makeshlibs -s
+#	dh_installdeb -s
+#	dh_perl -s
+#	dh_shlibdeps -s
+#	dh_gencontrol -s
+#	dh_md5sums -s
+#	dh_builddeb -s
+
+binary: binary-indep binary-arch
+
+FORCE:
+
+.PHONY: build clean binary-indep binary-arch binary-modules binary-modules-% binary install configure FORCE
+.PRECIOUS: stamp-source-modules-% stamp-build-modules-%

Propchange: misdn-kernel/trunk/debian/rules
------------------------------------------------------------------------------
    svn:executable = *

Added: misdn-kernel/trunk/debian/rules-template
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/rules-template?rev=4888&op=file
==============================================================================
--- misdn-kernel/trunk/debian/rules-template (added)
+++ misdn-kernel/trunk/debian/rules-template Thu Nov 29 13:06:17 2007
@@ -1,0 +1,151 @@
+#!/usr/bin/make -f
+
+# Overridden by make-kpkg
+KSRC	?= /usr/src/linux
+KDREV	?= "0test"
+MODDIR	?= ..
+
+KPKG_DEST_DIR = ..
+
+# In case this is not make-kpkg
+
+ifeq ($(strip $(KVERS)),)
+ifeq ($(strip $(KSRC)),)
+$(error Error. I do not know how to determine the kernel version)
+else
+kversion :=$(shell egrep '^VERSION +=' $(KSRC)/Makefile 2>/dev/null | \
+                 sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+kplevel  :=$(shell egrep '^PATCHLEVEL +=' $(KSRC)/Makefile 2>/dev/null | \
+                    sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+ksublevel:=$(shell egrep '^SUBLEVEL +=' $(KSRC)/Makefile 2>/dev/null | \
+                  sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+EXTRA_VERSION:=$(shell egrep '^EXTRAVERSION +=' $(KSRC)/Makefile 2>/dev/null | \
+                 sed -e 's/EXTRAVERSION[\t ]*=[\t ]*\(.*\)/\1/')
+kextra:=$(strip $(EXTRA_VERSION))
+HAVE_NEW_MODLIB:=$(shell egrep '\(INSTALL_MOD_PATH\)' \
+                            $(KSRC)/Makefile 2>/dev/null )
+FLAVOUR:=$(shell grep ^FLAVOUR $(KSRC)/Makefile 2>/dev/null | \
+                  perl -ple 's/FLAVOUR[\s:=]+//g')
+
+ifneq ($(strip $(FLAVOUR)),)
+INT_FLAV := -$(FLAVOUR)
+FLAV_ARG := FLAVOUR=$(FLAVOUR)
+else
+INT_FLAV :=
+FLAV_ARG :=
+endif
+
+ifneq ($(strip $(APPEND_TO_VERSION)),)
+iatv := $(strip $(APPEND_TO_VERSION))
+EXTRAV_ARG := EXTRAVERSION=${EXTRA_VERSION}${iatv}
+else
+iatv :=
+EXTRAV_ARG :=
+endif
+
+KVERS = $(kversion).$(kplevel).$(ksublevel)$(kextra)$(iatv)$(INT_FLAV)
+
+endif
+else
+ifneq ($(KPKG_EXTRAV_ARG),)
+EXTRAV_ARG=$(KPKG_EXTRAV_ARG)
+else
+# XXX: Ugly hack.
+EXTRAV_ARG := KERNELRELEASE=$(KVERS)
+endif
+endif
+
+non_epoch_version=$(shell echo $(KVERS)$(EXTRAVERSION) | perl -pe 's/^\d+://')
+epoch=$(shell echo $(KVERS) | perl -ne 'm/^(\d+:)/ && print $$1')
+
+# We also need the package version
+pversion	= $(shell sed -ne '1s/.*\((.*)\).*/\1/' debian/changelog)
+pversion	= $(shell sed -ne '1s/.*(\(.*\)).*/\1/p' debian/changelog)
+
+pmodules = misdn-modules-$(non_epoch_version)
+
+pwd := $(shell pwd)
+
+ifdef CONCURRENCY_LEVEL
+parallel = -j$(CONCURRENCY_LEVEL)
+endif
+
+include $(KSRC)/.config
+
+#ifeq ($(CONFIG_PPC64),y)
+#ARCH = powerpc
+#export ARCH
+#endif
+
+EXTRA_CFLAGS = -I$(pwd)/include
+
+export EXTRA_CFLAGS
+
+CONFIG_MISDN_DRV=m
+ifneq ($(CONFIG_PPC64),y)
+CONFIG_MISDN_AVM_FRITZ=y
+endif
+CONFIG_MISDN_HFCPCI=y
+CONFIG_MISDN_HFCUSB=y
+CONFIG_MISDN_SPEEDFAX=y
+CONFIG_MISDN_W6692=y
+CONFIG_MISDN_HFCMULTI=y
+CONFIG_MISDN_NETJET=y
+CONFIG_MISDN_NETDEV=y
+#CONFIG_I4L_CAPI_LAYER=y
+
+export CONFIG_MISDN_DRV CONFIG_MISDN_AVM_FRITZ CONFIG_MISDN_HFCPCI
+export CONFIG_MISDN_HFCUSB CONFIG_MISDN_SPEEDFAX CONFIG_MISDN_W6692
+export CONFIG_MISDN_HFCMULTI CONFIG_MISDN_NETJET CONFIG_MISDN_NETDEV
+export CONFIG_I4L_CAPI_LAYER
+
+kdist: kdist_clean kdist_config kdist_image
+
+kdist_config:
+
+kdist_image:
+	$(MAKE) $(MFLAGS) -f debian/rules $(EXTRAV_ARG) binary-modules
+	$(MAKE) $(MFLAGS) -f debian/rules clean
+
+kdist_clean: debian/control
+	$(MAKE) -C $(KSRC) M=$(pwd) $(EXTRAV_ARG) clean
+	dh_clean
+	$(RM) debian/*.substvars
+	$(RM) debian/control
+
+M ?= $(pwd)
+
+build-modules: debian/control
+	dh_testdir
+	$(MAKE) -C $(KSRC) \
+	  M=$M \
+	  $(parallel) \
+	  $(EXTRAV_ARG) \
+	  modules
+
+binary-modules: build-modules
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) -C $(KSRC) M=$M $(EXTRAV_ARG) \
+	  INSTALL_MOD_PATH=$(pwd)/debian/$(pmodules) \
+	  modules_install
+	dh_installdebconf
+	dh_installdocs
+	dh_installchangelogs
+	dh_fixperms
+	dh_compress
+	dh_installmodules
+	dh_installdeb
+	dh_gencontrol -- -v$(epoch)$(pversion)
+	dh_md5sums
+	dh_builddeb --destdir=$(KPKG_DEST_DIR)
+
+clean: kdist_clean
+
+debian/control: debian/control.in
+	sed -e 's/@@Kernel\-Version@@/$(non_epoch_version)/' \
+	    debian/control.in > debian/control
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure binary-modules kdist kdist_config kdist_image kdist_clean




More information about the Pkg-voip-commits mailing list