Do you want me to go ahead with uploading -3 as is then? Regards,
-Roberto On Wed, Sep 09, 2015 at 07:48:32AM +0100, Daniel Glassey wrote: > On Tue, Sep 08, 2015 at 09:35:14PM -0400, Roberto C. Sánchez wrote: > > Daniel, > > > > I just built this and was going to upload for you, but I noticed that > > lintian complained of two errors: > > > > E: sword source: license-problem-undefined-license unknown (paragraph at > > line 25) > > E: libsword-dev: pkg-config-multi-arch-wrong-dir usr/lib/pkgconfig/sword.pc > > full text contains architecture specific dir x86_64-linux-gnu > > > > I don't have time to dig into the lintian errors tonight, but I may be > > able to in the next day or so. > > > > Also, if you could push the tags for the various 1.7.3 versions that > > would be helpful. I was going to check out on the debian/1.7.3+dfsg-3 > > and build from Git, but there was no tag, so I did an 'apt-get source' > > and applied the patch you attached to the bug instead. > > Ah, indeed, I forgot to tag 1.7.3+dfsg-3. > > The fixes for lintian inc enabling multiarch are all in git in 1.7.3+dfsg-4 > ready to be tagged and released. > I only did the 1.7.3+dfsg-3 to keep the patch simple for transition team to > apply if necessary. > > Thanks :) > Daniel > > > On Mon, Sep 07, 2015 at 11:55:36AM +0100, Daniel Glassey wrote: > > > user release.debian....@packages.debian.org > > > usertag 796711 + transition > > > usertag 796711 + patch > > > block 796711 by 790756 > > > reassign 796711 release.debian.org > > > thanks > > > > > > patch attached for the transition. > > > > > > I need to wait for a keyring update before I can upload myself. > > > > > > Thanks, > > > Daniel > > > > > diff --git a/debian/changelog b/debian/changelog > > > index b62945f..7fa2648 100644 > > > --- a/debian/changelog > > > +++ b/debian/changelog > > > @@ -1,3 +1,13 @@ > > > +sword (1.7.3+dfsg-3) unstable; urgency=low > > > + > > > + * c++ transition > > > + rename library to libsword11v5 > > > + blocked by ICU c++ transition > > > + * add patch abicompare.patch to allow libsword to work with > > > + abi-compliance-checker for future transitions > > > + > > > + -- Daniel Glassey <w...@debian.org> Wed, 02 Sep 2015 14:15:09 +0100 > > > + > > > sword (1.7.3+dfsg-2.1) unstable; urgency=medium > > > > > > * Non maintainer upload. > > > diff --git a/debian/control b/debian/control > > > index 53dbebe..9f59bf3 100644 > > > --- a/debian/control > > > +++ b/debian/control > > > @@ -17,7 +17,7 @@ Uploaders: Daniel Glassey <w...@debian.org>, > > > Standards-Version: 3.9.3 > > > Homepage: http://www.crosswire.org/sword/ > > > > > > -Package: libsword11 > > > +Package: libsword11v5 > > > Architecture: any > > > Depends: libsword-common, ${shlibs:Depends}, ${misc:Depends} > > > Recommends: sword-frontend > > > @@ -36,7 +36,7 @@ Description: API/library for bible software > > > Package: libsword-dev > > > Architecture: any > > > Section: libdevel > > > -Depends: libsword11 (= ${binary:Version}), ${misc:Depends} > > > +Depends: libsword11v5 (= ${binary:Version}), ${misc:Depends} > > > Recommends: libsword-utils > > > Description: Development files for libsword > > > The SWORD Project is an open source, cross-platform (Linux, Windows, > > > Solaris, > > > @@ -80,7 +80,7 @@ Package: libsword-dbg > > > Architecture: any > > > Section: debug > > > Priority: extra > > > -Depends: libsword11 (= ${binary:Version}), ${misc:Depends} > > > +Depends: libsword11v5 (= ${binary:Version}), ${misc:Depends} > > > Description: API/library for bible software - Debug Files > > > The SWORD Project is an open source, cross-platform (Linux, Windows, > > > Solaris, > > > MacOSX etc.) API/library for Bible software with a constantly growing > > > list > > > diff --git a/debian/libsword11.docs b/debian/libsword11.docs > > > deleted file mode 100644 > > > index 546a37e..0000000 > > > --- a/debian/libsword11.docs > > > +++ /dev/null > > > @@ -1 +0,0 @@ > > > -doc/translation-template.conf > > > diff --git a/debian/libsword11.install b/debian/libsword11.install > > > deleted file mode 100644 > > > index 79e4168..0000000 > > > --- a/debian/libsword11.install > > > +++ /dev/null > > > @@ -1 +0,0 @@ > > > -usr/lib/libsword.so.11 > > > diff --git a/debian/libsword11v5.docs b/debian/libsword11v5.docs > > > new file mode 100644 > > > index 0000000..546a37e > > > --- /dev/null > > > +++ b/debian/libsword11v5.docs > > > @@ -0,0 +1 @@ > > > +doc/translation-template.conf > > > diff --git a/debian/libsword11v5.install b/debian/libsword11v5.install > > > new file mode 100644 > > > index 0000000..79e4168 > > > --- /dev/null > > > +++ b/debian/libsword11v5.install > > > @@ -0,0 +1 @@ > > > +usr/lib/libsword.so.11 > > > diff --git a/debian/patches/abicompare.patch > > > b/debian/patches/abicompare.patch > > > new file mode 100644 > > > index 0000000..cdf3109 > > > --- /dev/null > > > +++ b/debian/patches/abicompare.patch > > > @@ -0,0 +1,81 @@ > > > +Index: sword-1.7.3+dfsg/include/canon_abbrevs.h > > > +=================================================================== > > > +--- sword-1.7.3+dfsg.orig/include/canon_abbrevs.h 2013-08-22 > > > 08:03:11.000000000 +0100 > > > ++++ sword-1.7.3+dfsg/include/canon_abbrevs.h 2015-09-03 > > > 07:00:52.709829136 +0100 > > > +@@ -24,6 +24,8 @@ > > > + #ifndef CANON_ABBREVS_H > > > + #define CANON_ABBREVS_H > > > + > > > ++#include <versificationmgr.h> > > > ++ > > > + SWORD_NAMESPACE_START > > > + > > > + > > > +Index: sword-1.7.3+dfsg/include/femain.h > > > +=================================================================== > > > +--- sword-1.7.3+dfsg.orig/include/femain.h 2015-09-03 > > > 07:52:46.497269566 +0100 > > > ++++ sword-1.7.3+dfsg/include/femain.h 2015-09-03 07:57:23.730644294 > > > +0100 > > > +@@ -23,12 +23,15 @@ > > > + #ifndef FEMAIN_H > > > + #define FEMAIN_H > > > + > > > ++#include <list> > > > ++#include <swdisp.h> > > > ++ > > > + class FEMain > > > + { > > > + public: > > > + FEMain (); > > > + virtual ~FEMain (); > > > +- list < SWDisplay * >displays; // so we can delete each display we > > > create > > > ++ std::list < sword::SWDisplay * >displays; // so we can delete > > > each display we create > > > + }; > > > + > > > + #endif > > > +Index: sword-1.7.3+dfsg/include/hebrewmcim.h > > > +=================================================================== > > > +--- sword-1.7.3+dfsg.orig/include/hebrewmcim.h 2013-06-29 > > > 07:40:28.000000000 +0100 > > > ++++ sword-1.7.3+dfsg/include/hebrewmcim.h 2015-09-03 > > > 07:49:51.896403768 +0100 > > > +@@ -42,8 +42,8 @@ > > > + > > > + void init(); > > > + int subst[255]; > > > +- map<int, int> subst2[12]; > > > +- map<int, int*> multiChars; > > > ++ std::map<int, int> subst2[12]; > > > ++ std::map<int, int*> multiChars; > > > + > > > + public: > > > + HebrewMCIM(); > > > +Index: sword-1.7.3+dfsg/include/sapphire.h > > > +=================================================================== > > > +--- sword-1.7.3+dfsg.orig/include/sapphire.h 2013-06-29 > > > 07:40:28.000000000 +0100 > > > ++++ sword-1.7.3+dfsg/include/sapphire.h 2015-09-03 07:50:55.180717576 > > > +0100 > > > +@@ -37,6 +37,9 @@ > > > + * results of assignments need to be reduced to 8 bits with > > > + * & 0xFF or % 0x100, whichever is faster. > > > + */ > > > ++ > > > ++#ifndef SAPPHIRE_H > > > ++#define SAPPHIRE_H > > > + > > > + #ifndef NULL > > > + #define NULL 0 > > > +@@ -80,3 +83,5 @@ > > > + > > > + > > > + SWORD_NAMESPACE_END > > > ++ > > > ++#endif //SAPPHIRE_H > > > +Index: sword-1.7.3+dfsg/include/zcom.h > > > +=================================================================== > > > +--- sword-1.7.3+dfsg.orig/include/zcom.h 2013-06-29 07:40:28.000000000 > > > +0100 > > > ++++ sword-1.7.3+dfsg/include/zcom.h 2015-09-03 07:31:44.063009491 > > > +0100 > > > +@@ -25,6 +25,7 @@ > > > + #define ZCOM_H > > > + > > > + #include <swcom.h> > > > ++#include <zverse.h> > > > + > > > + #include <defs.h> > > > + > > > diff --git a/debian/patches/series b/debian/patches/series > > > index f081236..4ead391 100644 > > > --- a/debian/patches/series > > > +++ b/debian/patches/series > > > @@ -10,3 +10,4 @@ > > > multiarch-clucene.patch > > > no-included-zconf.h.diff > > > dso-missing-shared.patch > > > +abicompare.patch > > > > > > > > > > > _______________________________________________ > > > Pkg-crosswire-devel mailing list > > > pkg-crosswire-de...@lists.alioth.debian.org > > > http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel > > > > > > -- > > Roberto C. Sánchez > > http://people.connexer.com/~roberto > > http://www.connexer.com > > -- Roberto C. Sánchez
signature.asc
Description: Digital signature
