[libhttpseverywhere: 20/21] Merge branch 'v0.2'

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 08609865996d1d1189eb31ce91e01c536badc8aa
Merge: e1a2eeb db0a959
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Nov 22 08:34:59 2016 -0600

    Merge branch 'v0.2'

 meson.build |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --cc meson.build
index fd5c8a1,3273632..91e7307
--- a/meson.build
+++ b/meson.build
@@@ -66,26 -66,25 +66,26 @@@ custom_target('httpseverywhere-typelib'
                 install: true,
                 install_dir: get_option('libdir') + '/girepository-1.0')
  
 -
 -valadoc = find_program('valadoc')
 -custom_target('apidocs',
 -               input: httpseverywhere_lib_source,
 -               command: [valadoc, '-o', 'devhelp/httpseverywhere-0.2', '--doclet', 'devhelp', '@INPUT@',
 -               '--force', '--pkg', 'gee-0.8', '--pkg', 'json-glib-1.0', '--pkg', 'libxml-2.0', '--pkg', 
'libarchive', '--pkg', 'libsoup-2.4'],
 -               output: 'devhelp',
 -)
 +if get_option('enable_valadoc')
 +      valadoc = find_program('valadoc', required=false)
 +      custom_target('apidocs',
 +                   input: httpseverywhere_lib_source,
 +                   command: [valadoc, '-o', 'devhelp/httpseverywhere-'+api, '--doclet', 'devhelp', 
'@INPUT@',
 +                   '--force', '--pkg', 'gee-0.8', '--pkg', 'json-glib-1.0', '--pkg', 'libxml-2.0', '--pkg', 
'libarchive', '--pkg', 'libsoup-2.4'],
 +                   output: 'devhelp',
 +      )
 +endif
  
  pkgconfig.generate(libraries : httpseverywhere_lib,
-               version : '0.3.0',
-               name : 'libhttpseverywhere',
-               filebase : meson.current_build_dir()+'/httpseverywhere-'+api,
-               requires : 'glib-2.0 gobject-2.0 gio-2.0 json-glib-1.0 libxml-2.0 libsoup-2.4 gee-0.8 
libarchive',
-               subdirs: 'httpseverywhere-'+api,
-               description : 'A library to rewrite HTTP URLs to HTTPS URLs.',
-               install: true)
 -              version : '0.2.6',
 -              name : 'libhttpseverywhere',
 -              filebase : meson.current_build_dir()+'/httpseverywhere-'+api,
 -              requires : 'glib-2.0 gobject-2.0 gio-2.0 json-glib-1.0 libxml-2.0 libsoup-2.4 gee-0.8 
libarchive',
 -              subdirs: 'httpseverywhere-'+api,
 -              description : 'A library to rewrite HTTP URLs to HTTPS URLs.',
 -              install: true)
++                   version : '0.2.6',
++                   name : 'libhttpseverywhere',
++                   filebase : meson.current_build_dir()+'/httpseverywhere-'+api,
++                   requires : 'glib-2.0 gobject-2.0 gio-2.0 json-glib-1.0 libxml-2.0 libsoup-2.4 gee-0.8 
libarchive',
++                   subdirs: 'httpseverywhere-'+api,
++                   description : 'A library to rewrite HTTP URLs to HTTPS URLs.',
++                   install: true)
  
 -install_headers(meson.current_build_dir()+'/httpseverywhere-'+api+'/httpseverywhere.h', subdir: 
'httpseverywhere-0.2')
 +install_headers(meson.current_build_dir()+'/httpseverywhere-'+api+'/httpseverywhere.h', subdir: 
'httpseverywhere-'+api)
  install_subdir(meson.current_build_dir()+'/devhelp/httpseverywhere-'+api+'/httpseverywhere-'+api, 
install_dir: get_option('datadir')+'/devhelp/books')
  install_data('httpseverywhere-'+api+'.deps', install_dir: get_option('datadir') + '/vala/vapi')
  install_data(meson.current_build_dir()+'/httpseverywhere-'+api+'.vapi', install_dir: get_option('datadir') 
+ '/vala/vapi')