tags 455021 + patch
tags 489619 + patch
thanks

Hi,
I've prepared an NMU for this problem, and attached to this mail there
is the patch that I've used to solve the problem...

Best Regards,
francesco

dget http://mentors.debian.net/debian/pool/main/k/kino/kino_1.3.0-2.1.dsc


diff -Nur debian-old/changelog debian-new/changelog
--- debian-old/changelog	2008-07-20 12:44:57.000000000 +0200
+++ debian-new/changelog	2008-07-20 10:55:50.000000000 +0200
@@ -1,3 +1,13 @@
+kino (1.3.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * added debian/kino.preinst to "forgotten" files in /etc/hotplug/usb/.
+    (Closes: #455021)
+  * added debian/patches/20_fix_bashism.dpatch to fix bashism.
+    (Closes: #489619)
+
+ -- Francesco Namuri <[EMAIL PROTECTED]>  Sun, 20 Jul 2008 10:54:59 +0200
+
 kino (1.3.0-2) unstable; urgency=low
 
   * Fix build-depends on libgl, use libgl1-mesa-dev | libgl-dev
diff -Nur debian-old/kino.preinst debian-new/kino.preinst
--- debian-old/kino.preinst	1970-01-01 01:00:00.000000000 +0100
+++ debian-new/kino.preinst	2008-07-19 17:52:05.000000000 +0200
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+cleanup_hotplug() {
+        [ -e /etc/hotplug/usb/kino-jogshuttle ] && \
+                rm /etc/hotplug/usb/kino-jogshuttle
+        [ -e /etc/hotplug/usb/kino.usermap ] && \
+                rm /etc/hotplug/usb/kino.usermap
+}
+
+case "$1" in
+	upgrade)
+	cleanup_hotplug
+	;;
+
+	install|abort-upgrade)
+	;;
+
+	*)
+	echo "$0 called with unknown argument '$1'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+exit 0
diff -Nur debian-old/patches/00list debian-new/patches/00list
--- debian-old/patches/00list	2008-07-20 12:44:57.000000000 +0200
+++ debian-new/patches/00list	2008-07-20 11:12:49.000000000 +0200
@@ -1,2 +1,3 @@
 10_playlist_algorithm
+20_fix_bashism.dpatch
 80_move_doc
