[Pkg-voip-commits] r6002 - /misdn-kernel/trunk/debian/ /misdn-kernel/trunk/debian/patches/ /misdn-user/trunk/ /misdn-user/trunk/debian/ /misdn-user/trunk/example/ /misdn-user/trunk/i4lnet/ /misdn-user/trunk/lib/ /misdn-user/trunk/suppserv/ /misdn-user/trunk/voip/

maniac-guest at alioth.debian.org maniac-guest at alioth.debian.org
Tue Jul 29 11:41:14 UTC 2008 

Author: maniac-guest
Date: Tue Jul 29 11:41:14 2008
New Revision: 6002

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6002
Log:
misdn-* merged from maniac-guest branch

Added:
    misdn-kernel/trunk/debian/misdn-config.dirs
      - copied unchanged from r6001, misdn-kernel/branches/maniac-guest/debian/misdn-config.dirs
    misdn-kernel/trunk/debian/misdn-config.install
      - copied unchanged from r6001, misdn-kernel/branches/maniac-guest/debian/misdn-config.install
    misdn-kernel/trunk/debian/patches/debug_off
      - copied unchanged from r6001, misdn-kernel/branches/maniac-guest/debian/patches/debug_off
    misdn-kernel/trunk/debian/patches/misdnversion
      - copied unchanged from r6001, misdn-kernel/branches/maniac-guest/debian/patches/misdnversion
    misdn-kernel/trunk/debian/patches/perms_dev_mISDN
      - copied unchanged from r6001, misdn-kernel/branches/maniac-guest/debian/patches/perms_dev_mISDN
    misdn-user/trunk/debian/
      - copied from r6001, misdn-user/branches/maniac-guest/debian/
    misdn-user/trunk/debian/changelog
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/changelog
    misdn-user/trunk/debian/compat
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/compat
    misdn-user/trunk/debian/control
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/control
    misdn-user/trunk/debian/copyright
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/copyright
    misdn-user/trunk/debian/libisdnnet-dev.install
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/libisdnnet-dev.install
    misdn-user/trunk/debian/libmisdn-dev.install
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/libmisdn-dev.install
    misdn-user/trunk/debian/misdn-utils.install
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/misdn-utils.install
    misdn-user/trunk/debian/misdn-utils.links
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/misdn-utils.links
    misdn-user/trunk/debian/rules
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/rules
    misdn-user/trunk/debian/xcontrol
      - copied unchanged from r6001, misdn-user/branches/maniac-guest/debian/xcontrol
Removed:
    misdn-user/trunk/Makefile
    misdn-user/trunk/example/
    misdn-user/trunk/i4lnet/
    misdn-user/trunk/lib/
    misdn-user/trunk/suppserv/
    misdn-user/trunk/voip/
Modified:
    misdn-kernel/trunk/debian/changelog
    misdn-kernel/trunk/debian/control
    misdn-kernel/trunk/debian/control-template
    misdn-kernel/trunk/debian/patches/series
    misdn-kernel/trunk/debian/rules
    misdn-kernel/trunk/debian/rules-template

