On Fri, 7 Nov 2008 23:40:13 +0100 Evgeni Golov wrote:

> (I've never worked with cdbs and simple-patchsys.)

Well, simple-patchsys is really simple, find a proper debdiff
attached :)
I've uploaded the NMU to
http://mentors.debian.net/debian/pool/main/l/libopensync-plugin-moto/libopensync-plugin-moto_0.22-1.1.dsc
Who wants to sponsor? ;)

regards
Evgeni
diff -u libopensync-plugin-moto-0.22/debian/changelog libopensync-plugin-moto-0.22/debian/changelog
--- libopensync-plugin-moto-0.22/debian/changelog
+++ libopensync-plugin-moto-0.22/debian/changelog
@@ -1,3 +1,11 @@
+libopensync-plugin-moto (0.22-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't call pkg-config to find out, that Debian ships its libs in
+    /usr/lib. (Closes: #504866)
+
+ -- Evgeni Golov <[EMAIL PROTECTED]>  Fri, 07 Nov 2008 23:30:27 +0100
+
 libopensync-plugin-moto (0.22-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- libopensync-plugin-moto-0.22.orig/debian/patches/hardcode-libdir.patch
+++ libopensync-plugin-moto-0.22/debian/patches/hardcode-libdir.patch
@@ -0,0 +1,16 @@
+--- libopensync-plugin-moto-0.22.orig/mototool
++++ libopensync-plugin-moto-0.22/mototool
+@@ -12,11 +12,8 @@
+ except ImportError:
+     # motosync wasn't in our standard import path
+     # try looking in the opensync python plugin dir for it
+-    child = popen2.Popen3('pkg-config opensync-1.0 --variable=libdir')
+-    libdir = child.fromchild.readline().rstrip('\n')
+-    if child.wait() != 0 or not os.path.isdir(libdir):
+-        sys.stderr.write("Error: couldn't locate OpenSync library directory\n")
+-        sys.exit(1)
++    # hardcode libdir to /usr/lib as a workaround for #504866
++    libdir = '/usr/lib'
+     sys.path.append(os.path.join(libdir, 'opensync', 'python-plugins'))
+     import motosync
+ 

Attachment: pgpDcVfKLzI2j.pgp
Description: PGP signature

Reply via email to