[SCM] libindi packaging branch, master, updated. debian/0.8-1-10-ga01a190

Pino Toscano pino at alioth.debian.org
Mon Jan 16 16:07:23 UTC 2012


The following commit has been merged in the master branch:
commit 001bcdc0a49c2be35cc6331afa1ed55c64027bd0
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jan 16 17:06:03 2012 +0100

    manage the libindi API/ABI break
    
    Given that upstream does not keep a stable ABI while not bumping the SONAME, we have to do it ourselves:
    - bump the SONAME to 0a (patch abi.diff)
    - rename libindi0 to libindi0a
    - drop the symbols file of libindi, "replaced" by a tight shlibs
---
 debian/changelog         |    4 +++
 debian/control           |    6 ++--
 debian/libindi0.install  |    2 -
 debian/libindi0.symbols  |   66 ----------------------------------------------
 debian/libindi0a.install |    2 +
 debian/patches/abi.diff  |   33 +++++++++++++++++++++++
 debian/patches/series    |    1 +
 debian/rules             |    3 ++
 8 files changed, 46 insertions(+), 71 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f505315..72c5bf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ libindi (0.9-0r1) UNRELEASED; urgency=low
   * libindi-dev: add dependency on libcfitsio3-dev, as cfitsio headers are
     included in public headers.
   * Update copyright.
+  * Upstream does not keep a stable ABI while not bumping the SONAME, so:
+    - bump the SONAME to 0a (patch abi.diff)
+    - rename libindi0 to libindi0a
+    - drop the symbols file of libindi, "replaced" by a tight shlibs
 
  -- Pino Toscano <pino at debian.org>  Mon, 16 Jan 2012 11:48:20 +0100
 
diff --git a/debian/control b/debian/control
index 5e8bc10..decaefc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Homepage: http://www.indilib.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/krap/libindi.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/krap/libindi.git
 
-Package: libindi0
+Package: libindi0a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -34,7 +34,7 @@ Description: Instrument-Neutral Device Interface library -- shared library
 Package: libindi-dev
 Section: libdevel
 Architecture: any
-Depends: libindi0 (= ${binary:Version}), ${misc:Depends},
+Depends: libindi0a (= ${binary:Version}), ${misc:Depends},
  libusb-dev, libcfitsio3-dev
 Description: Instrument-Neutral Device Interface library -- development files
  INDI (Instrument-Neutral Device Interface) is a distributed XML-based
@@ -76,7 +76,7 @@ Package: indi-dbg
 Priority: extra
 Section: debug
 Architecture: any
