Hello community,

here is the log from the commit of package suspend for openSUSE:Factory checked 
in at 2012-09-23 17:31:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suspend (Old)
 and      /work/SRC/openSUSE:Factory/.suspend.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "suspend", Maintainer is "hma...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/suspend/suspend.changes  2012-09-14 
12:39:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes     2012-09-23 
17:31:28.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Sep 18 16:26:27 UTC 2012 - fcro...@suse.com
+
+- Correctly handle plymouth not being installed in plymouth patch
+  (bnc#779399).
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ suspend-plymouth.patch ++++++
--- /var/tmp/diff_new_pack.Kd86lC/_old  2012-09-23 17:31:29.000000000 +0200
+++ /var/tmp/diff_new_pack.Kd86lC/_new  2012-09-23 17:31:29.000000000 +0200
@@ -1,7 +1,8 @@
-diff -urNB suspend-utils-1.0/configure.ac new/configure.ac
---- suspend-utils-1.0/configure.ac     2011-03-07 00:24:15.000000000 +0100
-+++ new/configure.ac   2012-02-16 16:47:16.909290161 +0100
-@@ -74,6 +74,12 @@
+Index: suspend-utils-1.0/configure.ac
+===================================================================
+--- suspend-utils-1.0.orig/configure.ac
++++ suspend-utils-1.0/configure.ac
+@@ -74,6 +74,12 @@ AC_ARG_ENABLE(
        ,
        [enable_fbsplash="no"]
  )
@@ -14,7 +15,7 @@
  AC_ARG_WITH(
        [devdir],
        [AC_HELP_STRING([--with-devdir=DIR], [use if --enable-create-device, 
put devices in this directory, default /dev])],
-@@ -249,6 +255,21 @@
+@@ -249,6 +255,21 @@ if test "${enable_fbsplash}" = "yes"; th
        )
  fi
  
@@ -36,7 +37,7 @@
  if test "${enable_threads}" = "yes"; then
        CONFIG_FEATURES="${CONFIG_FEATURES} threads"
        AC_DEFINE([CONFIG_THREADS], [1], [Define if threads enabled])
-@@ -301,6 +322,7 @@
+@@ -301,6 +322,7 @@ AM_CONDITIONAL([ENABLE_RESUME_STATIC], [
  AM_CONDITIONAL([ENABLE_CREATE_DEVICE], [test "${enable_create_device}" = 
"yes"])
  AM_CONDITIONAL([ENABLE_SPLASHY], [test "${enable_splashy}" = "yes"])
  AM_CONDITIONAL([ENABLE_FBSPLASH], [test "${enable_fbsplash}" = "yes"])
@@ -44,10 +45,11 @@
  AC_CONFIG_FILES([
        Makefile
        doc/Makefile
-diff -urNB suspend-utils-1.0/Makefile.am new/Makefile.am
---- suspend-utils-1.0/Makefile.am      2011-03-07 00:24:15.000000000 +0100
-+++ new/Makefile.am    2012-02-16 16:47:16.909290161 +0100
-@@ -29,6 +29,9 @@
+Index: suspend-utils-1.0/Makefile.am
+===================================================================
+--- suspend-utils-1.0.orig/Makefile.am
++++ suspend-utils-1.0/Makefile.am
+@@ -29,6 +29,9 @@ if ENABLE_DEBUG
  if ENABLE_FBSPLASH
  noinst_PROGRAMS+=fbsplash-test
  endif
@@ -57,7 +59,7 @@
  endif
  noinst_LIBRARIES=\
        libsuspend-common.a
-@@ -88,6 +91,12 @@
+@@ -88,6 +91,12 @@ AM_CFLAGS+=\
  common_s2disk_libs+=\
        ${FBSPLASH_LIBS}
  endif
@@ -70,7 +72,7 @@
  
  libsuspend_common_a_SOURCES=\
        swsusp.h suspend_ioctls.h \
-@@ -99,6 +108,7 @@
+@@ -99,6 +108,7 @@ libsuspend_common_a_SOURCES=\
        splash.h splash.c \
        splashy_funcs.h splashy_funcs.c \
        fbsplash_funcs.h fbsplash_funcs.c \
@@ -78,7 +80,7 @@
        bootsplash.h bootsplash.c \
        memalloc.h memalloc.c load.c \
        whitelist.h whitelist.csv whitelist.c \
-@@ -179,6 +189,11 @@
+@@ -179,6 +189,11 @@ whitelist.c: whitelist.csv
  clean-local:
        rm -f whitelist.c
  
@@ -90,10 +92,11 @@
  #
  # Misc functions
  #
-diff -urNB suspend-utils-1.0/plymouth_funcs.c new/plymouth_funcs.c
---- suspend-utils-1.0/plymouth_funcs.c 1970-01-01 01:00:00.000000000 +0100
-+++ new/plymouth_funcs.c       2012-02-16 17:18:06.983379699 +0100
-@@ -0,0 +1,258 @@
+Index: suspend-utils-1.0/plymouth_funcs.c
+===================================================================
+--- /dev/null
++++ suspend-utils-1.0/plymouth_funcs.c
+@@ -0,0 +1,259 @@
 +/*
 + * plymouth_funcs.c
 + *
@@ -156,7 +159,8 @@
 +              int fd = open("/dev/null", O_RDWR);
 +              dup2(fd, 2);
 +              close(fd);
-+              execl(cmd, cmd, arg, (char *) NULL);
++              if (execl(cmd, cmd, arg, (char *) NULL) == -1)
++                      exit(1);
 +      }
 +      else {
 +              int status;
@@ -352,9 +356,10 @@
 +
 +
 +#endif
-diff -urNB suspend-utils-1.0/plymouth_funcs.h new/plymouth_funcs.h
---- suspend-utils-1.0/plymouth_funcs.h 1970-01-01 01:00:00.000000000 +0100
-+++ new/plymouth_funcs.h       2012-02-16 17:18:15.332380115 +0100
+Index: suspend-utils-1.0/plymouth_funcs.h
+===================================================================
+--- /dev/null
++++ suspend-utils-1.0/plymouth_funcs.h
 @@ -0,0 +1,28 @@
 +/*
 + * plymouth_funcs.h
@@ -384,9 +389,10 @@
 +#endif
 +#endif /* PLYMOUTH_FUNCS_H */
 +
-diff -urNB suspend-utils-1.0/plymouth-test.c new/plymouth-test.c
---- suspend-utils-1.0/plymouth-test.c  1970-01-01 01:00:00.000000000 +0100
-+++ new/plymouth-test.c        2012-02-16 17:18:23.931380520 +0100
+Index: suspend-utils-1.0/plymouth-test.c
+===================================================================
+--- /dev/null
++++ suspend-utils-1.0/plymouth-test.c
 @@ -0,0 +1,72 @@
 +/*
 + * plymouth-test.c
@@ -460,9 +466,10 @@
 +      plymouth_finish();
 +      return 0;
 +}
-diff -urNB suspend-utils-1.0/splash.c new/splash.c
---- suspend-utils-1.0/splash.c 2011-03-07 00:24:15.000000000 +0100
-+++ new/splash.c       2012-02-16 16:48:13.382292845 +0100
+Index: suspend-utils-1.0/splash.c
+===================================================================
+--- suspend-utils-1.0.orig/splash.c
++++ suspend-utils-1.0/splash.c
 @@ -27,6 +27,7 @@
  #include "bootsplash.h"
  #include "splashy_funcs.h"
@@ -471,7 +478,7 @@
  #include "encrypt.h"
  
  #define INPUT_PATH "/dev/input/by-path"
-@@ -202,6 +203,10 @@
+@@ -202,6 +203,10 @@ void splash_prepare(struct splash *splas
        splash->key_pressed     = simple_key_pressed;
        splash->set_caption     = splash_dummy_set_caption;
  
@@ -482,7 +489,7 @@
        if (!mode)
                return;
  
-@@ -233,6 +238,15 @@
+@@ -233,6 +238,15 @@ void splash_prepare(struct splash *splas
                if (!open_input_fd())
                        splash->key_pressed = key_pressed;
  #endif

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to