diff -Nru myunity-3.1.5/debian/changelog myunity-3.1.5/debian/changelog --- myunity-3.1.5/debian/changelog 2012-08-12 11:45:26.000000000 +0200 +++ myunity-3.1.5/debian/changelog 2012-09-24 15:02:20.000000000 +0200 @@ -1,3 +1,17 @@ +myunity (3.1.5-0ubuntu1~ubuntu12.04.2) precise-backports; urgency=low + + * Added debian/patches/fix-distrib-release (LP: #999771). + Fix the way Uversion variable is read, to allow reordering of + /etc/lsb-release + * Added debian/patches/fix-unity-2d-check (LP: #959825) + Fix the check to see if Unity is running in 2D or 3D, to take into + account several users. + * Added debian/patches/fix-check-process (LP: #986667) + Fix the check for MyUnity already running to only take into account + the command name and not the parameters. + + -- Margarita Manterola Fri, 21 Sep 2012 14:01:40 +0200 + myunity (3.1.5-0ubuntu1~ubuntu12.04.1) precise-backports; urgency=low * No-change backport to precise (LP: #1023894) diff -Nru myunity-3.1.5/debian/patches/fix-check-process myunity-3.1.5/debian/patches/fix-check-process --- myunity-3.1.5/debian/patches/fix-check-process 1970-01-01 01:00:00.000000000 +0100 +++ myunity-3.1.5/debian/patches/fix-check-process 2012-09-24 15:01:11.000000000 +0200 @@ -0,0 +1,13 @@ +Index: myunity-3.1.5/Main.module +=================================================================== +--- myunity-3.1.5.orig/Main.module 2012-09-24 15:01:00.838792004 +0200 ++++ myunity-3.1.5/Main.module 2012-09-24 15:01:08.208888764 +0200 +@@ -52,7 +52,7 @@ + + PUBLIC SUB CheckProcess() + DIM verify AS String +-SHELL "ps aux | grep myunity" & " | grep -wv grep | wc -l" TO verify ++SHELL "ps xo comm | grep myunity" & " | grep -wv grep | wc -l" TO verify + verify = Replace$(verify, "\n", "") + IF Val(verify) > 1 THEN QUIT + END diff -Nru myunity-3.1.5/debian/patches/fix-distrib-release myunity-3.1.5/debian/patches/fix-distrib-release --- myunity-3.1.5/debian/patches/fix-distrib-release 1970-01-01 01:00:00.000000000 +0100 +++ myunity-3.1.5/debian/patches/fix-distrib-release 2012-09-24 15:00:55.000000000 +0200 @@ -0,0 +1,15 @@ +Index: myunity-3.1.5/Main.module +=================================================================== +--- myunity-3.1.5.orig/Main.module 2012-06-30 21:35:15.000000000 +0200 ++++ myunity-3.1.5/Main.module 2012-09-24 15:00:52.918688146 +0200 +@@ -60,9 +60,7 @@ + + PUBLIC SUB Version() + DIM Tmp_split AS String[] +- SHELL "cat /etc/*release" TO Uversion +- Tmp_split = Split(Uversion, " \n") +- Uversion = Right$(Tmp_split[1], 5) ++ SHELL ". /etc/lsb-release; echo -n $DISTRIB_RELEASE" TO Uversion + + SHELL "ps -e | grep unity-2d" TO Usession + IF Usession THEN diff -Nru myunity-3.1.5/debian/patches/fix-unity-2d-check myunity-3.1.5/debian/patches/fix-unity-2d-check --- myunity-3.1.5/debian/patches/fix-unity-2d-check 1970-01-01 01:00:00.000000000 +0100 +++ myunity-3.1.5/debian/patches/fix-unity-2d-check 2012-09-24 15:01:06.000000000 +0200 @@ -0,0 +1,13 @@ +Index: myunity-3.1.5/Main.module +=================================================================== +--- myunity-3.1.5.orig/Main.module 2012-09-24 15:00:52.918688146 +0200 ++++ myunity-3.1.5/Main.module 2012-09-24 15:01:00.838792004 +0200 +@@ -62,7 +62,7 @@ + DIM Tmp_split AS String[] + SHELL ". /etc/lsb-release; echo -n $DISTRIB_RELEASE" TO Uversion + +- SHELL "ps -e | grep unity-2d" TO Usession ++ SHELL "ps x | grep -v grep | grep unity-2d" TO Usession + IF Usession THEN + Usession = "2D" + FMessage.SimpleMessage(("Your Ubuntu") & " " & Main.Uversion & " " & ("is running in 2D mode.\nMany features will not be available."), "MyLogo_small.png", "dialog-info.png", "Close") diff -Nru myunity-3.1.5/debian/patches/series myunity-3.1.5/debian/patches/series --- myunity-3.1.5/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ myunity-3.1.5/debian/patches/series 2012-09-24 15:02:04.000000000 +0200 @@ -0,0 +1,3 @@ +fix-distrib-release +fix-unity-2d-check +fix-check-process