tags 496027 + patch
tags 496027 + pending
thanks
Dear maintainer,
I've prepared an NMU for stopmotion (versioned as 0.6.2-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
Mehdi Dogguy
diff -u stopmotion-0.6.2/debian/changelog stopmotion-0.6.2/debian/changelog
--- stopmotion-0.6.2/debian/changelog
+++ stopmotion-0.6.2/debian/changelog
@@ -1,3 +1,10 @@
+stopmotion (0.6.2-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Use pidof instead of a combination of kill, ps and grep (Closes: #496027).
+
+ -- Mehdi Dogguy <me...@debian.org> Tue, 07 Dec 2010 06:07:08 +0100
+
stopmotion (0.6.2-1) unstable; urgency=low
* New upstream release
@@ -302 +308,0 @@
-
only in patch2:
unchanged:
--- stopmotion-0.6.2.orig/src/presentation/frontends/qtfrontend/qtfrontend.cpp
+++ stopmotion-0.6.2/src/presentation/frontends/qtfrontend/qtfrontend.cpp
@@ -236,7 +236,7 @@
prefs->setPreference("importstartdeamon1",
"vgrabbj -f $IMAGEFILE -d $VIDEODEVICE -b -D 0 -i vga -L250");
prefs->setPreference("importstopdeamon1",
- "kill -9 `ps ax | grep vgrabbj | grep -v grep | cut -b 0-5`");
+ "kill -9 $(pidof vgrabbj)");
// Default import option 3
prefs->setPreference("importname2", tr("dvgrab").toLatin1().constData());
@@ -246,7 +246,7 @@
"dvgrab --format jpeg --jpeg-overwrite --jpeg-deinterlace --jpeg-width 640 "
"--jpeg-height 480 --frames 25 $IMAGEFILE");
prefs->setPreference("importstopdeamon2",
- "kill -9 `ps ax | grep dvgrab | grep -v grep | cut -b 0-5`");
+ "kill -9 $(pidof dvgrab)");
// Default import option 4
prefs->setPreference("importname3", tr("videodog singleshot").toLatin1().constData());
@@ -264,7 +264,7 @@
"dvgrab --format jpeg --jpeg-overwrite --jpeg-deinterlace --jpeg-width 640 "
"--jpeg-height 480 --every 25 $IMAGEFILE &");
prefs->setPreference("importstopdeamon4",
- "kill -9 `ps ax | grep dvgrab | grep -v grep | cut -b 0-5`");
+ "kill -9 $(pidof dvgrab)");
// -----------------------------------------------------------------------
// Default export options ------------------------------------------------
