On Sat, Jul 08, 2006, Mohammed Adnène Trojette wrote:
> tag 376166 patch
> thanks سلام שבת שלום
>
> On Fri, Jun 30, 2006, Daniel Schepler wrote:
> > /tmp/buildd/sablotron-1.0.2/src/engine/parser.cpp:381: undefined reference
> > to `XML_SetEncoding'
> > ...
>
> Here is a patch that fix the FTBFS bug. I also provide a manpage as
> required for any binary in /usr/bin.
Here a fixed patch (the first had some superfluous or wrong things in it).
--
adn
Mohammed Adnène Trojette
diff -u sablotron-1.0.2/debian/control sablotron-1.0.2/debian/control
--- sablotron-1.0.2/debian/control
+++ sablotron-1.0.2/debian/control
@@ -1,13 +1,13 @@
Source: sablotron
Priority: optional
Maintainer: Ondřej Surý <[EMAIL PROTECTED]>
-Build-Depends: libexpat1-dev (>= 1.95.6), debhelper, libxml-parser-perl, cdbs,
build-essential (>= 11)
-Standards-Version: 3.6.1
+Build-Depends: libexpat1-dev (>= 1.95.6), debhelper, libxml-parser-perl, cdbs
+Standards-Version: 3.7.2
Package: sablotron
Architecture: any
Section: text
-Depends: libsablot0 (= ${Source-Version})
+Depends: libsablot0 (= ${Source-Version}), ${misc:Depends}
Description: an XSL processor fully implemented in C++
Sablotron is a fast, compact and portable XML toolkit implementing
XSLT 1.0, DOM Level2 and XPath 1.0.
@@ -22,7 +22,7 @@
Package: libsablot0-dev
Architecture: any
Section: libdevel
-Depends: libsablot0 (= ${Source-Version}), libc6-dev, libexpat1-dev (>= 1.95.6)
+Depends: ${misc:Depends}, libsablot0 (= ${Source-Version}), libc6-dev,
libexpat1-dev (>= 1.95.6)
Replaces: sablotron (<< 1.0.2-1)
Description: an XSL processor fully implemented in C++ [development]
Sablotron is a fast, compact and portable XML toolkit implementing
@@ -39,7 +39,7 @@
Conflicts: libsablot0c102
Architecture: any
Section: libs
-Depends: libexpat1 (>= 1.95.6), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
Description: an XSL processor fully implemented in C++
Sablotron is a fast, compact and portable XML toolkit implementing
XSLT 1.0, DOM Level2 and XPath 1.0.
diff -u sablotron-1.0.2/debian/changelog sablotron-1.0.2/debian/changelog
--- sablotron-1.0.2/debian/changelog
+++ sablotron-1.0.2/debian/changelog
@@ -1,3 +1,16 @@
+sablotron (1.0.2-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/rules:
+ + Add explicit -lexpat (Closes: #376166).
+ + Compile with -fPIC.
+ + Specify sabcmd.1 and sablot-config.1 location.
+ * debian/control:
+ + Bump Standards-Versions to 3.7.2.
+ + Add ${shlib:Depends} and ${misc:Depends} here and there.
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Sat, 8 Jul 2006 00:34:29
+0200
+
sablotron (1.0.2-5) unstable; urgency=low
* [FTBFS] Add back manual page for sablot-config (Closes: 360720)
diff -u sablotron-1.0.2/debian/rules sablotron-1.0.2/debian/rules
--- sablotron-1.0.2/debian/rules
+++ sablotron-1.0.2/debian/rules
@@ -4,8 +4,10 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
-CFLAGS := -Wall -g -D_REENTRANT
-CXXFLAGS := -Wall -g -D_REENTRANT
+DEB_INSTALL_MANPAGES_sablotron := doc/man/sabcmd.1 doc/man/sablot-config.1
+
+CFLAGS := -Wall -g -D_REENTRANT -fPIC
+CXXFLAGS := -Wall -g -D_REENTRANT -lexpat -fPIC
# Ensure at build time that the library has no dependencies on undefined
# symbols.
