gplugin/gplugin

flow: Merged <release> '0.24' to <master> ('default').
v0.24
2016-01-28, Gary Kramlich
d67243b9c129
Parents 034d787e2d1602eae990b1d7
Children a81839bd031c
flow: Merged '0.24' to ('default').
22 files changed, 69 insertions(+), 173 deletions(-)
  • +13 -4
    CMakeLists.txt
  • +5 -0
    ChangeLog
  • +9 -7
    gplugin-gtk/CMakeLists.txt
  • +18 -14
    gplugin/CMakeLists.txt
  • +6 -0
    packaging/debian/changelog
  • +2 -25
    packaging/debian/control
  • +0 -1
    packaging/debian/copyright
  • +2 -2
    packaging/debian/gir1.2-gplugin-0.0.install
  • +3 -3
    packaging/debian/libgplugin-dev.install
  • +0 -1
    packaging/debian/libgplugin-gtk-bin.install
  • +3 -3
    packaging/debian/libgplugin-gtk-dev.install
  • +2 -2
    packaging/debian/libgplugin-gtk0.install
  • +0 -1
    packaging/debian/libgplugin-gtk0.postinst
  • +0 -1
    packaging/debian/libgplugin-gtk0.postrm
  • +0 -13
    packaging/debian/libgplugin-gtk0.symbols
  • +2 -2
    packaging/debian/libgplugin-lua.install
  • +2 -2
    packaging/debian/libgplugin-python.install
  • +2 -2
    packaging/debian/libgplugin0.install
  • +0 -1
    packaging/debian/libgplugin0.postinst
  • +0 -1
    packaging/debian/libgplugin0.postrm
  • +0 -79
    packaging/debian/libgplugin0.symbols
  • +0 -9
    packaging/debian/rules
    • --- a/CMakeLists.txt Wed Jan 06 23:19:53 2016 -0600
    +++ b/CMakeLists.txt Thu Jan 28 22:42:24 2016 -0600
    @@ -26,8 +26,8 @@
    set(GPLUGIN_MAJOR_VERSION 0)
    set(GPLUGIN_MINOR_VERSION 0)
    -set(GPLUGIN_MICRO_VERSION 23)
    -set(GPLUGIN_EXTRA_VERSION)
    +set(GPLUGIN_MICRO_VERSION 24)
    +set(GPLUGIN_EXTRA_VERSION dev)
    set(GPLUGIN_VERSION ${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.${GPLUGIN_MICRO_VERSION}${GPLUGIN_EXTRA_VERSION})
    @@ -55,6 +55,12 @@
    "On"
    )
    +option(
    + BUILD_HELP2MAN
    + "Whether or not to build man pages from --help output"
    + "on"
    +)
    +
    ###############################################################################
    # Dependencies
    ###############################################################################
    @@ -95,7 +101,10 @@
    include(GNUInstallDirs)
    include(FindPkgConfig)
    include(PkgConfigVariable)
    -include(help2man)
    +
    +if(BUILD_HELP2MAN)
    + include(help2man)
    +endif(BUILD_HELP2MAN)
    set(REQ_GLIB_VER 2.20.0)
    @@ -167,7 +176,7 @@
    )
    else(CMAKE_COMPILER_IS_GNUCC)
    add_definitions(
    - -DGPLUGIN_UNUSED=""
    + -DGPLUGIN_UNUSED=
    )
    endif(CMAKE_COMPILER_IS_GNUCC)
    --- a/ChangeLog Wed Jan 06 23:19:53 2016 -0600
    +++ b/ChangeLog Thu Jan 28 22:42:24 2016 -0600
    @@ -1,3 +1,8 @@
    +0.0.24: 2016/01/28
    + * Really fixed the debian package this time
    + * Made help2man optional
    + * Don't try to build the pot files if NLS is disabled
    +
    0.0.23: 2016/01/06
    * Made the moonscript tests option work
    * Added Debian.md to explain how to use the Debian repository
    --- a/gplugin-gtk/CMakeLists.txt Wed Jan 06 23:19:53 2016 -0600
    +++ b/gplugin-gtk/CMakeLists.txt Thu Jan 28 22:42:24 2016 -0600
    @@ -130,13 +130,15 @@
    gplugin
    )
    -help2man(
    - TARGET gplugin-gtk-viewer
    - OUTPUT gplugin-gtk-viewer.1
    - SECTION 1
    - NAME "View installed plugins"
    - HELP_OPTION --help-all
    -)
    +if(BUILD_HELP2MAN)
    + help2man(
    + TARGET gplugin-gtk-viewer
    + OUTPUT gplugin-gtk-viewer.1
    + SECTION 1
    + NAME "View installed plugins"
    + HELP_OPTION --help-all
    + )
    +endif(BUILD_HELP2MAN)
    install(TARGETS gplugin-gtk-viewer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
    --- a/gplugin/CMakeLists.txt Wed Jan 06 23:19:53 2016 -0600
    +++ b/gplugin/CMakeLists.txt Thu Jan 28 22:42:24 2016 -0600
    @@ -182,13 +182,15 @@
    )
    # nls
    -gettextize_pot_file(
    - SORT
    - LANGUAGES C
    - SOURCES ${GPLUGIN_SOURCES} ${GPLUGIN_NATIVE_SOURCES} gplugin-query.c
    - BUILT_SOURCES ${GPLUGIN_PUBLIC_BUILT_SOURCES}
    - FILENAME gplugin.pot
    -)
    +if(NLS)
    + gettextize_pot_file(
    + SORT
    + LANGUAGES C
    + SOURCES ${GPLUGIN_SOURCES} ${GPLUGIN_NATIVE_SOURCES} gplugin-query.c
    + BUILT_SOURCES ${GPLUGIN_PUBLIC_BUILT_SOURCES}
    + FILENAME gplugin.pot
    + )
    +endif(NLS)
    ###############################################################################
    # gplugin-query executable
    @@ -196,13 +198,15 @@
    add_executable(gplugin-query gplugin-query.c)
    target_link_libraries(gplugin-query ${GLIB_LIBRARIES} gplugin)
    -help2man(
    - TARGET gplugin-query
    - OUTPUT gplugin-query.1
    - SECTION 1
    - NAME "Query installed plugins"
    - HELP_OPTION --help-all
    -)
    +if(BUILD_HELP2MAN)
    + help2man(
    + TARGET gplugin-query
    + OUTPUT gplugin-query.1
    + SECTION 1
    + NAME "Query installed plugins"
    + HELP_OPTION --help-all
    + )
    +endif(BUILD_HELP2MAN)
    ###############################################################################
    # loader-tests static library
    --- a/packaging/debian/changelog Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/changelog Thu Jan 28 22:42:24 2016 -0600
    @@ -1,3 +1,9 @@
    +gplugin (0.0.24) unstable; urgency=medium
    +
    + * New upstream release, see official changelog
    +
    + -- Gary Kramlich <grim@reaperworld.com> Thu, 28 Jan 2016 22:38:05 -0600
    +
    gplugin (0.0.23) unstable; urgency=medium
    * New release, see official changelog
    --- a/packaging/debian/control Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/control Thu Jan 28 22:42:24 2016 -0600
    @@ -2,7 +2,8 @@
    Section: libs
    Priority: optional
    Maintainer: Gary Kramlich <grim@reaperworld.com>
    -Build-Depends: debhelper (>=9), cmake, libglib2.0-dev, libgtk-3-dev,
    +Build-Depends: debhelper (>=9), dh-exec,
    + cmake, libglib2.0-dev, libgtk-3-dev,
    xsltproc, gettext, help2man,
    gobject-introspection, libgirepository1.0-dev,
    liblua5.1-0-dev, lua-lgi,
    @@ -23,18 +24,6 @@
    .
    This package contains the main library.
    -Package: libgplugin0-dbg
    -Architecture: any
    -Section: debug
    -Priority: extra
    -Depends: ${misc:Depends}, libgplugin0 (= ${binary:Version})
    -Description: debugging symbols for libgplugin0
    - GPlugin is a GObject based library that implements a reusable plugin system
    - which supports loading plugins in other languages via loaders. It relies
    - heavily on GObjectIntrospection to expose its API to the other languages.
    - .
    - This package contains the debugging symbols for libgplugin0.
    -
    Package: libgplugin-dev
    Architecture: any
    Section: libdevel
    @@ -68,18 +57,6 @@
    .
    This library provides some default GTK+-3 widgets for GPlugin.
    -Package: libgplugin-gtk0-dbg
    -Architecture: any
    -Section: debug
    -Priority: extra
    -Depends: ${misc:Depends}, libgplugin-gtk0 (= ${binary:Version})
    -Description: debugging symbols for libgplugin-gtk0
    - GPlugin is a GObject based library that implements a reusable plugin system
    - which supports loading plugins in other languages via loaders. It relies
    - heavily on GObjectIntrospection to expose its API to the other languages.
    - .
    - This library provides the debugging symbols for libgplugin-gtk0
    -
    Package: libgplugin-gtk-dev
    Architecture: any
    Section: libdevel
    --- a/packaging/debian/copyright Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/copyright Thu Jan 28 22:42:24 2016 -0600
    @@ -23,4 +23,3 @@
    .
    On Debian systems, the complete text of the GNU Lesser General Public LIcense
    can be found in /usr/share/common-licenses/LGPL-3.
    -
    --- a/packaging/debian/gir1.2-gplugin-0.0.install Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/gir1.2-gplugin-0.0.install Thu Jan 28 22:42:24 2016 -0600
    @@ -1,3 +1,3 @@
    -usr/lib/*/girepository-1.0/
    +#!/usr/bin/dh-exec
    +usr/lib/${DEB_HOST_MULTIARCH}/girepository-1.0/
    usr/share/gir-1.0/
    -
    --- a/packaging/debian/libgplugin-dev.install Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin-dev.install Thu Jan 28 22:42:24 2016 -0600
    @@ -1,6 +1,6 @@
    +#!/usr/bin/dh-exec
    usr/include/gplugin-1.0/gplugin
    usr/include/gplugin-1.0/gplugin.h
    usr/include/gplugin-1.0/gplugin-native.h
    -usr/lib/*/libgplugin.so
    -usr/lib/*/pkgconfig/gplugin.pc
    -
    +usr/lib/${DEB_HOST_MULTIARCH}/libgplugin.so
    +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gplugin.pc
    --- a/packaging/debian/libgplugin-gtk-bin.install Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin-gtk-bin.install Thu Jan 28 22:42:24 2016 -0600
    @@ -1,3 +1,2 @@
    usr/bin/gplugin-gtk-viewer
    usr/share/man/man1/gplugin-gtk-viewer.1
    -
    --- a/packaging/debian/libgplugin-gtk-dev.install Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin-gtk-dev.install Thu Jan 28 22:42:24 2016 -0600
    @@ -1,5 +1,5 @@
    +#!/usr/bin/dh-exec
    usr/include/gplugin-1.0/gplugin-gtk
    usr/include/gplugin-1.0/gplugin-gtk.h
    -usr/lib/*/libgplugin-gtk.so
    -usr/lib/*/pkgconfig/gplugin-gtk.pc
    -
    +usr/lib/${DEB_HOST_MULTIARCH}/libgplugin-gtk.so
    +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gplugin-gtk.pc
    --- a/packaging/debian/libgplugin-gtk0.install Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin-gtk0.install Thu Jan 28 22:42:24 2016 -0600
    @@ -1,2 +1,2 @@
    -usr/lib/*/libgplugin-gtk.so.*
    -
    +#!/usr/bin/dh-exec
    +usr/lib/${DEB_HOST_MULTIARCH}/libgplugin-gtk.so.*
    --- a/packaging/debian/libgplugin-gtk0.postinst Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin-gtk0.postinst Thu Jan 28 22:42:24 2016 -0600
    @@ -9,4 +9,3 @@
    #DEBHELPER#
    exit 0
    -
    --- a/packaging/debian/libgplugin-gtk0.postrm Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin-gtk0.postrm Thu Jan 28 22:42:24 2016 -0600
    @@ -9,4 +9,3 @@
    #DEBHELPER#
    exit 0
    -
    --- a/packaging/debian/libgplugin-gtk0.symbols Wed Jan 06 23:19:53 2016 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,13 +0,0 @@
    -libgplugin-gtk.so.0 libgplugin-gtk0 #MINVER#
    - gplugin_gtk_get_store_column_types@Base 0.0.17
    - gplugin_gtk_plugin_info_get_plugin@Base 0.0.17
    - gplugin_gtk_plugin_info_get_type@Base 0.0.17
    - gplugin_gtk_plugin_info_new@Base 0.0.17
    - gplugin_gtk_plugin_info_set_plugin@Base 0.0.17
    - gplugin_gtk_store_get_type@Base 0.0.17
    - gplugin_gtk_store_new@Base 0.0.17
    - gplugin_gtk_view_get_show_internal@Base 0.0.17
    - gplugin_gtk_view_get_type@Base 0.0.17
    - gplugin_gtk_view_new@Base 0.0.17
    - gplugin_gtk_view_set_show_internal@Base 0.0.17
    -
    --- a/packaging/debian/libgplugin-lua.install Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin-lua.install Thu Jan 28 22:42:24 2016 -0600
    @@ -1,2 +1,2 @@
    -usr/lib/*/gplugin/gplugin-lua.so usr/lib/*/gplugin
    -
    +#!/usr/bin/dh-exec
    +usr/lib/${DEB_HOST_MULTIARCH}/gplugin/gplugin-lua.so
    --- a/packaging/debian/libgplugin-python.install Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin-python.install Thu Jan 28 22:42:24 2016 -0600
    @@ -1,2 +1,2 @@
    -usr/lib/*/gplugin/gplugin-python.so usr/lib/*/gplugin
    -
    +#!/usr/bin/dh-exec
    +usr/lib/${DEB_HOST_MULTIARCH}/gplugin/gplugin-python.so
    --- a/packaging/debian/libgplugin0.install Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin0.install Thu Jan 28 22:42:24 2016 -0600
    @@ -1,4 +1,4 @@
    -usr/lib/*/libgplugin.so.*
    +#!/usr/bin/dh-exec
    +usr/lib/${DEB_HOST_MULTIARCH}/libgplugin.so.*
    usr/bin/gplugin-query
    usr/share/man/man1/gplugin-query.1
    -
    --- a/packaging/debian/libgplugin0.postinst Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin0.postinst Thu Jan 28 22:42:24 2016 -0600
    @@ -5,4 +5,3 @@
    #DEBHELPER#
    exit 0
    -
    --- a/packaging/debian/libgplugin0.postrm Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/libgplugin0.postrm Thu Jan 28 22:42:24 2016 -0600
    @@ -5,4 +5,3 @@
    #DEBHELPER#
    exit 0
    -
    --- a/packaging/debian/libgplugin0.symbols Wed Jan 06 23:19:53 2016 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,79 +0,0 @@
    -libgplugin.so.0 libgplugin0 #MINVER#
    - dependency_pattern@Base 0.0.17
    - dependency_regex@Base 0.0.17
    - gplugin_boolean_accumulator@Base 0.0.17
    - gplugin_file_tree_entry_free@Base 0.0.17
    - gplugin_file_tree_entry_new@Base 0.0.17
    - gplugin_file_tree_free@Base 0.0.17
    - gplugin_file_tree_new@Base 0.0.17
    - gplugin_get_option_group@Base 0.0.17
    - gplugin_init@Base 0.0.17
    - gplugin_loader_class_get_supported_extensions@Base 0.0.17
    - gplugin_loader_get_type@Base 0.0.17
    - gplugin_loader_load_plugin@Base 0.0.17
    - gplugin_loader_query_plugin@Base 0.0.17
    - gplugin_loader_unload_plugin@Base 0.0.17
    - gplugin_manager_add_app_paths@Base 0.0.17
    - gplugin_manager_add_default_paths@Base 0.0.17
    - gplugin_manager_append_path@Base 0.0.17
    - gplugin_manager_find_plugin@Base 0.0.17
    - gplugin_manager_find_plugins@Base 0.0.17
    - gplugin_manager_free_plugin_list@Base 0.0.17
    - gplugin_manager_get_instance@Base 0.0.17
    - gplugin_manager_get_paths@Base 0.0.17
    - gplugin_manager_get_type@Base 0.0.17
    - gplugin_manager_list_plugins@Base 0.0.17
    - gplugin_manager_load_plugin@Base 0.0.17
    - gplugin_manager_prepend_path@Base 0.0.17
    - gplugin_manager_private_init@Base 0.0.17
    - gplugin_manager_private_uninit@Base 0.0.17
    - gplugin_manager_refresh@Base 0.0.17
    - gplugin_manager_register_loader@Base 0.0.17
    - gplugin_manager_remove_path@Base 0.0.17
    - gplugin_manager_remove_paths@Base 0.0.17
    - gplugin_manager_unload_plugin@Base 0.0.17
    - gplugin_manager_unregister_loader@Base 0.0.17
    - gplugin_marshal_BOOLEAN__OBJECT_POINTER@Base 0.0.17
    - gplugin_marshal_VOID__ENUM_ENUM@Base 0.0.17
    - gplugin_marshal_VOID__INT_INT@Base 0.0.17
    - gplugin_native_loader_get_type@Base 0.0.17
    - gplugin_native_plugin_add_interface@Base 0.0.17
    - gplugin_native_plugin_get_module@Base 0.0.17
    - gplugin_native_plugin_get_type@Base 0.0.17
    - gplugin_native_plugin_register_enum@Base 0.0.17
    - gplugin_native_plugin_register_flags@Base 0.0.17
    - gplugin_native_plugin_register_type@Base 0.0.17
    - gplugin_native_plugin_unuse@Base 0.0.17
    - gplugin_native_plugin_use@Base 0.0.17
    - gplugin_plugin_get_filename@Base 0.0.17
    - gplugin_plugin_get_info@Base 0.0.17
    - gplugin_plugin_get_internal_filename@Base 0.0.17
    - gplugin_plugin_get_loader@Base 0.0.17
    - gplugin_plugin_get_state@Base 0.0.17
    - gplugin_plugin_get_type@Base 0.0.17
    - gplugin_plugin_info_get_abi_version@Base 0.0.17
    - gplugin_plugin_info_get_authors@Base 0.0.17
    - gplugin_plugin_info_get_bind_local@Base 0.0.17
    - gplugin_plugin_info_get_category@Base 0.0.17
    - gplugin_plugin_info_get_dependencies@Base 0.0.17
    - gplugin_plugin_info_get_description@Base 0.0.17
    - gplugin_plugin_info_get_help@Base 0.0.17
    - gplugin_plugin_info_get_icon@Base 0.0.17
    - gplugin_plugin_info_get_id@Base 0.0.17
    - gplugin_plugin_info_get_internal@Base 0.0.17
    - gplugin_plugin_info_get_license_id@Base 0.0.17
    - gplugin_plugin_info_get_license_text@Base 0.0.17
    - gplugin_plugin_info_get_license_url@Base 0.0.17
    - gplugin_plugin_info_get_load_on_query@Base 0.0.17
    - gplugin_plugin_info_get_name@Base 0.0.17
    - gplugin_plugin_info_get_summary@Base 0.0.17
    - gplugin_plugin_info_get_type@Base 0.0.17
    - gplugin_plugin_info_get_version@Base 0.0.17
    - gplugin_plugin_info_get_version_func@Base 0.0.17
    - gplugin_plugin_info_get_website@Base 0.0.17
    - gplugin_plugin_set_state@Base 0.0.17
    - gplugin_plugin_state_get_type@Base 0.0.17
    - gplugin_uninit@Base 0.0.17
    - gplugin_version_compare@Base 0.0.17
    - instance@Base 0.0.17
    - regex@Base 0.0.17
    --- a/packaging/debian/rules Wed Jan 06 23:19:53 2016 -0600
    +++ b/packaging/debian/rules Thu Jan 28 22:42:24 2016 -0600
    @@ -3,12 +3,3 @@
    %:
    dh $@
    -override_dh_makeshlibs:
    - dh_makeshlibs -plibgplugin0
    - dh_makeshlibs -plibgplugin-gtk0
    -
    -override_dh_strip:
    - dh_strip -plibgplugin0 --dbg-package=libgplugin0-dbg
    - dh_strip -plibgplugin-gtk0 --dbg-package=libgplugin-gtk0-dbg
    - dh_strip
    -