Bug#623388: librep: diff for NMU version 0.90.2-1.3

tags 623388 + pending
thanks

Dear maintainer,

I've prepared an NMU for librep (versioned as 0.90.2-1.3) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

Héctor Orón

"Our Sun unleashes tremendous flares expelling hot gas into the Solar System, which one day will disconnect us."

Video flare: http://antwrp.gsfc.nasa.gov/apod/ap100510.html


diff -u librep-0.90.2/debian/control librep-0.90.2/debian/control
librep-0.90.2/debian/control
+++ librep-0.90.2/debian/control
@@ -2,7 +2,7 @@
Section: lisp
Priority: optional
Maintainer: Luis Rodrigo Gallardo Cruz <rodrigo@debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
Build-Depends: texinfo (>= 4.11-2), debhelper (>= 7), libgmp-dev,
libgdbm-dev, libreadline-dev, libncurses5-dev, libtool,
dpatch, autotools-dev, pkg-config, libffi-dev
@@ -46,7 +46,7 @@
Package: librep-dev
Section: libdevel
Architecture: any
-Depends: librep9 (= ${binary:Version}), libgmp-dev, ${shlibs:Depends},
+Depends: rep, librep9 (= ${binary:Version}), libgmp-dev, ${shlibs:Depends},
${misc:Depends}
Recommends: rep-doc
Description: development libraries and headers for librep
diff -u librep-0.90.2/debian/changelog librep-0.90.2/debian/changelog
librep-0.90.2/debian/changelog
+++ librep-0.90.2/debian/changelog
@@ -1,3 +1,13 @@
+librep (0.90.2-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add armhf support. Thanks Konstantinos Margaritis (Closes: #623388)
+ * Bump Standards-Version stanza.
+ * Emptying the dependency_libs field in .la files
+ * Add librep-dev depends on rep for silence lintian check.
+
+ -- Hector Oron <zumbi@debian.org> Mon, 11 Jul 2011 13:02:56 +0100
+
librep (0.90.2-1.2) unstable; urgency=low

* NMU. Change dependency libgmp3-dev --> libgmp-dev.
diff -u librep-0.90.2/debian/rules librep-0.90.2/debian/rules
librep-0.90.2/debian/rules
+++ librep-0.90.2/debian/rules
@@ -86,11 +86,12 @@

$(MAKE) install DESTDIR=`pwd`/debian/tmp

- #Fix libdir in *.la files
+ #Fix libdir in *.la files and remove dependency_libs
find debian/tmp -name '*.la' |\
while read file; do\
DIRNAME=$$(dirname $$file | sed 's@debian/tmp@@');\
sed -i "/libdir/ s@^.*@libdir=$$DIRNAME@" $$file;\
+ sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`;\
done

-rm -rf debian/tmp/usr/info
diff -u librep-0.90.2/debian/patches/00list librep-0.90.2/debian/patches/00list
librep-0.90.2/debian/patches/00list
+++ librep-0.90.2/debian/patches/00list
@@ -1,0 +2 @@
+armel_ftbfs.dpatch
only in patch2:
unchanged:
librep-0.90.2.orig/debian/patches/armel_ftbfs.dpatch
+++ librep-0.90.2/debian/patches/armel_ftbfs.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: Do not use reserved register r7 in thumb mode compilation
+## Origin/Author: add some origin or author
+## Bug: bug URL
+## armel_ftbfs.dpatch by Jani Monoses <jani@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' librep-0.90.2~/src/lispmach.h librep-0.90.2/src/lispmach.h
+ librep-0.90.2~/src/lispmach.h 2009-08-25 19:33:47.000000000 +0300
++++ librep-0.90.2/src/lispmach.h 2010-12-13 11:51:08.298578000 +0200
+@@ -474,7 +474,7 @@
+ #ifdef __arm__
+ #define PC_REG asm("r9")
+ #define SP_REG asm("r8")
+-#define SLOTS_REG asm("r7")
++#define SLOTS_REG asm("r10")
+ #endif
+ #endif
+







To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org