[Pkg-fglrx-devel] r1546 - fglrx-driver/branches/15.9-jessie/debian

[Andreas Beckmann]

Author: anbe
Date: 2015-11-02 01:15:47 +0000 (Mon, 02 Nov 2015)
New Revision: 1546

Modified:
   fglrx-driver/branches/15.9-jessie/debian/changelog
   fglrx-driver/branches/15.9-jessie/debian/control
   fglrx-driver/branches/15.9-jessie/debian/fglrx-atieventsd.fglrx-atieventsd.init
   fglrx-driver/branches/15.9-jessie/debian/libgl1-fglrx-glx.lintian-overrides
Log:
merge changes from trunk up to r1545

Modified: fglrx-driver/branches/15.9-jessie/debian/changelog
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/changelog	2015-11-02 01:13:43 UTC (rev 1545)
+++ fglrx-driver/branches/15.9-jessie/debian/changelog	2015-11-02 01:15:47 UTC (rev 1546)
@@ -10,6 +10,9 @@
 fglrx-driver (1:15.9-3) UNRELEASED; urgency=medium
 
   * d/rules: Move tar option --no-recursion before the list of files.
+  * fglrx-atieventsd.init: Fix 'stop' and implement 'status', thanks to
+    D. Leggett.  (Closes: #803494)
+  * Update lintian overrides.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 17 Oct 2015 18:25:41 +0200
 

Modified: fglrx-driver/branches/15.9-jessie/debian/control
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/control	2015-11-02 01:13:43 UTC (rev 1545)
+++ fglrx-driver/branches/15.9-jessie/debian/control	2015-11-02 01:15:47 UTC (rev 1546)
@@ -46,7 +46,7 @@
  ${fglrx}-atieventsd,
 Suggests:
  ${fglrx}-control,
- xvba-va-driver,
+ lib${fglrx}-amdxvba1,
  amd-opencl-icd${fglrx:Variant},
 Provides:
  xorg-driver-video,

Modified: fglrx-driver/branches/15.9-jessie/debian/fglrx-atieventsd.fglrx-atieventsd.init
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/fglrx-atieventsd.fglrx-atieventsd.init	2015-11-02 01:13:43 UTC (rev 1545)
+++ fglrx-driver/branches/15.9-jessie/debian/fglrx-atieventsd.fglrx-atieventsd.init	2015-11-02 01:15:47 UTC (rev 1546)
@@ -50,14 +50,13 @@
 			exit 0
 		fi
         log_daemon_msg "Starting $DESC" "$DAEMONNAME"
-        start-stop-daemon --start --name $DAEMONNAME --oknodo \
-            --quiet --exec $DAEMONPATH -- $DAEMONOPTS
+        start-stop-daemon --quiet --start --name $DAEMONNAME --exec $DAEMONPATH --oknodo -- $DAEMONOPTS
 	log_end_msg $?
         ;;
 
     stop)
         log_daemon_msg "Stopping $DESC" "$DAEMONNAME"
-        start-stop-daemon --quiet --stop --exec $DAEMONPATH --oknodo
+        start-stop-daemon --quiet --stop --name $DAEMONNAME --exec $DAEMONPATH --oknodo
 	log_end_msg $?
         ;;
 
@@ -66,9 +65,11 @@
         sleep 1
         $0 start
         ;;
+
     status)
-		exit 4
-		;;
+        status_of_proc $DAEMONPATH atieventsd && exit 0 || exit $?
+        ;;
+
     *)
         echo "$0 {start|stop|restart|force-reload|status}"
         exit 3

Modified: fglrx-driver/branches/15.9-jessie/debian/libgl1-fglrx-glx.lintian-overrides
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/libgl1-fglrx-glx.lintian-overrides	2015-11-02 01:13:43 UTC (rev 1545)
+++ fglrx-driver/branches/15.9-jessie/debian/libgl1-fglrx-glx.lintian-overrides	2015-11-02 01:15:47 UTC (rev 1546)
@@ -5,5 +5,4 @@
 shlib-calls-exit usr/lib*/fglrx/fglrx-libGL.so.1.2
 [i386]: shlib-with-non-pic-code usr/lib*/fglrx/fglrx-libGL.so.1.2
 shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
-postrm-has-useless-call-to-ldconfig
 postinst-has-useless-call-to-ldconfig