diff options
| author | Enrico Zini <enrico@enricozini.org> | 2011-03-20 18:57:23 +0000 |
|---|---|---|
| committer | Enrico Zini <enrico@enricozini.org> | 2011-03-20 18:57:23 +0000 |
| commit | 6f8645c1dfd1d967a929aa5a3fbcb2e7503293a5 (patch) | |
| tree | 2649b0830a481fed84f24bcf09c9dc4914503f41 | |
| parent | def083ac98b56b2e64511c4107fe48a78cbb8dbf (diff) | |
| download | libept-6f8645c1dfd1d967a929aa5a3fbcb2e7503293a5.tar.gz | |
Do not ship .m4 file anymore, as it's just a trivial invocation of pkg-config
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/libept-dev.install | 1 | ||||
| -rw-r--r-- | ept/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ept/libept.m4 | 9 |
5 files changed, 8 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a47550..5de36f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ include( FindDoxygen ) add_custom_target( unit ) -set( EPT_VERSION "1.0.4" ) +set( EPT_VERSION "1.0.5" ) 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 5d30050..9f26856 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libept (1.0.5) unstable; urgency=low + + * Do not ship .m4 file anymore, as it's just a trivial invocation of + pkg-config + + -- Enrico Zini <enrico@debian.org> Sun, 20 Mar 2011 18:56:42 +0000 + libept (1.0.4) unstable; urgency=low * Fix broken tag names in /var/lib/debtags/vocabulary. Closes: #601417. diff --git a/debian/libept-dev.install b/debian/libept-dev.install index 9bb1aca..18a4201 100644 --- a/debian/libept-dev.install +++ b/debian/libept-dev.install @@ -2,5 +2,4 @@ debian/tmp/usr/include/* debian/tmp/usr/lib/lib*.a debian/tmp/usr/lib/lib*.so debian/tmp/usr/lib/pkgconfig/* -debian/tmp/usr/share/aclocal/*.m4 debian/tmp/usr/share/doc/libept-dev/* diff --git a/ept/CMakeLists.txt b/ept/CMakeLists.txt index 6e9d587..1af7295 100644 --- a/ept/CMakeLists.txt +++ b/ept/CMakeLists.txt @@ -80,8 +80,6 @@ install( TARGETS ept ept-static ARCHIVE DESTINATION lib ) install( FILES ${ept_BINARY_DIR}/libept.pc DESTINATION lib/pkgconfig ) -install( FILES libept.m4 DESTINATION share/aclocal ) - install( FILES ${h_top} DESTINATION include/ept ) install( FILES ${h_apt} DESTINATION include/ept/apt ) install( FILES ${h_debtags} DESTINATION include/ept/debtags ) diff --git a/ept/libept.m4 b/ept/libept.m4 deleted file mode 100644 index 8bd83be..0000000 --- a/ept/libept.m4 +++ /dev/null @@ -1,9 +0,0 @@ -# LIBEPT_DEFS([LIBEPT_REQS=libtagcoll2]) -# --------------------------------------- -AC_DEFUN([LIBEPT_DEFS], -[ - dnl Import libtagcoll data - PKG_CHECK_MODULES(LIBEPT,m4_default([$1], libept)) - AC_SUBST(LIBEPT_CFLAGS) - AC_SUBST(LIBEPT_LIBS) -]) |