Please sponsor om upload

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 affects distros/ubuntu/om
 subscribe ubuntu-universe-sponsors

diff -u om-0.2.0/debian/om.install om-0.2.0/debian/om.install
- --- om-0.2.0/debian/om.install
+++ om-0.2.0/debian/om.install
@@ -2,0 +3,2 @@
+debian/launchomsynth.desktop /usr/share/applications/
+debian/launchomsynth /usr/bin/
diff -u om-0.2.0/debian/changelog om-0.2.0/debian/changelog
- --- om-0.2.0/debian/changelog
+++ om-0.2.0/debian/changelog
@@ -1,3 +1,10 @@
+om (0.2.0-2ubuntu1) unstable; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - Add a 'launchomsynth' wrapper
+
+ -- Timo Aaltonen <email address hidden> Thu, 21 Dec 2006 12:36:30 +0200
+
 om (0.2.0-2) unstable; urgency=low

   [Joost Yervante Damad]
diff -u om-0.2.0/config.guess om-0.2.0/config.guess
- --- om-0.2.0/config.guess
+++ om-0.2.0/config.guess
@@ -3,7 +3,7 @@
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

- -timestamp='2006-02-23'
+timestamp='2005-08-03'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -206,9 +206,6 @@
     *:ekkoBSD:*:*)
  echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
  exit ;;
- - *:SolidBSD:*:*)
- - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- - exit ;;
     macppc:MirBSD:*:*)
  echo powerppc-unknown-mirbsd${UNAME_RELEASE}
  exit ;;
@@ -767,12 +764,7 @@
  echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  exit ;;
     *:FreeBSD:*:*)
- - case ${UNAME_MACHINE} in
- - pc98)
- - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- - *)
- - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- - esac
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  exit ;;
     i*:CYGWIN*:*)
  echo ${UNAME_MACHINE}-pc-cygwin
@@ -780,9 +772,6 @@
     i*:MINGW*:*)
  echo ${UNAME_MACHINE}-pc-mingw32
  exit ;;
- - i*:MSYS_NT-*:*:*)
- - echo ${UNAME_MACHINE}-pc-mingw32
- - exit ;;
     i*:windows32*:*)
      # uname -m includes "-pc" on this system.
      echo ${UNAME_MACHINE}-mingw32
@@ -790,11 +779,8 @@
     i*:PW*:*)
  echo ${UNAME_MACHINE}-pc-pw32
  exit ;;
- - x86:Interix*:[345]*)
- - echo i586-pc-interix${UNAME_RELEASE}
- - exit ;;
- - EM64T:Interix*:[345]*)
- - echo x86_64-unknown-interix${UNAME_RELEASE}
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
  exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
  echo i${UNAME_MACHINE}-pc-mks
@@ -865,11 +851,7 @@
  #endif
  #endif
 EOF
- - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- - /^CPU/{
- - s: ::g
- - p
- - }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
  test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  ;;
     mips64:Linux:*:*)
@@ -888,11 +870,7 @@
  #endif
  #endif
 EOF
- - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- - /^CPU/{
- - s: ::g
- - p
- - }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
  test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  ;;
     or32:Linux:*:*)
@@ -941,9 +919,6 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
  echo ${UNAME_MACHINE}-unknown-linux-gnu
  exit ;;
- - vax:Linux:*:*)
- - echo ${UNAME_MACHINE}-dec-linux-gnu
- - exit ;;
     x86_64:Linux:*:*)
  echo x86_64-unknown-linux-gnu
  exit ;;
@@ -989,7 +964,7 @@
  LIBC=gnulibc1
  # endif
  #else
- - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+ #ifdef __INTEL_COMPILER
  LIBC=gnu
  #else
  LIBC=gnuaout
@@ -999,11 +974,7 @@
  LIBC=dietlibc
  #endif
 EOF
- - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- - /^LIBC/{
- - s: ::g
- - p
- - }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
  test x"${LIBC}" != x && {
   echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
   exit
@@ -1214,6 +1185,7 @@
     *:Darwin:*:*)
  UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
  case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
      unknown) UNAME_PROCESSOR=powerpc ;;
  esac
  echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1292,9 +1264,6 @@
     i*86:skyos:*:*)
  echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
  exit ;;
- - i*86:rdos:*:*)
- - echo ${UNAME_MACHINE}-pc-rdos
- - exit ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
diff -u om-0.2.0/config.sub om-0.2.0/config.sub
- --- om-0.2.0/config.sub
+++ om-0.2.0/config.sub
@@ -3,7 +3,7 @@
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

- -timestamp='2006-02-23'
+timestamp='2005-07-08'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,9 +119,8 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
- - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- - storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -172,10 +171,6 @@
  -hiux*)
   os=-hiuxwe2
   ;;
