Your message dated Sat, 23 Mar 2013 18:47:10 +0000
with message-id <1364064430.24071.17.ca...@jacala.jungle.funky-badger.org>
and subject line Re: Bug#703788: unblock: scratch/1.4.0.6~dfsg1-4
has caused the Debian Bug report #703788,
regarding unblock: scratch/1.4.0.6~dfsg1-4
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
703788: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703788
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package scratch
Closes: #703141
unblock scratch/1.4.0.6~dfsg1-4
Regards,
Dmitrijs.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJRTfELAAoJEIh7YGGLPBauwkwP/0RzNNKDmcDgT+FQENJk03Z9
0V6D6yLWXNSRCdtTPFgv3YTTQ7CUAsV5R++4HEFPNaXem8mS9lgR/7pMEHWVYjpo
Urg3s+4Fmjqfwk05e+Q0hmxDMlscUH6xaG5kyIAC1XEuEDa8BnrAThas+oUI08XW
IlHZMqHIA/BeAFPChWMjBWw8skTiO4ze0wDE7UXE61qfuPXiSQMYdGwL46nPMnzn
E/qUWjZRn1kpY8CrcUcFSW/M7EW0DIjlrKkZqIpgpokM5yEucQ7bTzyNhiD+2hHM
Rmg+veK4YPVYFSBFhQWDeQTvpDLaCuUhK6/zIhd8Ojjp+roj5QEZiWa4kE7lFBVx
1dC7pOwZpbeOsH5UvfFL4zN6FpLSGNeyGu8zyoyCEKoGhVLBNXPjhRStr5LKx1JL
AEYGQMIAkkh+ZqtpgVeM4ANdbjVmJLc8NYegM0VFFrnfpaHVG/p6gHrIHvwHEeL7
UFkl5JdvWqXk6WWgOlTYQw6iaVmL2r+piqxFURbe69QfCXugSIxpi2jRU3bfhocT
XpjAFOLTTdGedKaAt/cwDRnlxFP6QqfTKQhc+8exNct7vG19UHHc3bOTdg2TdM2V
ldMVwRMlRae3+24cHIhU2LAu2YO92GnVIYcSsYMf/Xbt7SEby3g4OqIO6bXEuCmN
5b3gJgC6XgUuoPpZck9j
=zDw8
-----END PGP SIGNATURE-----
diff -Nru scratch-1.4.0.6~dfsg1/debian/application-registry/scratch.applications scratch-1.4.0.6~dfsg1/debian/application-registry/scratch.applications
--- scratch-1.4.0.6~dfsg1/debian/application-registry/scratch.applications 1970-01-01 01:00:00.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/application-registry/scratch.applications 2013-03-21 09:19:28.000000000 +0000
@@ -0,0 +1,7 @@
+scratch
+ command=scratch
+ name=Scratch Application
+ can_open_multiple_files=false
+ expects_uris=false
+ requires_terminal=false
+ mime_types=application/x-scratch-project
diff -Nru scratch-1.4.0.6~dfsg1/debian/bin/scratch scratch-1.4.0.6~dfsg1/debian/bin/scratch
--- scratch-1.4.0.6~dfsg1/debian/bin/scratch 2012-07-04 23:00:04.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/bin/scratch 2013-03-15 01:17:34.000000000 +0000
@@ -7,7 +7,7 @@
VM_VERSION=`find /usr/lib/squeak/ -name "squeakvm" -type f|cut -f5 -d"/"`
SQ_DIR=/usr/lib/squeak/$VM_VERSION
VM="$SQ_DIR/squeakvm"
-VMOPTIONS="-encoding UTF-8 -vm-display-x11 -xshm -plugins /usr/lib/scratch/plugins/:$SQ_DIR/"
+VMOPTIONS="-encoding UTF-8 -vm-display-x11 -plugins /usr/lib/scratch/plugins/:$SQ_DIR/"
IMAGE="/usr/share/scratch/Scratch.image"
IMOPTIONS=""
DOCUMENT=""
@@ -25,7 +25,7 @@
usage()
{
- echo "Usage: scratch [--param value] [-vmopt value] [arg value]"
+ echo "Usage: scratch [--help] [--param value] [-vmopt value] [arg value]"
echo " where --param is --vm, --image, or --document;"
echo " -vmopt is an option passed to the Squeak VM;"
echo " and args are passed to the Squeak image."
@@ -33,6 +33,10 @@
if [ $# -eq 1 ] ; then
case "$1" in
+ --help)
+ usage
+ exit
+ ;;
/*) DOCUMENT="$1"
;;
*) DOCUMENT="$PWD/$1"
@@ -94,12 +98,9 @@
# make Compose input methods work
[ -z "$LC_ALL" ] && export LC_ALL="$LANG"
-# if pulseaudio is running, fall back to OSS
+# if pulseaudio is running, use it.
if pulseaudio --check 2>/dev/null ; then
- VMOPTIONS="$VMOPTIONS -vm-sound-oss"
- if padsp true 2>/dev/null ; then
- WRAPPER=padsp
- fi
+ VMOPTIONS="$VMOPTIONS -vm-sound-pulse"
fi
# VM, Image, and Document are non-optional
diff -Nru scratch-1.4.0.6~dfsg1/debian/changelog scratch-1.4.0.6~dfsg1/debian/changelog
--- scratch-1.4.0.6~dfsg1/debian/changelog 2012-07-13 09:18:57.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/changelog 2013-03-21 19:00:58.000000000 +0000
@@ -1,3 +1,24 @@
+scratch (1.4.0.6~dfsg1-4) unstable; urgency=low
+
+ * Removed dependency from hicolor-icon-theme. Closes: #703141
+ * Added proper support for MIME
+ * Removed obsolete postinst/postrm scripts
+
+ -- Miriam Ruiz <mir...@debian.org> Thu, 21 Mar 2013 09:10:03 +0100
+
+scratch (1.4.0.6~dfsg1-3) unstable; urgency=low
+
+ [ Miriam Ruiz ]
+ * Added support for help in starting script. Thanks to Alec Clews.
+ * Changed my email to mir...@debian.org
+
+ [ Amos Blanton ]
+ * Prefer pulse plugin if pulse is present, because pulse ALSA emulation
+ fails when user records sounds.
+ * Remove -xshm switch to squeakvm to prevent Ubuntu Bug 1025013.
+
+ -- Miriam Ruiz <mir...@debian.org> Fri, 15 Mar 2013 02:20:01 +0100
+
scratch (1.4.0.6~dfsg1-2) unstable; urgency=low
* Added SVN links to debian/control
diff -Nru scratch-1.4.0.6~dfsg1/debian/control scratch-1.4.0.6~dfsg1/debian/control
--- scratch-1.4.0.6~dfsg1/debian/control 2012-07-13 09:17:10.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/control 2013-03-21 08:16:05.000000000 +0000
@@ -1,7 +1,7 @@
Source: scratch
Section: education
Priority: optional
-Maintainer: Miriam Ruiz <little_m...@yahoo.es>
+Maintainer: Miriam Ruiz <mir...@debian.org>
Standards-Version: 3.9.3
Build-Depends: debhelper (>= 7)
Homepage: http://scratch.mit.edu
@@ -13,7 +13,7 @@
Depends: squeak-vm, squeak-plugins-scratch, libgtk2.0-bin, shared-mime-info,
${misc:Depends}
Suggests: pulseaudio (>= 1.0.9)
-Description: easy to use programming environment for ages 8 and up - data
+Description: easy to use programming environment for ages 8 and up
Scratch is an easy, interactive, collaborative programming
environment designed for creation of interactive stories, animations,
games, music, and art -- and sharing these on the web.
diff -Nru scratch-1.4.0.6~dfsg1/debian/copyright scratch-1.4.0.6~dfsg1/debian/copyright
--- scratch-1.4.0.6~dfsg1/debian/copyright 2012-06-05 12:09:48.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/copyright 2013-03-15 01:21:53.000000000 +0000
@@ -2,7 +2,7 @@
Upstream-Name: scratch
Upstream-Contact: Amos Blanton <a...@scratch.mit.edu>
Source: http://download.scratch.mit.edu/scratch-1.4.0.6.src.tar.gz
-Debianized-By: Miriam Ruiz <little_m...@yahoo.es>
+Debianized-By: Miriam Ruiz <mir...@debian.org>
Files: *
Copyright: Copyright (c) 2011 Massachusetts Institute of Technology
@@ -25,7 +25,7 @@
License: CC-BY-SA-3.0
Files: debian/*
-Copyright: Copyright (C) 2011, Miriam Ruiz <little_m...@yahoo.es>
+Copyright: Copyright (C) 2011-2013, Miriam Ruiz <mir...@debian.org>
License: MIT
License: GPL-2
diff -Nru scratch-1.4.0.6~dfsg1/debian/mime-info/scratch.keys scratch-1.4.0.6~dfsg1/debian/mime-info/scratch.keys
--- scratch-1.4.0.6~dfsg1/debian/mime-info/scratch.keys 1970-01-01 01:00:00.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/mime-info/scratch.keys 2013-03-21 10:32:47.000000000 +0000
@@ -0,0 +1,8 @@
+application/x-scratch-project
+ description: Scratch Application
+ [es]description: Aplicación de Scratch
+ icon_filename: scratch.png
+ default_action_type=application
+ short_list_application_ids_for_novice_user_level=scratch
+ short_list_application_ids_for_intermediate_user_level=scratch
+ short_list_application_ids_for_advanced_user_level=scratch
diff -Nru scratch-1.4.0.6~dfsg1/debian/mime-info/scratch.mime scratch-1.4.0.6~dfsg1/debian/mime-info/scratch.mime
--- scratch-1.4.0.6~dfsg1/debian/mime-info/scratch.mime 1970-01-01 01:00:00.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/mime-info/scratch.mime 2013-03-21 09:20:03.000000000 +0000
@@ -0,0 +1,2 @@
+application/x-scratch-project
+ ext: scratch
diff -Nru scratch-1.4.0.6~dfsg1/debian/mimelnk/x-scratch-project.desktop.desktop scratch-1.4.0.6~dfsg1/debian/mimelnk/x-scratch-project.desktop.desktop
--- scratch-1.4.0.6~dfsg1/debian/mimelnk/x-scratch-project.desktop.desktop 1970-01-01 01:00:00.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/mimelnk/x-scratch-project.desktop.desktop 2013-03-21 10:54:39.000000000 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=MimeType
+MimeType=application/x-scratch-project
+Comment=Scratch Application
+Comment[es]=Aplicación de Scratch
+Icon=scratch.png
+Patterns=*.mime-example;
+
diff -Nru scratch-1.4.0.6~dfsg1/debian/postinst scratch-1.4.0.6~dfsg1/debian/postinst
--- scratch-1.4.0.6~dfsg1/debian/postinst 2011-03-13 21:13:27.000000000 +0000
+++ scratch-1.4.0.6~dfsg1/debian/postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-#!/bin/sh -e
-DEFAULTS=/etc/gnome/defaults.list
-if [ -f $DEFAULTS ]; then
- chmod 666 $DEFAULTS
- echo "application/x-scratch-project=scratch.desktop" >> $DEFAULTS
- chmod 644 $DEFAULTS
- gtk-update-icon-cache -qf /usr/share/icons/hicolor
-fi
-update-mime-database /usr/share/mime
-
-# for freedeskoptop compatible env's
-if [ -x update-desktop-database ]; then
- update-desktop-database
-fi
-# for KDE
-if [ -x kbuildsycoca ]; then
- kbuildsycoca
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
diff -Nru scratch-1.4.0.6~dfsg1/debian/postrm scratch-1.4.0.6~dfsg1/debian/postrm
--- scratch-1.4.0.6~dfsg1/debian/postrm 2011-03-13 21:13:27.000000000 +0000
+++ scratch-1.4.0.6~dfsg1/debian/postrm 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-DEFAULTS=/etc/gnome/defaults.list
-if [ -f $DEFAULTS ]; then
- cat $DEFAULTS | sed -e '/application\/x\-scratch\-project\=scratch\.desktop/d' > ./defaults.list
- mv ./defaults.list $DEFAULTS
- gtk-update-icon-cache -qf /usr/share/icons/hicolor
-fi
-update-mime-database /usr/share/mime
-
-# for freedeskoptop compatible env's
-if [ -x update-desktop-database ]; then
- update-desktop-database
-fi
-# for KDE
-if [ -x kbuildsycoca ]; then
- kbuildsycoca
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
diff -Nru scratch-1.4.0.6~dfsg1/debian/rules scratch-1.4.0.6~dfsg1/debian/rules
--- scratch-1.4.0.6~dfsg1/debian/rules 2012-06-05 12:08:19.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/rules 2013-03-21 11:00:14.000000000 +0000
@@ -42,7 +42,8 @@
dh_installdocs -i
dh_installman -i
dh_install -i
- dh_compress -i --exclude=.pdf
+ dh_installmime -i
+ dh_compress -i --exclude=.pdf --exclude=.sb
dh_fixperms -i
[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -i
dh_installdeb -i
diff -Nru scratch-1.4.0.6~dfsg1/debian/scratch.install scratch-1.4.0.6~dfsg1/debian/scratch.install
--- scratch-1.4.0.6~dfsg1/debian/scratch.install 2011-03-18 16:13:32.000000000 +0000
+++ scratch-1.4.0.6~dfsg1/debian/scratch.install 2013-03-21 11:01:02.000000000 +0000
@@ -12,3 +12,9 @@
src/icons/48x48/gnome-mime-application-x-scratch-project.png /usr/share/icons/hicolor/48x48/mimetypes/
src/icons/128x128/gnome-mime-application-x-scratch-project.png /usr/share/icons/hicolor/128x128/mimetypes/
src/scratch.xml /usr/share/mime/packages/
+
+debian/mime-info/*.mime usr/share/mime-info/
+debian/mime-info/*.keys usr/share/mime-info/
+debian/mimelnk/*.desktop usr/share/mimelnk/application/
+debian/application-registry/*.applications usr/share/application-registry/
+
diff -Nru scratch-1.4.0.6~dfsg1/debian/scratch.mime scratch-1.4.0.6~dfsg1/debian/scratch.mime
--- scratch-1.4.0.6~dfsg1/debian/scratch.mime 1970-01-01 01:00:00.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/scratch.mime 2013-03-21 10:58:42.000000000 +0000
@@ -0,0 +1 @@
+application/x-scratch-project; scratch %s; test=test "$DISPLAY" != ""; description=Scratch Application; nametemplate=%s.sb; priority=6
diff -Nru scratch-1.4.0.6~dfsg1/debian/scratch.sharedmimeinfo scratch-1.4.0.6~dfsg1/debian/scratch.sharedmimeinfo
--- scratch-1.4.0.6~dfsg1/debian/scratch.sharedmimeinfo 1970-01-01 01:00:00.000000000 +0100
+++ scratch-1.4.0.6~dfsg1/debian/scratch.sharedmimeinfo 2013-03-21 10:57:45.000000000 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info";>
+ <mime-type type="application/x-scratch-project">
+ <comment>Scratch Application</comment>
+ <comment xml:lang="es">Aplicación de Scratch</comment>
+ <glob pattern="*.sb"/>
+ </mime-type>
+</mime-info>
--- End Message ---
--- Begin Message ---
On Sat, 2013-03-23 at 18:14 +0000, Dmitrijs Ledkovs wrote:
> Please unblock package scratch
>
> Closes: #703141
Already done, although I'm not hugely happy about some of the changes
tbh.
Regards,
Adam
--- End Message ---