Modified: misdn-kernel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/changelog?rev=6002&op=diff
==============================================================================
--- misdn-kernel/trunk/debian/changelog (original)
+++ misdn-kernel/trunk/debian/changelog Tue Jul 29 11:41:14 2008
@@ -1,7 +1,21 @@
+misdn-kernel (1.1.8-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * added new misdn-config package
+  * added patch to use perms compatible with asterisk
+  * added patch to get rid of MISDNVERSION
+  * added CONFIGS variable to rules-template. Removed exports
+  * added MISDNVERSION variable to rules-template.
+  * patches unapplied. 
+     hfcmulti_c90
+     hfcmulti_bigendian
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 04 Jun 2008 19:31:22 +0200
+
 misdn-kernel (1.1.7-2) UNRELEASED; urgency=low
 
   [ Kilian Krause ]
-  * debian/rules:
+  * debian/rules: 
     - Minor cleanups.
     - Add get-orig-source and print-version targets.
 

Modified: misdn-kernel/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/control?rev=6002&op=diff
==============================================================================
--- misdn-kernel/trunk/debian/control (original)
+++ misdn-kernel/trunk/debian/control Tue Jul 29 11:41:14 2008
@@ -30,3 +30,13 @@
  .
  You need this package if you intend to compile userspace applications that
  access mISDN specific interfaces.
+
+Package: misdn-config
+Architecture: all
+Depends: xsltproc
+Description: init-script to auto-configure and load the mISDN kernel drivers
+ This script makes it easy to configure and activate mISDN compatible
+ adapter cards. It scans an eyecandy config file named mISDN.conf
+ for your card and port settings, then it loads the driver modules properly.
+ The mISDN.conf can also be autogenerated by the mISDN script.
+

Modified: misdn-kernel/trunk/debian/control-template
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/control-template?rev=6002&op=diff
==============================================================================
--- misdn-kernel/trunk/debian/control-template (original)
+++ misdn-kernel/trunk/debian/control-template Tue Jul 29 11:41:14 2008
@@ -7,6 +7,7 @@
 Package: misdn-modules-@@Kernel-Version@@
 Architecture: any
 Provides: misdn-modules
+Depends: bc, pciutils
 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

Modified: misdn-kernel/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/patches/series?rev=6002&op=diff
==============================================================================
--- misdn-kernel/trunk/debian/patches/series (original)
+++ misdn-kernel/trunk/debian/patches/series Tue Jul 29 11:41:14 2008
@@ -1,2 +1,4 @@
-hfcmulti_c90
-hfcmulti_bigendian
+#hfcmulti_c90
+#hfcmulti_bigendian
+perms_dev_mISDN
+misdnversion

Modified: misdn-kernel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/rules?rev=6002&op=diff
==============================================================================
--- misdn-kernel/trunk/debian/rules (original)
+++ misdn-kernel/trunk/debian/rules Tue Jul 29 11:41:14 2008
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
+# Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
 include /usr/share/quilt/quilt.make
@@ -86,23 +86,11 @@
 	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
@@ -111,32 +99,6 @@
 
 # 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
 
@@ -149,7 +111,7 @@
 get-orig-source:
 	@@dh_testdir
 	@@mkdir -p ../tarballs
-	@@wget -N -nv -T10 -t3 --verbose -O ../tarballs/$(FILENAME) $(URL)
+	@@wget -nv -T10 -t3 --verbose -O ../tarballs/$(FILENAME) $(URL)
 
 .PHONY: build clean binary-indep binary-arch binary-modules binary-modules-% binary install configure FORCE
 .PRECIOUS: stamp-source-modules-% stamp-build-modules-%

Modified: misdn-kernel/trunk/debian/rules-template
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/rules-template?rev=6002&op=diff
==============================================================================
--- misdn-kernel/trunk/debian/rules-template (original)
+++ misdn-kernel/trunk/debian/rules-template Tue Jul 29 11:41:14 2008
@@ -81,23 +81,22 @@
 
 export EXTRA_CFLAGS
 
-CONFIG_MISDN_DRV=m
+# CONFIGS way
+
+CONFIGS+=CONFIG_MISDN_DRV=m
 ifneq ($(CONFIG_PPC64),y)
-CONFIG_MISDN_AVM_FRITZ=y
+CONFIGS+=CONFIG_MISDN_AVM_FRITZ=m
 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
+CONFIGS+=CONFIG_MISDN_HFCPCI=m
+CONFIGS+=CONFIG_MISDN_HFCUSB=m
+CONFIGS+=CONFIG_MISDN_SPEEDFAX=m
+CONFIGS+=CONFIG_MISDN_W6692=m
+CONFIGS+=CONFIG_MISDN_HFCMULTI=m
+CONFIGS+=CONFIG_MISDN_NETJET=m
+CONFIGS+=CONFIG_MISDN_DSP=m
+CONFIGS+=CONFIG_MISDN_HFCMINI=m
+CONFIGS+=CONFIG_MISDN_XHFC=m
+CONFIGS+=EXTRA_CFLAGS=$(EXTRA_CFLAGS)
 
 kdist: kdist_clean kdist_config kdist_image
 
@@ -121,6 +120,7 @@
 	  M=$M \
 	  $(parallel) \
 	  $(EXTRAV_ARG) \
+	  $(CONFIGS) \
 	  modules
 
 binary-modules: build-modules

More information about the Pkg-voip-commits mailing list