- - -sco6)
- - os=-sco5v6
- - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- - ;;
  -sco5)
   os=-sco3.2v5
   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -192,10 +187,6 @@
   # Don't forget version if it is 3.2v4 or newer.
   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   ;;
- - -sco5v6*)
- - # Don't forget version if it is 3.2v4 or newer.
- - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- - ;;
  -sco*)
   os=-sco3.2v2
   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -248,7 +239,7 @@
  | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  | i370 | i860 | i960 | ia64 \
  | ip2k | iq2000 \
- - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
  | mips | mipsbe | mipseb | mipsel | mipsle \
  | mips16 \
  | mips64 | mips64el \
@@ -266,9 +257,8 @@
  | mipsisa64sr71k | mipsisa64sr71kel \
  | mipstx39 | mipstx39el \
  | mn10200 | mn10300 \
- - | mt \
+ | ms1 \
  | msp430 \
- - | nios | nios2 \
  | ns16k | ns32k \
  | or32 \
  | pdp10 | pdp11 | pj | pjl \
@@ -296,9 +286,6 @@
   ;;
  m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
   ;;
- - ms1)
- - basic_machine=mt-unknown
- - ;;

  # We use `pc' rather than `unknown'
  # because (1) that's what they normally are, and
@@ -349,9 +336,8 @@
  | mipsisa64sr71k-* | mipsisa64sr71kel-* \
  | mipstx39-* | mipstx39el-* \
  | mmix-* \
- - | mt-* \
+ | ms1-* \
  | msp430-* \
- - | nios-* | nios2-* \
  | none-* | np1-* | ns16k-* | ns32k-* \
  | orion-* \
  | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -710,9 +696,6 @@
   basic_machine=i386-pc
   os=-msdos
   ;;
- - ms1-*)
- - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- - ;;
  mvs)
   basic_machine=i370-ibm
   os=-mvs
@@ -820,12 +803,6 @@
  pc532 | pc532-*)
   basic_machine=ns32k-pc532
   ;;
- - pc98)
- - basic_machine=i386-pc
- - ;;
- - pc98-*)
- - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- - ;;
  pentium | p5 | k5 | k6 | nexgen | viac3)
   basic_machine=i586-pc
   ;;
@@ -882,10 +859,6 @@
   basic_machine=i586-unknown
   os=-pw32
   ;;
- - rdos)
- - basic_machine=i386-pc
- - os=-rdos
- - ;;
  rom68k)
   basic_machine=m68k-rom68k
   os=-coff
@@ -1201,23 +1174,21 @@
        | -aos* \
        | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
        | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- - | -openbsd* | -solidbsd* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
        | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
        | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
        | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
        | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
        | -chorusos* | -chorusrdb* \
        | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- - | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
        | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
        | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
        | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
        | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
        | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
        | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- - | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku*)
  # Remember, each alternative MUST END IN *, to match a version number.
   ;;
  -qnx*)
only in patch2:
unchanged:
- --- om-0.2.0.orig/debian/launchomsynth
+++ om-0.2.0/debian/launchomsynth
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This is a simple script to check if the om engine is running or not.
+# If the engine is running, it proceeds to start om_gtk GUI.
+# If the engine is not running, it will start it up and then proceed
+# with launching the om_gtk GUI.
+
+
+function is_om_running() {
+ ps aux | grep "om$" | grep -v grep
+}
+
+if ! is_om_running ; then
+ `which om` &
+ sleep 2
+fi
+
+if ! is_om_running ; then
+ zenity --info --title "Error" --text "Om could not be launched. Do you have JACK running?"
+else
+ `which om_gtk` &
+fi
only in patch2:
unchanged:
- --- om-0.2.0.orig/debian/README.Debian
+++ om-0.2.0/debian/README.Debian
@@ -0,0 +1,12 @@
+om for Debian
+-------------
+
+There is a wrapper script that I wrote called launchomsynth, which will
+check to see if the Om engine is running, and if it is not, it will
+start it up in the background prior to launching the GTK client. The
+.desktop launcher points to this script for ease of use.
+
+This build does not have session support due to LASH not being
+available yet on Debian or Ubuntu. LASH is the new name for LADCCA.
+
+ -- Dana Olson <email address hidden>, Sun, 19 Feb 2006 02:17:49 -0500
only in patch2:
unchanged:
- --- om-0.2.0.orig/debian/launchomsynth.desktop
+++ om-0.2.0/debian/launchomsynth.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Om Synth
+Comment=Realtime modular software synthesizer
+Exec=/usr/bin/launchomsynth
+Icon=/usr/share/om-gtk/om-icon.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;Audio

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQFFimjbCf/ckHZoKjcRAlUTAJ42HL7FIdp/QVQZxvGKUckiR/Uo0QCcCiWc
v1eN0eHroFeWjZOba+bOvxo=
=GfoZ
-----END PGP SIGNATURE-----