gplugin/gplugin

flow: Merged <release> '0.23' to <develop> ('develop').
develop
2016-01-06, Gary Kramlich
b08ff296e40a
Parents 30a219bab2e94996ebc75142
Children 44babc222683
flow: Merged '0.23' to ('develop').
6 files changed, 11 insertions(+), 5 deletions(-)
  • +1 -1
    .hgignore
  • +1 -1
    CMakeLists.txt
  • +1 -1
    ChangeLog
  • +1 -1
    lua/CMakeLists.txt
  • +6 -0
    packaging/debian/changelog
  • +1 -1
    packaging/debian/control
    • --- a/.hgignore Wed Jan 06 22:54:21 2016 -0600
    +++ 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 Wed Jan 06 22:54:21 2016 -0600
    +++ b/CMakeLists.txt Wed Jan 06 23:19:53 2016 -0600
    @@ -27,7 +27,7 @@
    set(GPLUGIN_MAJOR_VERSION 0)
    set(GPLUGIN_MINOR_VERSION 0)
    set(GPLUGIN_MICRO_VERSION 23)
    -set(GPLUGIN_EXTRA_VERSION dev)
    +set(GPLUGIN_EXTRA_VERSION)
    set(GPLUGIN_VERSION ${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.${GPLUGIN_MICRO_VERSION}${GPLUGIN_EXTRA_VERSION})
    --- a/ChangeLog Wed Jan 06 22:54:21 2016 -0600
    +++ b/ChangeLog Wed Jan 06 23:19:53 2016 -0600
    @@ -1,4 +1,4 @@
    -0.0.23:
    +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
    --- a/lua/CMakeLists.txt Wed Jan 06 22:54:21 2016 -0600
    +++ 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/packaging/debian/changelog Wed Jan 06 22:54:21 2016 -0600
    +++ 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 Wed Jan 06 22:54:21 2016 -0600
    +++ 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