-Depends: libindi0 (= ${binary:Version}), ${misc:Depends}
+Depends: libindi0a (= ${binary:Version}), ${misc:Depends}
 Suggests: indi-bin (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: Instrument-Neutral Device Interface library -- debug symbols
diff --git a/debian/libindi0.install b/debian/libindi0.install
deleted file mode 100644
index 6cbd064..0000000
--- a/debian/libindi0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libindi.so.0
-usr/lib/*/libindi.so.0.8.0
diff --git a/debian/libindi0.symbols b/debian/libindi0.symbols
deleted file mode 100644
index a16ae93..0000000
--- a/debian/libindi0.symbols
+++ /dev/null
@@ -1,66 +0,0 @@
-libindi.so.0 libindi0 #MINVER#
-* Build-Depends-Package: libindi-dev
- IDLog at Base 0.8
- IUFindBLOB at Base 0.8
- IUFindLight at Base 0.8
- IUFindNumber at Base 0.8
- IUFindOnSwitch at Base 0.8
- IUFindSwitch at Base 0.8
- IUFindText at Base 0.8
- IUResetSwitch at Base 0.8
- IUSaveText at Base 0.8
- addXMLAtt at Base 0.8
- addXMLEle at Base 0.8
- crackDN at Base 0.8
- crackIPState at Base 0.8
- crackIPerm at Base 0.8
- crackISRule at Base 0.8
- crackISState at Base 0.8
- delLilXML at Base 0.8
- delXMLEle at Base 0.8
- editXMLAtt at Base 0.8
- editXMLEle at Base 0.8
- entityXML at Base 0.8
- extractISOTime at Base 0.8
- f_scansexa at Base 0.8
- findXMLAtt at Base 0.8
- findXMLAttValu at Base 0.8
- findXMLEle at Base 0.8
- from64tobits at Base 0.8
- fs_sexa at Base 0.8
- getSexComponents at Base 0.8
- indi_xmlMalloc at Base 0.8
- nXMLAtt at Base 0.8
- nXMLEle at Base 0.8
- nameXMLAtt at Base 0.8
- newLilXML at Base 0.8
- nextXMLAtt at Base 0.8
- nextXMLEle at Base 0.8
- numberFormat at Base 0.8
- parentXMLAtt at Base 0.8
- parentXMLEle at Base 0.8
- pcdataXMLEle at Base 0.8
- pcdatalenXMLEle at Base 0.8
- permStr at Base 0.8
- prXMLEle at Base 0.8
- pstateStr at Base 0.8
- readXMLEle at Base 0.8
- readXMLFile at Base 0.8
- rmXMLAtt at Base 0.8
- ruleStr at Base 0.8
- sprXMLEle at Base 0.8
- sprlXMLEle at Base 0.8
- sstateStr at Base 0.8
- tagXMLEle at Base 0.8
- timestamp at Base 0.8
- to64frombits at Base 0.8
- tty_connect at Base 0.8
- tty_disconnect at Base 0.8
- tty_error_msg at Base 0.8
- tty_read at Base 0.8
- tty_read_section at Base 0.8
- tty_timeout at Base 0.8
- tty_write at Base 0.8
- tty_write_string at Base 0.8
- valuXMLAtt at Base 0.8
- xmlv1 at Base 0.8
diff --git a/debian/libindi0a.install b/debian/libindi0a.install
new file mode 100644
index 0000000..27c12da
--- /dev/null
+++ b/debian/libindi0a.install
@@ -0,0 +1,2 @@
+usr/lib/*/libindi.so.0a
+usr/lib/*/libindi.so.0a.9.0
diff --git a/debian/patches/abi.diff b/debian/patches/abi.diff
new file mode 100644
index 0000000..147e06e
--- /dev/null
+++ b/debian/patches/abi.diff
@@ -0,0 +1,33 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Bump the library version ABI
+ libindi's API is not final until 1.0 but upstream does not bump SONAME,
+ so manually bump the SONAME and library VERSION ourselves.
+Origin: vendor
+Last-Update: 2012-01-16
+Forwarded: not-needed
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,11 +2,12 @@ cmake_minimum_required(VERSION 2.4.7)
+ PROJECT(libindi C CXX)
+ 
+ ##################  INDI version  ################################
+-set(INDI_SOVERSION "0")
++set(INDI_SOVERSION "0a")
+ set(CMAKE_INDI_VERSION_MAJOR 0)
+ set(CMAKE_INDI_VERSION_MINOR 9)
+ set(CMAKE_INDI_VERSION_RELEASE 0)
+ set(CMAKE_INDI_VERSION_STRING "${CMAKE_INDI_VERSION_MAJOR}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
++set(CMAKE_INDI_LIBVERSION_STRING "${INDI_SOVERSION}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
+ 
+ ##################  Paths  ################################
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
+@@ -138,7 +139,7 @@ target_link_libraries(indi ${CFITSIO_LIB
+ endif(CFITSIO_FOUND)
+ 
+ install(TARGETS indi LIBRARY DESTINATION ${LIB_DESTINATION})
+-set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION})
++set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_LIBVERSION_STRING} SOVERSION ${INDI_SOVERSION})
+ 
+ ##################################################
+ ############ INDI Main Static Library ############
diff --git a/debian/patches/series b/debian/patches/series
index b7e163a..841b4bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+abi.diff
 libdir.diff
diff --git a/debian/rules b/debian/rules
index 17c2bf2..6b4be94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,6 @@ override_dh_auto_configure:
 
 override_dh_strip:
 	dh_strip --dbg-package=indi-dbg
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V

-- 
libindi packaging



More information about the pkg-kde-commits mailing list