Add patch for Ubuntu Oneiric, add missing build dep

pyside · Oct 19, 2011 · 61ea7cd · 61ea7cd
1 parent 50a4f36
commit 61ea7cd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,9 @@
 pyside-assistant (0.6) unstable; urgency=low
 
   * Fix bug #978 - Unexpected dependency for Python 2.7 using pyside-assistant
+  * Add build dep: quilt
+  * New patch:
+    + 01-ubuntu-oneiric-fix.patch
 
  -- Bruno Araujo <bruno.araujo@openbossa.org>  Wed, 19 Oct 2011 13:57:17 -0400
 

diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: pyside-assistant
 Section: devel
 Priority: extra
 Maintainer: PySide team <contact@pyside.org>
-Build-Depends: debhelper (>= 7.0.50~), python
+Build-Depends: debhelper (>= 7.0.50~), python, quilt
 Standards-Version: 3.9.1
 Homepage: http://wiki.meego.com/Documentation_for_pyside-assistant
 

diff --git a/debian/patches/01-ubuntu-oneiric-fix.patch b/debian/patches/01-ubuntu-oneiric-fix.patch
@@ -0,0 +1,13 @@
+Index: PySideAssistant/psa
+===================================================================
+--- PySideAssistant.orig/psa	2011-10-19 14:46:54.846511114 -0400
++++ PySideAssistant/psa	2011-10-19 14:47:11.118591800 -0400
+@@ -592,7 +592,7 @@
+             self.maintainer = os.getenv('DEBFULLNAME')
+         else:
+             # if there is no DEBFULLNAME environment variable, get full name from /etc/passwd
+-            currentuser = pwd.getpwnam(os.getlogin())
++            currentuser = pwd.getpwuid(os.getuid())
+             self.maintainer = currentuser.pw_gecos.split(',')[0]
+
+         if os.getenv('DEBEMAIL') is not None:
diff --git a/debian/patches/series b/debian/patches/series
@@ -0,0 +1 @@
+01-ubuntu-oneiric-fix.patch
diff --git a/debian/rules b/debian/rules
@@ -18,5 +18,5 @@ export DH_OPTIONS
 
 
 %:
-	dh $@ 
+	dh $@ --with quilt