diff -Nur debian-old/patches/20_fix_bashism.dpatch debian-new/patches/20_fix_bashism.dpatch
--- debian-old/patches/20_fix_bashism.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ debian-new/patches/20_fix_bashism.dpatch	2008-07-20 10:54:45.000000000 +0200
@@ -0,0 +1,120 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fix_bashism.dpatch by Francesco Namuri <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: this patch fixes bashism found in the scripts's program.
+
[EMAIL PROTECTED]@
+diff -urNad kino-1.3.0~/scripts/help.sh kino-1.3.0/scripts/help.sh
+--- kino-1.3.0~/scripts/help.sh	2007-03-06 07:19:36.000000000 +0100
++++ kino-1.3.0/scripts/help.sh	2008-07-19 18:43:43.000000000 +0200
+@@ -9,13 +9,13 @@
+ 
+ # detect user agents
+ GNOME_BROWSER=`gconftool-2 --get /desktop/gnome/url-handlers/http/command | sed s/\"*%s\"*//`
+-which konqueror &> /dev/null
++which konqueror > /dev/null 2>&1
+ [ $? = 0 ] && KONQUEROR=konqueror
+-which firefox &> /dev/null
++which firefox > /dev/null 2>&1
+ [ $? = 0 ] && FIREFOX=firefox
+-which mozilla &> /dev/null
++which mozilla > /dev/null 2>&1
+ [ $? = 0 ] && MOZILLA=mozilla
+-which yelp &> /dev/null
++which yelp > /dev/null 2>&1
+ [ $? = 0 ] && YELP=yelp
+ 
+ # convert index to kino for docbook
+diff -urNad kino-1.3.0~/scripts/publish/bliptv_frame.sh kino-1.3.0/scripts/publish/bliptv_frame.sh
+--- kino-1.3.0~/scripts/publish/bliptv_frame.sh	2007-03-09 06:52:20.000000000 +0100
++++ kino-1.3.0/scripts/publish/bliptv_frame.sh	2008-07-20 10:53:01.000000000 +0200
+@@ -35,9 +35,11 @@
+ [ -z "$title" ] && title="Untitled"
+ 
+ echo Login to blip.tv
+-read -p "  Username: " username
++echo "Username: "
++read username
+ stty -echo
+-read -p "  Password: " password
++echo "Password: "
++read password
+ echo
+ stty echo
+ 
+@@ -60,4 +62,4 @@
+ 	echo $result
+ 	echo 'Close the window when you are finished reading this error.'
+ fi
+-read
++read nop
+diff -urNad kino-1.3.0~/scripts/publish/bliptv_project.sh kino-1.3.0/scripts/publish/bliptv_project.sh
+--- kino-1.3.0~/scripts/publish/bliptv_project.sh	2008-02-25 00:20:44.000000000 +0100
++++ kino-1.3.0/scripts/publish/bliptv_project.sh	2008-07-20 10:50:59.000000000 +0200
+@@ -58,13 +58,15 @@
+ ogg_file="${path}/${base}.ogg"
+ 
+ echo Login to blip.tv
+-read -p "  Username: " username
++echo "Username: "
++read username
+ stty -echo
+-read -p "  Password: " password
++echo "Password: "
++read password
+ echo
+ stty echo
+-echo
+-read -p "Do you want higher quality (slower and bigger to convert & upload)? [y/N] " quality
++echo "Do you want higher quality (slower and bigger to convert & upload)? [y/N] "
++read quality
+ 
+ title=$(getXmlAttributeValue 'title' "$project_file")
+ [ -z "$title" ] && title="Untitled"
+@@ -165,4 +167,4 @@
+ 	echo $result
+ 	echo 'Close the window when you are finished reading this error.'
+ fi
+-read
++read nop
+diff -urNad kino-1.3.0~/scripts/publish/echo.sh kino-1.3.0/scripts/publish/echo.sh
+--- kino-1.3.0~/scripts/publish/echo.sh	2007-03-06 07:17:37.000000000 +0100
++++ kino-1.3.0/scripts/publish/echo.sh	2008-07-19 20:31:51.000000000 +0200
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+ # A Kino publishing helper script that is used to display a message in a terminal window.
+ echo $@
+-read
++read nop
+ 
+diff -urNad kino-1.3.0~/scripts/publish/frame.sh kino-1.3.0/scripts/publish/frame.sh
+--- kino-1.3.0~/scripts/publish/frame.sh	2008-02-25 00:20:44.000000000 +0100
++++ kino-1.3.0/scripts/publish/frame.sh	2008-07-19 20:29:07.000000000 +0200
+@@ -7,9 +7,9 @@
+ project_title="$4"
+ 
+ if [ -n "$KINO_HOME" ] && [ -f "$KINO_HOME"/publish/frame.sh ]; then
+-	. "$KINO_HOME"/publish/frame.sh "$frame_file" "$project_id" "$scene_title" "$project_title"
++	."$KINO_HOME"/publish/frame.sh "$frame_file" "$project_id" "$scene_title" "$project_title"
+ elif [ -f "$HOME"/kino/publish/frame.sh ]; then
+-	. "$HOME"/kino/publish/frame.sh "$frame_file" "$project_id" "$scene_title" "$project_title"
++	."$HOME"/kino/publish/frame.sh "$frame_file" "$project_id" "$scene_title" "$project_title"
+ else
+ 	# detect terminal
+ 	GNOME_TERM=`gconftool-2 --get /desktop/gnome/applications/terminal/exec`
+diff -urNad kino-1.3.0~/scripts/publish/project.sh kino-1.3.0/scripts/publish/project.sh
+--- kino-1.3.0~/scripts/publish/project.sh	2008-02-25 00:20:44.000000000 +0100
++++ kino-1.3.0/scripts/publish/project.sh	2008-07-19 20:29:41.000000000 +0200
+@@ -15,9 +15,9 @@
+ 
+ 
+ if [ -n "$KINO_HOME" ] && [ -f "$KINO_HOME"/publish/project.sh ]; then
+-	. "$KINO_HOME"/publish/project.sh "$project_file" "$project_id" "$project_title"
++	."$KINO_HOME"/publish/project.sh "$project_file" "$project_id" "$project_title"
+ elif [ -f "$HOME"/kino/publish/project.sh ]; then
+-	. "$HOME"/kino/publish/project.sh "$project_file" "$project_id" "$project_title"
++	."$HOME"/kino/publish/project.sh "$project_file" "$project_id" "$project_title"
+ elif [ -n "$KINO_PUBLISH_PROJECT" ]; then
+ 	"$KINO_PUBLISH_PROJECT" "$project_file" "$project_id" "$project_title"
+ else

Attachment: signature.asc
Description: Questa รจ una parte del messaggio firmata digitalmente

Reply via email to