Merge lp:~vish/ubuntu/maverick/cheese/bug573124+reup into lp:ubuntu/maverick/cheese

[Vish]

Branch improves apport hook for cheese From Mitch Towner : Bug 573124
And re-uploads the description change that was done in cheese (2.30.1-1ubuntu2) maverick, which got lost during last update due to out-of-sync vcs.

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-17 16:21:32 +0000
+++ debian/changelog	2010-08-23 16:51:46 +0000
@@ -1,3 +1,14 @@
+cheese (2.31.90-0ubuntu2) maverick; urgency=low
+
+  * debian/control.in
+    - Improve cheese description (lp: #604636)
+
+  [ Mitch Towner ]
+  *  debian/source_cheese.py:
+    - Improve apport hook (lp: #573124)
+
+ -- K Vishnoo Charan Reddy <[e-mail]>  Tue, 24 Aug 2010 00:21:32 +0530
+
 cheese (2.31.90-0ubuntu1) maverick; urgency=low
 
   * New upstream version

=== modified file 'debian/control'
--- debian/control	2010-08-17 16:21:32 +0000
+++ debian/control	2010-08-23 16:51:46 +0000
@@ -46,9 +46,11 @@
 Replaces: cheese-common (<< 2.30.1-1ubuntu1)
 Recommends: gvfs
 Description: A tool to take pictures and videos from your webcam
- Cheese is a cheesy program to take pictures and videos from your web
- cam. It also provides some graphical effects in order to please the
- user's play instinct.
+ A webcam application that supports image and video capture. Makes
+ it easy to take photos and videos of you, your friends, pets or whatever
+ you want. Allows you to apply fancy visual effects, fine-control image
+ settings and has features such as Multi-Burst mode, Countdown timer
+ for photos.
 
 Package: cheese-common
 Architecture: all
@@ -56,9 +58,11 @@
 Replaces: cheese (<< 2.30.1-1)
 Conflicts: cheese (<< 2.30.1-1)
 Description: Common files for the Cheese tool to take pictures and videos
- Cheese is a cheesy program to take pictures and videos from your web
- cam. It also provides some graphical effects in order to please the
- user's play instinct.
+ A webcam application that supports image and video capture. Makes
+ it easy to take photos and videos of you, your friends, pets or whatever
+ you want. Allows you to apply fancy visual effects, fine-control image
+ settings and has features such as Multi-Burst mode, Countdown timer
+ for photos.
  .
  This package contains the common files and translations.
 
@@ -68,9 +72,11 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: A tool to take pictures and videos from your webcam - widgets
- Cheese is a cheesy program to take pictures and videos from your web
- cam. It also provides some graphical effects in order to please the
- user's play instinct.
+ A webcam application that supports image and video capture. Makes
+ it easy to take photos and videos of you, your friends, pets or whatever
+ you want. Allows you to apply fancy visual effects, fine-control image
+ settings and has features such as Multi-Burst mode, Countdown timer
+ for photos.
  .
  This package contains the shared library.
 
@@ -84,8 +90,10 @@
          ${misc:Depends},
          ${shlibs:Depends}
 Description: A tool to take pictures and videos from your webcam - widgets dev
- Cheese is a cheesy program to take pictures and videos from your web
- cam. It also provides some graphical effects in order to please the
- user's play instinct.
+ A webcam application that supports image and video capture. Makes
+ it easy to take photos and videos of you, your friends, pets or whatever
+ you want. Allows you to apply fancy visual effects, fine-control image
+ settings and has features such as Multi-Burst mode, Countdown timer
+ for photos.
  .
  This package contains the development headers and API documentation.

=== modified file 'debian/control.in'
--- debian/control.in	2010-08-17 16:21:32 +0000
+++ debian/control.in	2010-08-23 16:51:46 +0000
@@ -41,9 +41,11 @@
 Replaces: cheese-common (<< 2.30.1-1ubuntu1)
 Recommends: gvfs
 Description: A tool to take pictures and videos from your webcam
- Cheese is a cheesy program to take pictures and videos from your web
- cam. It also provides some graphical effects in order to please the
- user's play instinct.
+ A webcam application that supports image and video capture. Makes
+ it easy to take photos and videos of you, your friends, pets or whatever
+ you want. Allows you to apply fancy visual effects, fine-control image
+ settings and has features such as Multi-Burst mode, Countdown timer
+ for photos.
 
 Package: cheese-common
 Architecture: all
@@ -51,9 +53,11 @@
 Replaces: cheese (<< 2.30.1-1)
 Conflicts: cheese (<< 2.30.1-1)
 Description: Common files for the Cheese tool to take pictures and videos
- Cheese is a cheesy program to take pictures and videos from your web
- cam. It also provides some graphical effects in order to please the
- user's play instinct.
+ A webcam application that supports image and video capture. Makes
+ it easy to take photos and videos of you, your friends, pets or whatever
+ you want. Allows you to apply fancy visual effects, fine-control image
+ settings and has features such as Multi-Burst mode, Countdown timer
+ for photos.
  .
  This package contains the common files and translations.
 
@@ -63,9 +67,11 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: A tool to take pictures and videos from your webcam - widgets
- Cheese is a cheesy program to take pictures and videos from your web
- cam. It also provides some graphical effects in order to please the
- user's play instinct.
+ A webcam application that supports image and video capture. Makes
+ it easy to take photos and videos of you, your friends, pets or whatever
+ you want. Allows you to apply fancy visual effects, fine-control image
+ settings and has features such as Multi-Burst mode, Countdown timer
+ for photos.
  .
  This package contains the shared library.
 
@@ -79,8 +85,10 @@
          ${misc:Depends},
          ${shlibs:Depends}
 Description: A tool to take pictures and videos from your webcam - widgets dev
- Cheese is a cheesy program to take pictures and videos from your web
- cam. It also provides some graphical effects in order to please the
- user's play instinct.
+ A webcam application that supports image and video capture. Makes
+ it easy to take photos and videos of you, your friends, pets or whatever
+ you want. Allows you to apply fancy visual effects, fine-control image
+ settings and has features such as Multi-Burst mode, Countdown timer
+ for photos.
  .
  This package contains the development headers and API documentation.

=== modified file 'debian/source_cheese.py'
--- debian/source_cheese.py	2010-04-12 20:00:53 +0000
+++ debian/source_cheese.py	2010-08-23 16:51:46 +0000
@@ -1,15 +1,76 @@
 import os
 import subprocess
-
 import apport.packaging
 import apport.hookutils
+
+HOME = os.path.expanduser("~")
+
 def add_info(report, ui):
-	response = ui.choice("How would you describe the issue?", ["Cheese does not detect webcam or image not displayed properly", "Other problem"], False)
-	if response == None: # user cancelled
-		raise StopIteration
-	if response[0] == 0: # attach debug information
-		ui.information("If Cheese is running, please close Cheese. Cheese will run again in debug mode. Please wait till you see a video or an error message before closing cheese")
-		report["CheeseDebug.log"] = apport.hookutils.command_output(['env', 'GST_DEBUG=*cheese*:3', 'cheese', '-v'])
-	apport.hookutils.attach_hardware(report)
-	report["GstreamerVersions"] = apport.hookutils.package_versions("gstreamer*")
-	report["XorgLog"] = apport.hookutils.read_file("/var/log/Xorg.0.log")
+    add_tags = []
+
+    response = ui.information("Before continuing, please close Cheese if it is already running!\n\nCheese will now be started in debugging mode.\n\nTry to reproduce the problem you are facing\nand 'Close' Cheese.")
+    ## run cheese in debug mode all the bugs need this!
+    os.popen("env GST_DEBUG=*cheese*:3 cheese -v 2>&1 | tee /dev/tty >>~/.cache/CheeseDebug.txt")
+	
+    report['CheeseDebug.txt'] = ('.cache/CheeseDebug.txt', False)
+    report['lspci'] = command_output(['lspci', '-vvnn'])
+    report['lsusb'] = command_output(['lsusb'])
+
+    attach_related_packages(report, [
+        "cheese",
+        "cheese-common"
+        ])    	
+
+    ## Clear the screen to keep things tidy
+    os.system("clear")
+
+    response = ui.choice("How would you describe the problem you are facing?", ["Cheese does not work properly", "The webcam image displayed has problems"], False)
+
+    if response == None: ## user cancelled
+        raise StopIteration
+    if response[0] == 1: ## the image problems are usually due to bad drivers,so we test direct video input from gstreamer to rule out cheese error
+	response = ui.information("A video image will now be displayed directly from your webcam.\n\nPlease observe if it has the same image problems\nand 'Close' the window.")
+    	## run gstreamer,will auto detect the src and display the webcam input
+    	os.popen("gst-launch-0.10 autovideosrc ! ffmpegcolorspace ! autovideosink")
+
+    	response = ui.choice("Did you notice the same image problem in the test video?", ["Yes", "No"], False)
+
+    	if response == None: ## user cancelled
+    	    raise StopIteration
+	
+	if response[0] == 0: ## the issue is mostly related to bad drivers and not cheese!
+	    add_tags.append('gstreamer-error')
+	
+	if response[0] == 1: ## the video input works fine, cheese is messing up the video!
+	    add_tags.append('gstreamer-ok')
+
+    dmi_dir = '/sys/class/dmi/id'
+    if os.path.isdir(dmi_dir):
+         for f in os.listdir(dmi_dir):
+             p = '%s/%s' % (dmi_dir, f)
+             st = os.stat(p)
+             ## ignore the root-only ones, since they have serial numbers
+             if not stat.S_ISREG(st.st_mode) or (st.st_mode & 4 == 0):
+                 continue
+             if f in ('subsystem', 'uevent', 'chassis_asset_tag'):
+                 continue
+ 
+             try:
+                 value = open(p).read().strip()
+             except (OSError, IOError):
+                 continue
+             if value:
+                 report['dmi.' + f.replace('_', '.')] = value
+ 
+        ## Use the hardware information to create a machine type.
+    if 'dmi.sys.vendor' in report and 'dmi.product.name' in report:
+         report['MachineType'] = '%s %s' % (report['dmi.sys.vendor'],
+                 report['dmi.product.name'])
+
+    attach_file(report, '/proc/cpuinfo', 'ProcCpuinfo')
+
+    if add_tags:
+        if 'Tags' in report:
+            report['Tags'] += ' ' + ' '.join(add_tags)
+        else:
+            report['Tags'] = ' '.join(add_tags)