gplugin/gplugin

flow: Merged <release> '0.23' to <master> ('default').
v0.23
2016-01-06, Gary Kramlich
7d5e467e1770
Parents 3a301b82626f4996ebc75142
Children 034d787e2d16
flow: Merged '0.23' to ('default').
9 files changed, 37 insertions(+), 7 deletions(-)
  • +1 -1
    .hgignore
  • +1 -1
    CMakeLists.txt
  • +5 -0
    ChangeLog
  • +14 -0
    Debian.md
  • +6 -1
    cmake/Modules/help2man.cmake
  • +1 -1
    lua/CMakeLists.txt
  • +2 -2
    lua/tests/CMakeLists.txt
  • +6 -0
    packaging/debian/changelog
  • +1 -1
    packaging/debian/control
    • --- a/.hgignore Tue Jun 30 20:23:18 2015 -0500
    +++ b/.hgignore Wed Jan 06 23:19:53 2016 -0600
    @@ -14,4 +14,4 @@
    ^packaging\/debian\/files$
    ^obj-x86_64-linux-gnu\/
    ^debian\/?$
    -
    +.+\.sublime-workspace
    --- a/CMakeLists.txt Tue Jun 30 20:23:18 2015 -0500
    +++ b/CMakeLists.txt Wed Jan 06 23:19:53 2016 -0600
    @@ -26,7 +26,7 @@
    set(GPLUGIN_MAJOR_VERSION 0)
    set(GPLUGIN_MINOR_VERSION 0)
    -set(GPLUGIN_MICRO_VERSION 22)
    +set(GPLUGIN_MICRO_VERSION 23)
    set(GPLUGIN_EXTRA_VERSION)
    set(GPLUGIN_VERSION ${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.${GPLUGIN_MICRO_VERSION}${GPLUGIN_EXTRA_VERSION})
    --- a/ChangeLog Tue Jun 30 20:23:18 2015 -0500
    +++ b/ChangeLog Wed Jan 06 23:19:53 2016 -0600
    @@ -1,3 +1,8 @@
    +0.0.23: 2016/01/06
    + * Made the moonscript tests option work
    + * Added Debian.md to explain how to use the Debian repository
    + * Install man pages in the correct directory on BSD
    +
    0.0.22: 2015/06/30
    * Made the moonscripts tests not interfer with the lua tests unless they're
    explicitly turned on
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Debian.md Wed Jan 06 23:19:53 2016 -0600
    @@ -0,0 +1,14 @@
    +Installing from Packages
    +========================
    +
    +There are packages available (more to come) via our debian mirror. You can
    +access it with the following commands.
    +
    + sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 75FE259AA8AC8032
    + echo "deb http://gplug.in/debian jessie main" | sudo tee /etc/apt/sources.list.d/gplugin.list
    + sudo apt-get update
    + sudo apt-get install libgplugin0 libgplugin-loaders
    +
    +You can use `apt-cache search gplugin` to see the other packages that are available
    +
    +
    --- a/cmake/Modules/help2man.cmake Tue Jun 30 20:23:18 2015 -0500
    +++ b/cmake/Modules/help2man.cmake Wed Jan 06 23:19:53 2016 -0600
    @@ -63,7 +63,12 @@
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    )
    - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_HELP2MAN_OUTPUT} DESTINATION share/man/man${_HELP2MAN_SECTION})
    + set(_HELP2MAN_DIR share/man/)
    + if(CMAKE_SYSTEM_NAME MATCHES .*BSD.*)
    + set(_HELP2MAN_DIR man/)
    + endif(CMAKE_SYSTEM_NAME MATCHES .*BSD.*)
    +
    + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_HELP2MAN_OUTPUT} DESTINATION ${_HELP2MAN_DIR}man${_HELP2MAN_SECTION})
    endfunction(help2man)
    --- a/lua/CMakeLists.txt Tue Jun 30 20:23:18 2015 -0500
    +++ b/lua/CMakeLists.txt Wed Jan 06 23:19:53 2016 -0600
    @@ -20,7 +20,7 @@
    gplugin-lua-plugin.h
    )
    - set(_LUAS "luajit>=2.0.0;lua>=5.1.0;lua5.2>=5.2.0;lua5.1>=5.1.0")
    + set(_LUAS "lua>=5.1.0;lua5.1>=5.1.0;luajit>=2.0.0;lua5.2>=5.2.0")
    foreach(_LUA ${_LUAS})
    if(NOT LUA_FOUND)
    pkg_check_modules(LUA ${_LUA})
    --- a/lua/tests/CMakeLists.txt Tue Jun 30 20:23:18 2015 -0500
    +++ b/lua/tests/CMakeLists.txt Wed Jan 06 23:19:53 2016 -0600
    @@ -24,10 +24,10 @@
    add_lua_gtest(test-lua-loader)
    target_link_libraries(test-lua-loader gplugin-loader-tests)
    -if(${MOONSCRIPT_TESTS})
    +if(MOONSCRIPT_TESTS)
    add_lua_gtest(test-lua-moon-loader)
    target_link_libraries(test-lua-moon-loader gplugin-loader-tests)
    -endif(${MOONSCRIPT_TESTS})
    +endif(MOONSCRIPT_TESTS)
    set(GTESTER_LUA_TESTS "${LUA_TESTS}")
    set(GTESTER_LUA_LOG "test-gplugin-lua.xml")
    --- a/packaging/debian/changelog Tue Jun 30 20:23:18 2015 -0500
    +++ b/packaging/debian/changelog Wed Jan 06 23:19:53 2016 -0600
    @@ -1,3 +1,9 @@
    +gplugin (0.0.23) unstable; urgency=medium
    +
    + * New release, see official changelog
    +
    + -- Gary Kramlich <grim@reaperworld.com> Wed, 06 Jan 2016 23:05:37 -0600
    +
    gplugin (0.0.21) unstable; urgency=medium
    * New release, see official changelog
    --- a/packaging/debian/control Tue Jun 30 20:23:18 2015 -0500
    +++ b/packaging/debian/control Wed Jan 06 23:19:53 2016 -0600
    @@ -116,7 +116,7 @@
    Package: libgplugin-lua
    Architecture: any
    -Depends: ${misc:Depends}, ${shlibs:Depends}, libluajit-5.1,
    +Depends: ${misc:Depends}, ${shlibs:Depends}, liblua5.1-0,
    libgplugin0, gir1.2-gplugin-0.0
    Description: GPlugin Lua Loader
    GPlugin is a GObject based library that implements a reusable plugin system