diff options
| author | Michael Vogt <egon@debian-devbox> | 2012-01-24 14:14:55 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2012-01-24 14:31:50 +0100 |
| commit | e723bd9ef784ec2516cd36a2dfcfd57d74ef453a (patch) | |
| tree | 287ecaec1437b3a0ae7844d5afce98feab472787 | |
| parent | 9e7d767a9af5fa2f18cbd12b8f81dc3b0253f938 (diff) | |
| download | libept-e723bd9ef784ec2516cd36a2dfcfd57d74ef453a.tar.gz | |
* build against libapt in experimental
* debian/control:
- encode apt ABI version in libept1 package name
* ept/CMakeLists.txt:
- do not set "SOVERSION 1" anymore, use full VERSION instead
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/libept1.4.12.install (renamed from debian/libept1.install) | 0 | ||||
| -rw-r--r-- | ept/CMakeLists.txt | 4 |
5 files changed, 16 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5de36f1..1154891 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,8 @@ include( FindDoxygen ) add_custom_target( unit ) -set( EPT_VERSION "1.0.5" ) +set( LIBAPT_ABI_VERSION "4.12" ) +set( EPT_VERSION "1.0.5.${LIBAPT_ABI_VERSION}" ) set( APT_INCLUDES "/usr/include/" CACHE STRING "apt include path" ) set( APT_LINKDIRS "/usr/lib/" CACHE STRING "apt library path" ) set( OPT_FLAGS "-O0 -g" CACHE STRING "optimization level" ) diff --git a/debian/changelog b/debian/changelog index 0ed83be..a0b6c24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libept (1.0.6~exp1) experimental; urgency=low + + * build against libapt in experimental + * debian/control: + - encode apt ABI version in libept1 package name + * ept/CMakeLists.txt: + - do not set "SOVERSION 1" anymore, use full VERSION instead + + -- Michael Vogt <mvo@debian.org> Tue, 24 Jan 2012 14:05:56 +0100 + libept (1.0.5) unstable; urgency=low * Do not ship .m4 file anymore, as it's just a trivial invocation of diff --git a/debian/control b/debian/control index 6d1f581..2162e43 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Package: libept-dev Section: libdevel Architecture: any Recommends: pkg-config -Depends: libept1 (= ${binary:Version}), libwibble-dev (>= 0.1.21), libwibble-dev (<< 0.2), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libapt-pkg-dev (>= 0.6.46.1), libxapian-dev (>= 1.0.5), ${misc:Depends} +Depends: libept1.4.12 (= ${binary:Version}), libwibble-dev (>= 0.1.21), libwibble-dev (<< 0.2), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libapt-pkg-dev (>= 0.6.46.1), libxapian-dev (>= 1.0.5), ${misc:Depends} Conflicts: debtags (<< 0.7) Description: High-level library for managing Debian package information The library defines a very minimal framework in which many sources of data @@ -27,7 +27,7 @@ Description: High-level library for managing Debian package information . This is the development library. -Package: libept1 +Package: libept1.4.12 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/libept1.install b/debian/libept1.4.12.install index c45ebcf..c45ebcf 100644 --- a/debian/libept1.install +++ b/debian/libept1.4.12.install diff --git a/ept/CMakeLists.txt b/ept/CMakeLists.txt index 1af7295..c28b3ec 100644 --- a/ept/CMakeLists.txt +++ b/ept/CMakeLists.txt @@ -26,8 +26,8 @@ add_definitions( -fexceptions -fPIC -fvisibility=default ) add_library( ept SHARED ${src} ) add_library( ept-static STATIC ${src} ) -set_target_properties( ept PROPERTIES VERSION ${EPT_VERSION} SOVERSION 1 CLEAN_DIRECT_OUTPUT 1) -set_target_properties( ept-static PROPERTIES VERSION ${EPT_VERSION} SOVERSION 1 OUTPUT_NAME "ept" CLEAN_DIRECT_OUTPUT 1) +set_target_properties( ept PROPERTIES VERSION ${EPT_VERSION} CLEAN_DIRECT_OUTPUT 1) +set_target_properties( ept-static PROPERTIES VERSION ${EPT_VERSION} OUTPUT_NAME "ept" CLEAN_DIRECT_OUTPUT 1) set( TEST_ENV_DIR ${ept_BINARY_DIR}/test-env/ ) |