[Foo2zjs-commits] r271 - in trunk/foo2zjs_20110210dfsg/debian: . ubuntu

[Luca Capello]

Author: gismo
Date: 2011-03-30 20:10:33 +0000 (Wed, 30 Mar 2011)
New Revision: 271

Added:
   trunk/foo2zjs_20110210dfsg/debian/ubuntu/
   trunk/foo2zjs_20110210dfsg/debian/ubuntu/apport-hook.py
Modified:
   trunk/foo2zjs_20110210dfsg/debian/changelog
   trunk/foo2zjs_20110210dfsg/debian/rules
Log:
debian/ubuntu/apport-hook.py: new file

Modified: trunk/foo2zjs_20110210dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20110210dfsg/debian/changelog	2011-02-20 19:20:17 UTC (rev 270)
+++ trunk/foo2zjs_20110210dfsg/debian/changelog	2011-03-30 20:10:33 UTC (rev 271)
@@ -1,3 +1,13 @@
+foo2zjs (20110210dfsg-2) UNRELEASED; urgency=low
+
+  [ Till Kamppeter ]
+  * Merge from Ubuntu natty.
+  * debian/rules:
+    + install Apport hook on Ubuntu and derivatives.
+  * debian/ubuntu/apport-hook.py: new file.
+
+ --
+
 foo2zjs (20110210dfsg-1) unstable; urgency=low
 
   * Move to team maintenance: Debian Printing Team at

Modified: trunk/foo2zjs_20110210dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20110210dfsg/debian/rules	2011-02-20 19:20:17 UTC (rev 270)
+++ trunk/foo2zjs_20110210dfsg/debian/rules	2011-03-30 20:10:33 UTC (rev 271)
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no")
+
 include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
@@ -79,6 +81,10 @@
 	# to a patch this will automatically apply to every new wrapper script
 	# which gets added to this package in the future.
 	perl -p -i -e 's/^PAPER=(\d+)\s*$$/test -r \/etc\/papersize && PAPER=\x24\(cat \/etc\/papersize\)\ntest "\x24PAPER" || PAPER=\1\n/' $(CURDIR)/debian/foo2zjs/usr/bin/*-wrapper
+	# Install the apport hook on Ubuntu and derivatives
+ifeq ($(derives_from_ubuntu),yes)
+	install -D -m 644 debian/ubuntu/apport-hook.py $(CURDIR)/debian/foo2zjs/usr/share/apport/package-hooks/source_foo2zjs.py
+endif
 
 # Build architecture-independent files here.
 binary-indep: build install

Added: trunk/foo2zjs_20110210dfsg/debian/ubuntu/apport-hook.py
===================================================================
--- trunk/foo2zjs_20110210dfsg/debian/ubuntu/apport-hook.py	                        (rev 0)
+++ trunk/foo2zjs_20110210dfsg/debian/ubuntu/apport-hook.py	2011-03-30 20:10:33 UTC (rev 271)
@@ -0,0 +1,11 @@
+'''apport package hook for foo2zjs
+
+(c) 2009 Canonical Ltd.
+Author: Brian Murray <brian at ubuntu.com>
+'''
+
+from apport.hookutils import *
+
+def add_info(report):
+    attach_hardware(report)
+    attach_printing(report)