Attaching a debdiff that removes speakup-source and fixes some other minor issues. I will not NMU this as I'm not able to test the resulting binary packages. Ben. -- Ben Hutchings Beware of programmers who carry screwdrivers. - Leonard Brandwein
reverted:
--- speakup-3.1.5.dfsg.1/debian/speakup.install.in
+++ speakup-3.1.5.dfsg.1.orig/debian/speakup.install.in
@@ -1,2 +0,0 @@
-src/* usr/src/speakup-#VERSION#
-debian/dkms.conf usr/src/speakup-#VERSION#
diff -u speakup-3.1.5.dfsg.1/debian/changelog speakup-3.1.5.dfsg.1/debian/changelog
--- speakup-3.1.5.dfsg.1/debian/changelog
+++ speakup-3.1.5.dfsg.1/debian/changelog
@@ -1,3 +1,13 @@
+speakup (3.1.5.dfsg.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove speakup-source binary packages (Closes: #604643, #651859)
+ * Remove unused DKMS support
+ * Remove deprecated cdbs variables to control dh_installinit; no init
+ script is installed
+
+ -- Ben Hutchings <ben@decadent.org.uk> Fri, 30 Dec 2011 16:53:32 +0100
+
speakup (3.1.5.dfsg.1-1) unstable; urgency=low
* New upstream fix-only release.
diff -u speakup-3.1.5.dfsg.1/debian/control speakup-3.1.5.dfsg.1/debian/control
--- speakup-3.1.5.dfsg.1/debian/control
+++ speakup-3.1.5.dfsg.1/debian/control
@@ -9,37 +9,6 @@
Vcs-Browser: http://git.debian.org/?p=pkg-a11y/speakup.git
Homepage: http://linux-speakup.org/
-Package: speakup-source
-Architecture: all
-Depends: debhelper (>= 5.0.37), module-assistant, bzip2, ${misc:Depends}
-Suggests: kernel-package
-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
- synthetic speech device.
- .
- Speakup allows you to navigate around the screen using the typical
- screen review functions such as say word, say line, announce cursor
- position, which console your currently on, and much, much more. It
- also allows one to load in configuration parameters for controlling
- various aspects of the synthesizer you are using, as well as speakup
- itself.
- .
- Currently, the following synthesizers are supported by speakup:
- * DoubleTalk PC/LT
- * LiteTalk
- * Accent PC/SA
- * Speakout
- * Artic Transport
- * Audapter
- * 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
-
Package: speakup-doc
Section: doc
Architecture: all
@@ -81,29 +49,0 @@
-
-#Package: speakup
-#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
-# synthetic speech device.
-# .
-# Speakup allows you to navigate around the screen using the typical
-# screen review functions such as say word, say line, announce cursor
-# position, which console your currently on, and much, much more. It
-# also allows one to load in configuration parameters for controlling
-# various aspects of the synthesizer you are using, as well as speakup
-# itself.
-# .
-# Currently, the following synthesizers are supported by speakup:
-# * DoubleTalk PC/LT
-# * LiteTalk
-# * Accent PC/SA
-# * Speakout
-# * Artic Transport
-# * Audapter
-# * 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.
reverted:
--- speakup-3.1.5.dfsg.1/debian/dkms.conf.in
+++ speakup-3.1.5.dfsg.1.orig/debian/dkms.conf.in
@@ -1,37 +0,0 @@
-PACKAGE_NAME="speakup"
-PACKAGE_VERSION="#VERSION#"
-CLEAN="make clean"
-MAKE="make modules"
-DEST_MODULE_LOCATION="/updates/dkms"
-
-BUILT_MODULE_NAME[0]="speakup"
-DEST_MODULE_LOCATION[0]="/updates/dkms"
-BUILT_MODULE_NAME[1]="speakup_acntpc"
-DEST_MODULE_LOCATION[1]="/updates/dkms"
-BUILT_MODULE_NAME[2]="speakup_acntsa"
-DEST_MODULE_LOCATION[2]="/updates/dkms"
-BUILT_MODULE_NAME[3]="speakup_apollo"
-DEST_MODULE_LOCATION[3]="/updates/dkms"
-BUILT_MODULE_NAME[4]="speakup_audptr"
-DEST_MODULE_LOCATION[4]="/updates/dkms"
-BUILT_MODULE_NAME[5]="speakup_bns"
-DEST_MODULE_LOCATION[5]="/updates/dkms"
-BUILT_MODULE_NAME[6]="speakup_decext"
-DEST_MODULE_LOCATION[6]="/updates/dkms"
-BUILT_MODULE_NAME[7]="speakup_dectlk"
-DEST_MODULE_LOCATION[7]="/updates/dkms"
-BUILT_MODULE_NAME[8]="speakup_dtlk"
-DEST_MODULE_LOCATION[8]="/updates/dkms"
-BUILT_MODULE_NAME[9]="speakup_dummy"
-DEST_MODULE_LOCATION[9]="/updates/dkms"
-BUILT_MODULE_NAME[10]="speakup_keypc"
-DEST_MODULE_LOCATION[10]="/updates/dkms"
-BUILT_MODULE_NAME[11]="speakup_ltlk"
-DEST_MODULE_LOCATION[11]="/updates/dkms"
-BUILT_MODULE_NAME[12]="speakup_soft"
-DEST_MODULE_LOCATION[12]="/updates/dkms"
-BUILT_MODULE_NAME[13]="speakup_spkout"
-DEST_MODULE_LOCATION[13]="/updates/dkms"
-BUILT_MODULE_NAME[14]="speakup_txprt"
-DEST_MODULE_LOCATION[14]="/updates/dkms"
-AUTOINSTALL="yes"
reverted:
--- speakup-3.1.5.dfsg.1/debian/rules.modules
+++ speakup-3.1.5.dfsg.1.orig/debian/rules.modules
@@ -1,39 +0,0 @@
-#!/usr/bin/make -f
-
-PACKAGE := speakup-modules
-MA_DIR ?= /usr/share/modass
--include $(MA_DIR)/include/generic.make
--include $(MA_DIR)/include/common-rules.make
-
-.PHONY: kdist_config
-kdist_config: prep-deb-files
-
-.PHONY: binary-modules
-binary-modules: kdist_config
- dh_testdir
- dh_testroot
- dh_prep
-
- # Build the module
- $(MAKE) -C $(CURDIR) KERNEL_VERSION=$(KVERS) KERNELDIR=$(KSRC)
-
- # Install the module
- dh_installdirs lib/modules/$(KVERS)/extra/speakup/
- dh_install *.ko lib/modules/$(KVERS)/extra/speakup/
-
- dh_installdocs
- dh_installchangelogs
- dh_compress
- dh_fixperms
- dh_installmodules
- dh_installdeb
- dh_gencontrol -- -v$(VERSION)
- dh_md5sums
- dh_builddeb --destdir=$(DEB_DESTDIR)
-
-.PHONY: kdist_clean
-kdist_clean:
- dh_testdir
- dh_testroot
- dh_clean
- $(MAKE) -C $(CURDIR) KERNEL_VERSION=$(KVERS) KERNELDIR=$(KSRC) clean
diff -u speakup-3.1.5.dfsg.1/debian/rules speakup-3.1.5.dfsg.1/debian/rules
--- speakup-3.1.5.dfsg.1/debian/rules
+++ speakup-3.1.5.dfsg.1/debian/rules
@@ -4,13 +4,6 @@
CFLAGS ?= -Wall -g
-# For DKMS
-VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2 | cut -d- -f1 | cut -d\: -f2)
-PKG_kernel_src := speakup
-
-DEB_DH_INSTALLINIT_ARGS = -R
-DEB_UPDATE_RCD_PARAMS = start 46 S .
-
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
@@ -21,37 +14,6 @@
-install/speakup-source::
- # Enforce executable bit on debian/rules, and create
- # directory structure for modules source
- install -D -m 0755 debian/rules.modules \
- debian/tmp/modules/speakup/debian/rules
-
- # Prepare the other debian stuff
- for f in *.modules.in control compat copyright changelog; do \
- install -m 0644 debian/$$f \
- debian/tmp/modules/speakup/debian/; \
- done
-
- # Prepare upstream source
- (cd src ; find . -printf "%P\n" | \
- cpio -admp ../debian/tmp/modules/speakup/ )
-
- # Prepare the debian source tarball
- tar jcf debian/speakup-source/usr/src/speakup.tar.bz2 \
- -C debian/tmp modules
-
binary-install/speakup-doc::
dh_installdocs
-configure/$(PKG_kernel_src)::
- #Replace important strings
- for i in dkms.conf \
- $(PKG_kernel_src).install; do \
- sed -e "s|#VERSION#|$(VERSION)|" \
- debian/$$i.in > debian/$$i; \
- done
-
clean::
- rm -f debian/dkms.conf \
- debian/$(PKG_kernel_src).install
- rm -Rf $(CURDIR)/$(PKG_kernel_src)
rm -f stamp-patch
reverted:
--- speakup-3.1.5.dfsg.1/debian/speakup.postinst
+++ speakup-3.1.5.dfsg.1.orig/debian/speakup.postinst
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-# Copyright (C) 2002-2005 Flavio Stanchina
-# Copyright (C) 2005-2006 Aric Cyr
-# Copyright (C) 2007 Mario Limonciello
-# Copyright (C) 2009 Alberto Milone
-# Copyright (C) 2010 Luke Yelavich
-
-CVERSION=`dpkg-query -W -f='${Version}' speakup | awk -F "-" '{print $1}' | cut -d\: -f2`
-PACKAGE_NAME=speakup
-#DEBHELPER#
-
-case "$1" in
- configure)
- # Build the kernel module
- /usr/lib/dkms/common.postinst $PACKAGE_NAME $CVERSION /usr/share/$PACKAGE_NAME "" $2 || exit $?
- ;;
-esac
-
-#DEBHELPER#
reverted:
--- speakup-3.1.5.dfsg.1/debian/speakup.prerm
+++ speakup-3.1.5.dfsg.1.orig/debian/speakup.prerm
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-# Copyright (C) 2002-2005 Flavio Stanchina
-# Copyright (C) 2005-2006 Aric Cyr
-# Copyright (C) 2007-2008 Mario Limonciello
-# Copyright (C) 2009 Alberto Milone
-# Copyright (C) 2010 Luke Yelavich
-
-#DEBHELPER#
-
-CVERSION=`dpkg-query -W -f='${Version}' speakup | awk -F "-" '{print $1}' | cut -d\: -f2`
-case "$1" in
- remove|upgrade)
- echo "Removing all DKMS Modules"
- dkms remove -m speakup -v $CVERSION --all > /dev/null
- echo "Done."
- ;;
-esac
-
-#DEBHELPER#
Attachment:
signature.asc
Description: This is a digitally signed message part