Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: irda-utils

irda-utils (0.9.18-15ubuntu1) cosmic; urgency=low * Merge from Debian unstable. Remaining changes: - debian/irda-utils.init, debian/irda-utils.irda-setup.init, debian/rules, debian/postinst, debian/preinst, debian/templates, debian/config: Add autoconfiguration support. - debian/rules: Pass explicit start/stop options to dh_installinit to avoid needlessly calling the script on shutdown/halt. - debian/postinst: Remove shutdown and reboot links for irda-utils init script. * Fix path of /run/irdadev. -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 14 May 2018 22:03:40 -0700

Modifications :
  1. Download patch debian/rules

    --- 0.9.18-15/debian/rules 2015-08-27 17:15:37.000000000 +0000 +++ 0.9.18-15ubuntu1/debian/rules 2017-04-12 20:43:04.000000000 +0000 @@ -120,7 +120,8 @@ binary-arch: build install # dh_installexamples # dh_installmenu # dh_installemacsen - dh_installinit + dh_installinit -- start 20 2 3 4 5 . stop 20 1 . + dh_installinit -r --no-start --name=irda-setup -- start 47 S . # dh_installcron dh_installdebconf if [ "$(DEB_BUILD_GNU_TYPE)" = "i486-linux-gnu" -o "$(DEB_BUILD_GNU_TYPE)" = "x86_64-linux-gnu" ]; then \
  2. Download patch debian/control

    --- 0.9.18-15/debian/control 2017-01-20 15:42:40.000000000 +0000 +++ 0.9.18-15ubuntu1/debian/control 2017-04-12 20:43:04.000000000 +0000 @@ -1,7 +1,8 @@ Source: irda-utils Section: utils Priority: optional -Maintainer: Debian QA Group <packages@qa.debian.org> +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org> Build-Depends: libglib2.0-dev, debhelper (>= 7) , libpci-dev Standards-Version: 3.8.1 Homepage: http://irda.sourceforge.net
  3. Download patch debian/preinst

    --- 0.9.18-15/debian/preinst 2012-03-05 18:12:42.000000000 +0000 +++ 0.9.18-15ubuntu1/debian/preinst 2017-04-12 20:43:04.000000000 +0000 @@ -107,6 +107,8 @@ if [ -f "$CONFIG" ]; then # store values from current config db_set $PACKAGE/enable $ENABLE + db_set $PACKAGE/automatic $AUTOMATIC + case "$DEVICE" in /dev/ttyS*) db_set $PACKAGE/selectdevice serial
  4. Download patch debian/irda-utils.init

    --- 0.9.18-15/debian/irda-utils.init 2012-06-04 16:31:51.000000000 +0000 +++ 0.9.18-15ubuntu1/debian/irda-utils.init 2018-05-15 05:03:40.000000000 +0000 @@ -54,6 +54,11 @@ test -x $SYSCTL || exit 0 if [ -f /etc/default/$PACKAGE ]; then . /etc/default/$PACKAGE fi +if [ "$AUTOMATIC" = "true" ] && [ -f /run/irdadev ]; then +# We discovered a device on boot. Attempt to bind to it. + ENABLE="true" + read DEVICE JUNK </run/irdadev +fi if [ "$ENABLE" = "false" ]; then log_action_begin_msg "Skipping $DESC:" "$NAME (not enabled)" log_action_end_msg 0
  5. Download patch debian/templates

    --- 0.9.18-15/debian/templates 2012-03-05 18:12:42.000000000 +0000 +++ 0.9.18-15ubuntu1/debian/templates 2017-04-12 20:43:04.000000000 +0000 @@ -58,3 +58,10 @@ _Description: Enable IrDA on system star Confirm if you want IrDA to be enabled when your system is booting. This is necessary for devices that need "irattach" to be run. Most devices need it, except for some rare FIR devices. + +Template: irda-utils/automatic +Type: boolean +Default: true +_Description: Attempt to probe for IrDA on system bootup? + Confirm if you want to attempt to autoconfigure IrDA on system startup. If + a device is found, irattach will automatically be started up.
  6. Download patch debian/irda-utils.irda-setup.init

    --- 0.9.18-15/debian/irda-utils.irda-setup.init 1970-01-01 00:00:00.000000000 +0000 +++ 0.9.18-15ubuntu1/debian/irda-utils.irda-setup.init 2018-05-15 05:03:40.000000000 +0000 @@ -0,0 +1,118 @@ +#!/bin/bash + +. /etc/default/irda-utils + +test "$AUTOMATIC" = "true" || exit 0 + +test -d /sys/bus/pnp/devices || exit 0 + +cd /sys/bus/pnp/devices + +IRDA=0 +STATEFILE=/run/irdadev + +case $1 in + start|restart|reload|force-reload) + for x in *; do + FIR="false"; + SIR="false"; + FALLBACK=true; + OPTIONS="" + for y in `cat $x/id`; do + case "$y" in + PNP0510|PNP0511) + SIR="true"; + ;; + NSC*) + FIR="nsc-ircc"; + ;; + IBM0071) + FIR="nsc-ircc"; + OPTIONS="dongle_id=0x09"; + ;; + SMC*) + FIR="smsc-ircc2"; + ;; + ALI5123) + FIR="ali-ircc"; + ;; + VIA3076) + FIR="via-ircc" + esac + done + + if [ $FIR = "false" -a $SIR = "false" ]; then + continue; + fi + + # Work out resource ranges, so we know which serial port to work with + PORTS=`grep io $x/resources | sed -e 's/io \(.*\)-.*/\1/'` + for PORT in $PORTS; do + case $PORT in + 0x3f8) + PORT="/dev/ttyS0" + break; + ;; + 0x2f8) + PORT="/dev/ttyS1" + break; + ;; + 0x3e8) + PORT="/dev/ttyS2" + break; + ;; + 0x2e8) + PORT="/dev/ttyS3" + break; + ;; + default) + PORT="UNKNOWN" + ;; + esac; + done + + if [ "$FIR" != "false" ]; then + # The BIOS doesn't always activate the device. Prod it + echo disable >$x/resources; + echo activate >$x/resources; + + UART="unknown"; + if [ "$PORT" != "UNKNOWN" ]; then + # We should attempt to disable the UART. However, we need to store + # it - there's a chance that things could still go horribly wrong + UART=`setserial $PORT | sed 's/.*UART: \(.*\), Port.*/\1/'` + setserial $PORT uart none + fi + modprobe $FIR $OPTIONS; + if [ "$?" = "0" ]; then + echo "irda$IRDA fir" >$STATEFILE; + let "IRDA=$IRDA+1"; + continue; + else + # Try to recover + if [ "$UART" != "undefined" ]; then + setserial $PORT uart $UART; + fi + fi + fi + + if [ "$SIR" = "true" -o "$FIR" != "false" ]; then + # We'll only have got here if the FIR module has failed + + if [ "$PORT" != "UNKNOWN" ]; then + # The BIOS doesn't always activate the device. Prod it + echo disable >$x/resources; + echo activate >$x/resources; + + # The IRQ is not always set correctly, so try to deal with that + IRQ=`grep irq $x/resources | sed -e 's/irq \(.*\)/\1/'` + setserial $PORT irq $IRQ; + echo "$PORT sir" >$STATEFILE; + fi + fi + done + ;; + stop) + exit 0 + ;; +esac
  7. Download patch debian/postinst

    --- 0.9.18-15/debian/postinst 2012-06-04 15:44:38.000000000 +0000 +++ 0.9.18-15ubuntu1/debian/postinst 2017-04-12 20:43:04.000000000 +0000 @@ -64,6 +64,10 @@ write_config_default () { # to 'true'. ENABLE= +# Set this to 'false' if you do not want automatic discovery of irda devices. +# If 'true', it will automatically start irattach if devices are found. +AUTOMATIC= + # Set discovery mode which usually is a good idea for finding other devices. # If set 'true' or 'false' irattach and sysctl are used to enable and disable # discovery mode. By default discover mode is disabled. @@ -98,6 +102,8 @@ EOF # read config db_get $PACKAGE/enable ENABLE="$RET" + db_get $PACKAGE/automatic + AUTOMATIC="$RET" db_get $PACKAGE/discovery DISCOVERY="$RET" if [ "$DEVICE" = "serial" ]; then @@ -116,6 +122,7 @@ EOF # re-insert values deleted in $CONFIG but existant in debconf test -z "$ENABLE" || grep -Eq '^ *ENABLE=' $CONFIG || echo "ENABLE=" >> $CONFIG + test -z "$AUTOMATIC" || grep -Eq '^ *AUTOMATIC=' $CONFIG || echo "AUTOMATIC=" >> $CONFIG test -z "$DISCOVERY" || grep -Eq '^ *DISCOVERY=' $CONFIG || echo "DISCOVERY=" >> $CONFIG test -z "$DEVICE" || grep -Eq '^ *DEVICE=' $CONFIG || echo "DEVICE=" >> $CONFIG test -z "$DONGLE" || grep -Eq '^ *DONGLE=' $CONFIG || echo "DONGLE=" >> $CONFIG @@ -125,6 +132,7 @@ EOF # all comments and other variables defined by the admin sed -e " s#^ *ENABLE=.*#ENABLE=\"$ENABLE\"# + s#^ *AUTOMATIC=.*#AUTOMATIC=\"$AUTOMATIC\"# s#^ *DISCOVERY=.*#DISCOVERY=\"$DISCOVERY\"# s#^ *DEVICE=.*#DEVICE=\"$DEVICE\"# s#^ *DONGLE=.*#DONGLE=\"$DONGLE\"# @@ -145,6 +153,11 @@ if [ "$1" = "configure" ]; then write_config_modules write_config_default + + # Remove shutdown and reboot links; this init script does not need them. + if dpkg --compare-versions "$2" lt "0.9.16-11ubuntu2"; then + rm -f /etc/rc0.d/K20irda-utils /etc/rc6.d/K20irda-utils + fi fi #DEBHELPER#
  8. Download patch debian/config

    --- 0.9.18-15/debian/config 2012-03-05 18:12:40.000000000 +0000 +++ 0.9.18-15ubuntu1/debian/config 2017-04-12 20:43:04.000000000 +0000 @@ -15,19 +15,22 @@ db_capb backup # preinst has to retrieve the old values first. if [ ! -e "$CONFIG_OLD" ]; then STATE=1 - LASTSTATE=4 + LASTSTATE=5 while [ $STATE -gt 0 -a $STATE -le $LASTSTATE ]; do case $STATE in 1) db_input medium $PACKAGE/enable || true ;; 2) - db_input medium $PACKAGE/discovery || true + db_input medium $PACKAGE/automatic || true ;; 3) - db_input medium $PACKAGE/selectdevice || true + db_input medium $PACKAGE/discovery || true ;; 4) + db_input medium $PACKAGE/selectdevice || true + ;; + 5) db_get $PACKAGE/selectdevice if [ "$RET" = "serial" ]; then db_input medium $PACKAGE/ttydev || true
  1. irda-utils