diff -Nru speakup-3.1.5.dfsg.1/debian/changelog speakup-3.1.5.dfsg.1/debian/changelog --- speakup-3.1.5.dfsg.1/debian/changelog 2010-08-06 01:30:23.000000000 +0000 +++ speakup-3.1.5.dfsg.1/debian/changelog 2010-10-16 02:48:16.000000000 +0000 @@ -1,3 +1,18 @@ +speakup (3.1.5.dfsg.1-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Re-enable speakup dkms package + + -- Luke Yelavich Sat, 16 Oct 2010 13:32:16 +1100 + +speakup (3.1.5.dfsg.1-1) unstable; urgency=low + + * New upstream fix-only release. + Also cherry-pick upstream fixes up to de98895e. + * debian/control: Bump Standards-Version to 3.9.1 (no change needed). + + -- Samuel Thibault Tue, 24 Aug 2010 21:34:33 +0200 + speakup (3.1.5.dfsg.1-0ubuntu1) maverick; urgency=low * New upstream git snapshot @@ -143,3 +158,4 @@ * Initial release. -- Mario Lang Fri, 9 June 2008 18:09:03 +0100 + diff -Nru speakup-3.1.5.dfsg.1/debian/control speakup-3.1.5.dfsg.1/debian/control --- speakup-3.1.5.dfsg.1/debian/control 2010-08-06 01:27:56.000000000 +0000 +++ speakup-3.1.5.dfsg.1/debian/control 2010-10-16 02:48:16.000000000 +0000 @@ -36,10 +36,10 @@ * Braille 'N Speak / Type 'N Speak * Dectalk External and Express * the Apollo2 - . - This package provides the source code for the speakup kernel modules. - Kernel source or headers are required to compile these modules. For - basic install steps see /usr/share/doc/speakup-source/README.Debian.gz + . + This package provides the source code for the speakup kernel modules. + Kernel source or headers are required to compile these modules. For + basic install steps see /usr/share/doc/speakup-source/README.Debian.gz Package: speakup-doc Section: doc @@ -67,8 +67,8 @@ * Braille 'N Speak / Type 'N Speak * Dectalk External and Express * the Apollo2 - . - This package provides the documentation for the speakup kernel modules. + . + This package provides the documentation for the speakup kernel modules. Package: speakup-tools Architecture: all @@ -81,8 +81,8 @@ - talkwith allows to easily switch between speech synthesizers. Package: speakup -Architecture: i386 amd64 -Depends: ${misc:Depends}, dkms, linux-libc-dev, libc6-dev, linux-headers-generic [i386 amd64] | linux-headers +Architecture: all +Depends: ${misc:Depends}, dkms (>= 2.1.0.0) Description: Source of the speakup kernel modules Speakup allows you to interact with applications and the GNU/Linux operating system with audible feedback from the console using a @@ -105,6 +105,6 @@ * Braille 'N Speak / Type 'N Speak * Dectalk External and Express * the Apollo2 - . - This package provides the source code for the speakup kernel modules, - which will be built on package install. + . + This package provides the source code for the speakup kernel modules + which will be built on package install. diff -Nru speakup-3.1.5.dfsg.1/debian/rules speakup-3.1.5.dfsg.1/debian/rules --- speakup-3.1.5.dfsg.1/debian/rules 2010-07-09 02:27:47.000000000 +0000 +++ speakup-3.1.5.dfsg.1/debian/rules 2010-10-16 02:48:16.000000000 +0000 @@ -5,15 +5,8 @@ CFLAGS ?= -Wall -g # For DKMS -DRIVER_NAME := speakup VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2 | cut -d- -f1 | cut -d\: -f2) PKG_kernel_src := speakup -ARCH := $(shell dpkg --print-architecture) -ifeq ($(ARCH),amd64) -ARCH_SUFFIX=x86_64 -else -ARCH_SUFFIX=i386 -endif DEB_DH_INSTALLINIT_ARGS = -R DEB_UPDATE_RCD_PARAMS = start 46 S . @@ -54,7 +47,6 @@ for i in dkms.conf \ $(PKG_kernel_src).install; do \ sed -e "s|#VERSION#|$(VERSION)|" \ - -e "s|#ARCH#|$(ARCH_SUFFIX)|" \ debian/$$i.in > debian/$$i; \ done diff -Nru speakup-3.1.5.dfsg.1/debian/speakup.postinst speakup-3.1.5.dfsg.1/debian/speakup.postinst --- speakup-3.1.5.dfsg.1/debian/speakup.postinst 2010-07-09 02:28:34.000000000 +0000 +++ speakup-3.1.5.dfsg.1/debian/speakup.postinst 2010-10-16 02:48:16.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e # Copyright (C) 2002-2005 Flavio Stanchina # Copyright (C) 2005-2006 Aric Cyr # Copyright (C) 2007 Mario Limonciello @@ -6,32 +6,13 @@ # Copyright (C) 2010 Luke Yelavich CVERSION=`dpkg-query -W -f='${Version}' speakup | awk -F "-" '{print $1}' | cut -d\: -f2` -MODULES_DIR=$(ls /lib/modules/) -CURRENT_KERNEL=$(uname -r) PACKAGE_NAME=speakup #DEBHELPER# -ARCH=`dpkg --print-architecture` -case $ARCH in - amd64) - ARCH="x86_64" - ;; - lpia) - ARCH="i686" - ;; - i386) - ARCH="i686" - ;; - *) - echo "WARNING: unsupported arch: $ARCH" - ARCH="$ARCH" - ;; -esac - case "$1" in configure) # Build the kernel module - /usr/lib/dkms/common.postinst $PACKAGE_NAME $CVERSION /usr/share/$PACKAGE_NAME $ARCH $2 || exit $? + /usr/lib/dkms/common.postinst $PACKAGE_NAME $CVERSION /usr/share/$PACKAGE_NAME "" $2 || exit $? ;; esac diff -Nru speakup-3.1.5.dfsg.1/debian/speakup.prerm speakup-3.1.5.dfsg.1/debian/speakup.prerm --- speakup-3.1.5.dfsg.1/debian/speakup.prerm 2010-07-09 02:29:04.000000000 +0000 +++ speakup-3.1.5.dfsg.1/debian/speakup.prerm 2010-10-16 02:48:16.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e # Copyright (C) 2002-2005 Flavio Stanchina # Copyright (C) 2005-2006 Aric Cyr # Copyright (C) 2007-2008 Mario Limonciello diff -Nru speakup-3.1.5.dfsg.1/.gitignore speakup-3.1.5.dfsg.1/.gitignore --- speakup-3.1.5.dfsg.1/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ speakup-3.1.5.dfsg.1/.gitignore 2010-07-22 14:06:52.000000000 +0000 @@ -0,0 +1,19 @@ +.* +*.o +*.o.* +*.a +*.s +*.ko +*.so +*.so.dbg +*.mod.c +*.i +*.lst +*.symtypes +*.order +Module.markers +Module.symvers +*.orig +*~ +\#*# +!.gitignore diff -Nru speakup-3.1.5.dfsg.1/src/Kbuild speakup-3.1.5.dfsg.1/src/Kbuild --- speakup-3.1.5.dfsg.1/src/Kbuild 2010-07-07 01:31:13.000000000 +0000 +++ speakup-3.1.5.dfsg.1/src/Kbuild 2010-10-16 02:48:16.000000000 +0000 @@ -1,3 +1,4 @@ +include $M/allmodule.mk obj-$(CONFIG_SPEAKUP_SYNTH_ACNTSA) += speakup_acntsa.o obj-$(CONFIG_SPEAKUP_SYNTH_ACNTPC) += speakup_acntpc.o obj-$(CONFIG_SPEAKUP_SYNTH_APOLLO) += speakup_apollo.o