diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-26 23:48:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-26 23:48:35 -0600 |
| commit | e21781df2ef6bfdb1a650bab5298b0261c8f7d3c (patch) | |
| tree | 27ca6bb1731872f32669ac93ef714ffe38b58023 /lib | |
| parent | 25b343530fea2586973f2d3fe1d068c1e37d5d38 (diff) | |
| download | ulab-e21781df2ef6bfdb1a650bab5298b0261c8f7d3c.tar.gz ulab-e21781df2ef6bfdb1a650bab5298b0261c8f7d3c.zip | |
Update package names and fix library FTBFS
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libtdekrb/configure.in.in | 10 | ||||
| -rw-r--r-- | lib/libtdekrb/src/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/libtqtrla/configure.in.in | 9 | ||||
| -rwxr-xr-x | lib/libtqtrla/debian/rules | 3 | ||||
| -rw-r--r-- | lib/libtqtrla/src/Makefile.am | 2 |
5 files changed, 24 insertions, 2 deletions
diff --git a/lib/libtdekrb/configure.in.in b/lib/libtdekrb/configure.in.in index aa370f6..a0b1602 100644 --- a/lib/libtdekrb/configure.in.in +++ b/lib/libtdekrb/configure.in.in @@ -4,4 +4,14 @@ AM_INIT_AUTOMAKE(autostart, 0.1) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN +# These numbers should be tweaked on every release. Read carefully: +# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +# http://sourceware.org/autobook/autobook/autobook_91.html +lt_current="1" +lt_revision="0" +lt_age="0" +AC_SUBST(lt_current) +AC_SUBST(lt_revision) +AC_SUBST(lt_age) + CXXFLAGS="-DQT_CLEAN_NAMESPACE $CXXFLAGS" diff --git a/lib/libtdekrb/src/Makefile.am b/lib/libtdekrb/src/Makefile.am index 7bcac6e..8ff3463 100644 --- a/lib/libtdekrb/src/Makefile.am +++ b/lib/libtdekrb/src/Makefile.am @@ -9,4 +9,4 @@ include_HEADERS = tdekrbclientsocket.h tdekrbserversocket.h libtdekrbsocket_la_SOURCES = tdekrbclientsocket.cpp tdekrbserversocket.cpp libtdekrbsocket_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) -lsasl2 -libtdekrbsocket_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) +libtdekrbsocket_la_LDFLAGS = -module -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries) diff --git a/lib/libtqtrla/configure.in.in b/lib/libtqtrla/configure.in.in index 18b1486..3b3f6bf 100644 --- a/lib/libtqtrla/configure.in.in +++ b/lib/libtqtrla/configure.in.in @@ -4,3 +4,12 @@ AM_INIT_AUTOMAKE(autostart, 0.1) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN +# These numbers should be tweaked on every release. Read carefully: +# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +# http://sourceware.org/autobook/autobook/autobook_91.html +lt_current="1" +lt_revision="0" +lt_age="0" +AC_SUBST(lt_current) +AC_SUBST(lt_revision) +AC_SUBST(lt_age) diff --git a/lib/libtqtrla/debian/rules b/lib/libtqtrla/debian/rules index 242fb2c..9bed17b 100755 --- a/lib/libtqtrla/debian/rules +++ b/lib/libtqtrla/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/lib/libtqtrla/src/Makefile.am b/lib/libtqtrla/src/Makefile.am index eba0d61..e9c85f0 100644 --- a/lib/libtqtrla/src/Makefile.am +++ b/lib/libtqtrla/src/Makefile.am @@ -8,4 +8,4 @@ include_HEADERS = tqtrla.h libtqtrla_la_SOURCES = tqtrla.cpp libtqtrla_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) -libtqtrla_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) $(LIB_KPARTS) -ltdekrbsocket +libtqtrla_la_LDFLAGS = -module -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries) $(LIB_KPARTS) -ltdekrbsocket |