tags 490368 patch
thanks

Attached is a debdiff for an NMU for yum to fix this issue.

You can also find the .dsc for this at

http://mentors.debian.net/debian/pool/main/y/yum/yum_3.2.12-1.2.dsc

Please Note: As I've done this properly, and used dpatch to fix this, it
will cause lintian errors (as it already does) because of previous
changes being against the source, rather than using a patch system.

There are already lintian warnings though :(

By request of dilinger, I have only included the changes to fix the RC
bug, I would, at some point, also like to do a QA upload for this to fix
some of the packaging issues.
diff -u yum-3.2.12/debian/rules yum-3.2.12/debian/rules
--- yum-3.2.12/debian/rules
+++ yum-3.2.12/debian/rules
@@ -34,7 +34,7 @@
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 	# Add here commands to configure the package.
 
@@ -59,7 +59,8 @@
 	$(MAKE) 
 	touch build-indep-stamp
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
@@ -98,6 +99,15 @@
 
 	dh_install -s
 
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
diff -u yum-3.2.12/debian/changelog yum-3.2.12/debian/changelog
--- yum-3.2.12/debian/changelog
+++ yum-3.2.12/debian/changelog
@@ -1,3 +1,12 @@
+yum (3.2.12-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Added dpatch rules
+  * Added patch to load correct gpgme module (Closes: #490368)
+  * Changed rules so as to change dependency for python-pyme
+
+ -- Martin Meredith <[EMAIL PROTECTED]>  Sat, 26 Jul 2008 22:34:15 +0100
+
 yum (3.2.12-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u yum-3.2.12/debian/control yum-3.2.12/debian/control
--- yum-3.2.12/debian/control
+++ yum-3.2.12/debian/control
@@ -3,12 +3,12 @@
 Priority: extra
 Maintainer: Anand Kumria <[EMAIL PROTECTED]>
 Uploaders: Andres Salomon <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), python-dev, python-support (>= 0.4), intltool
+Build-Depends: debhelper (>= 4.0.0), python-dev, python-support (>= 0.4), intltool, dpatch
 Standards-Version: 3.7.3
 
 Package: yum
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-celementtree, python-libxml2, python-urlgrabber, rpm (>= 4.4.1), python-rpm, python-pyme, python-sqlitecachec, python-sqlite
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-celementtree, python-libxml2, python-urlgrabber, rpm (>= 4.4.1), python-rpm, python-pyme (>= 0.8.0), python-sqlitecachec, python-sqlite
 Description: Advanced front-end for rpm
  Yum (Yellow dog Updater, Modified) is an automatic updater and package 
  installer/remover for rpm systems. It automatically computes dependencies 
only in patch2:
unchanged:
--- yum-3.2.12.orig/debian/patches/00list
+++ yum-3.2.12/debian/patches/00list
@@ -0,0 +1 @@
+01_fix_gpgme_include
only in patch2:
unchanged:
--- yum-3.2.12.orig/debian/patches/01_fix_gpgme_include.dpatch
+++ yum-3.2.12/debian/patches/01_fix_gpgme_include.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_gpgme_include.dpatch by Martin Meredith <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update yum/misc.py to work with pygpgme >= 0.8
+
[EMAIL PROTECTED]@
+diff -urNad yum-3.2.12~/yum/misc.py yum-3.2.12/yum/misc.py
+--- yum-3.2.12~/yum/misc.py	2008-07-26 22:10:40.000000000 +0100
++++ yum-3.2.12/yum/misc.py	2008-07-26 22:25:01.000000000 +0100
+@@ -16,7 +16,7 @@
+ import fnmatch
+ import bz2
+ from stat import *
+-import pyme.gpgme
++import pyme.pygpgme
+ 
+ from Errors import MiscError
+ 

Reply via email to