Commit a9009011 authored by Jeremy Bicha's avatar Jeremy Bicha

New upstream version 3.28.0

parents c9c86ff4 809dcb45
......@@ -2,13 +2,13 @@ GNOME MultiWriter Release Notes
* Write NEWS entries in the same format as usual.
git log --format="%s" GNOME_MULTI_WRITER_3_25_90.. | grep -i -v trivial | grep -v Merge | uniq
git log --format="%s" GNOME_MULTI_WRITER_3_26_0.. | grep -i -v trivial | grep -v Merge | uniq
Add any user visible changes into ../data/appdata/org.gnome.MultiWriter.appdata.xml.in
* Commit changes in git:
git commit -a -m "Release version 3.26.0"
git tag -s GNOME_MULTI_WRITER_3_26_0 -m "==== Version 3.25.91 ===="
git commit -a -m "Release version 3.28.0"
git tag -s GNOME_MULTI_WRITER_3_28_0 -m "==== Version 3.28.0 ===="
ninja dist
git push --tags
git push
......
#!/bin/bash
# configure script adapter for Meson
# Based on build-api: https://github.com/cgwalters/build-api
# Copyright 2010, 2011, 2013 Colin Walters <walters@verbum.org>
# Copyright 2016 Emmanuele Bassi
# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
# Build API variables:
# buildapi-variable-require-builddir
# Little helper function for reading args from the commandline.
# it automatically handles -a b and -a=b variants, and returns 1 if
# we need to shift $3.
read_arg() {
# $1 = arg name
# $2 = arg value
# $3 = arg parameter
local rematch='^[^=]*=(.*)$'
if [[ $2 =~ $rematch ]]; then
read "$1" <<< "${BASH_REMATCH[1]}"
else
read "$1" <<< "$3"
# There is no way to shift our callers args, so
# return 1 to indicate they should do it instead.
return 1
fi
}
sanitycheck() {
# $1 = arg name
# $1 = arg command
# $2 = arg alternates
local cmd=$( which $2 2>/dev/null )
if [ -x "$cmd" ]; then
read "$1" <<< "$cmd"
return 0
fi
test -z $3 || {
for alt in $3; do
cmd=$( which $alt 2>/dev/null )
if [ -x "$cmd" ]; then
read "$1" <<< "$cmd"
return 0
fi
done
}
echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
exit 1
}
sanitycheck MESON 'meson'
sanitycheck NINJA 'ninja' 'ninja-build'
enable_docs='-Denable-gtk-doc=false'
enable_man='-Denable-man=false'
enable_introspection=''
while (($# > 0)); do
case "${1%%=*}" in
--prefix) read_arg prefix "$@" || shift;;
--bindir) read_arg bindir "$@" || shift;;
--sbindir) read_arg sbindir "$@" || shift;;
--libexecdir) read_arg libexecdir "$@" || shift;;
--datarootdir) read_arg datarootdir "$@" || shift;;
--datadir) read_arg datadir "$@" || shift;;
--sysconfdir) read_arg sysconfdir "$@" || shift;;
--libdir) read_arg libdir "$@" || shift;;
--mandir) read_arg mandir "$@" || shift;;
--includedir) read_arg includedir "$@" || shift;;
--enable-gtk-doc) enable_docs='-Denable-gtk-doc=true';;
--disable-gtk-doc) enable_docs='-Denable-gtk-doc=false';;
--enable-man) enable_man='-Denable-man=true';;
--disable-man) enable_man='-Denable-man=false';;
--enable-introspection) enable_introspection='';;
--disable-introspection) enable_introspection='-Ddisable_introspection=true';;
*) echo -e "\e[1;33mINFO\e[0m: Ignoring unknown option '$1'";;
esac
shift
done
# Defaults
test -z ${prefix} && prefix="/usr/local"
test -z ${bindir} && bindir=${prefix}/bin
test -z ${sbindir} && sbindir=${prefix}/sbin
test -z ${libexecdir} && libexecdir=${prefix}/bin
test -z ${datarootdir} && datarootdir=${prefix}/share
test -z ${datadir} && datadir=${datarootdir}
test -z ${sysconfdir} && sysconfdir=${prefix}/etc
test -z ${libdir} && libdir=${prefix}/lib
test -z ${mandir} && mandir=${prefix}/share/man
test -z ${includedir} && includedir=${prefix}/include
# The source directory is the location of this file
srcdir=$(dirname $0)
# Wrapper Makefile for Ninja
cat > Makefile <<END
# Generated by configure; do not edit
all:
CC="\$(CC)" CXX="\$(CXX)" ${NINJA}
install:
DESTDIR="\$(DESTDIR)" ${NINJA} install
END
echo "Summary:"
echo " meson:....... ${MESON}"
echo " ninja:....... ${NINJA}"
echo " prefix:...... ${prefix}"
echo " bindir:...... ${bindir}"
echo " sbindir:..... ${sbindir}"
echo " libexecdir:.. ${libexecdir}"
echo " datarootdir:. ${datarootdir}"
echo " datadir:..... ${datadir}"
echo " sysconfdir:.. ${sysconfdir}"
echo " libdir:...... ${libdir}"
echo " mandir:...... ${mandir}"
echo " includedir:.. ${includedir}"
echo " additional:.."
echo " - ${enable_docs} ${enable_man} ${enable_introspection}"
exec ${MESON} \
--prefix=${prefix} \
--libdir=${libdir} \
--libexecdir=${libexecdir} \
--datadir=${datadir} \
--sysconfdir=${sysconfdir} \
--bindir=${bindir} \
--includedir=${includedir} \
--mandir=${mandir} \
--default-library shared \
${enable_docs} \
${enable_man} \
${enable_introspection} \
${srcdir}
# vim: ai ts=8 noet sts=2 ft=sh
......@@ -13,13 +13,13 @@ BuildRequires: docbook-utils
BuildRequires: gettext
BuildRequires: glib2-devel
BuildRequires: gtk3-devel
BuildRequires: intltool
BuildRequires: itstool
BuildRequires: libcanberra-devel >= 0.10
BuildRequires: libgusb-devel >= 0.2.4
BuildRequires: libudisks2-devel
BuildRequires: libgudev1-devel
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: polkit-devel
Requires: gnome-icon-theme-extras
......@@ -58,6 +58,7 @@ fi
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f %{name}.lang
%license COPYING
%doc README.md AUTHORS
%{_bindir}/%{name}
%{_libexecdir}/%{name}-probe
......
......@@ -4,5 +4,5 @@ i18n.merge_file(
type: 'xml',
po_dir: join_paths(meson.source_root(), 'po'),
install: true,
install_dir: join_paths(get_option('datadir'), 'appdata')
install_dir: join_paths(prefixed_datadir, 'metainfo'),
)
......@@ -61,6 +61,14 @@
Validate with `appstream-util validate *.appdata.xml`
-->
<releases>
<release date="2018-03-12" version="3.28.0">
<description>
<p>
This is the first stable release for GNOME 3.28 and updates several
translations.
</p>
</description>
</release>
<release date="2017-09-11" version="3.26.0">
<description>
<p>
......
install_data('16x16/org.gnome.MultiWriter.png',
install_dir : 'share/icons/hicolor/16x16/apps')
install_dir : join_paths(prefixed_datadir, 'icons/hicolor/16x16/apps'))
install_data('22x22/org.gnome.MultiWriter.png',
install_dir : 'share/icons/hicolor/22x22/apps')
install_dir : join_paths(prefixed_datadir, 'icons/hicolor/22x22/apps'))
install_data('32x32/org.gnome.MultiWriter.png',
install_dir : 'share/icons/hicolor/32x32/apps')
install_dir : join_paths(prefixed_datadir, 'icons/hicolor/32x32/apps'))
install_data('48x48/org.gnome.MultiWriter.png',
install_dir : 'share/icons/hicolor/48x48/apps')
install_dir : join_paths(prefixed_datadir, 'icons/hicolor/48x48/apps'))
install_data('256x256/org.gnome.MultiWriter.png',
install_dir : 'share/icons/hicolor/256x256/apps')
install_dir : join_paths(prefixed_datadir, 'icons/hicolor/256x256/apps'))
......@@ -3,7 +3,7 @@ subdir('icons')
compiled = gnome.compile_schemas()
install_data('org.gnome.MultiWriter.gschema.xml',
install_dir : 'share/glib-2.0/schemas'
install_dir : 'share/glib-2.0/schemas',
)
i18n.merge_file(
......@@ -12,7 +12,7 @@ i18n.merge_file(
type: 'desktop',
po_dir: join_paths(meson.source_root(), 'po'),
install: true,
install_dir: join_paths(get_option('datadir'), 'applications')
install_dir: join_paths(prefixed_datadir, 'applications'),
)
i18n.merge_file(
......@@ -21,5 +21,5 @@ i18n.merge_file(
type: 'xml',
po_dir: join_paths(meson.source_root(), 'po'),
install: true,
install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions')
install_dir: join_paths(prefixed_datadir, 'polkit-1', 'actions'),
)
<schemalist>
<schema id="org.gnome.MultiWriter" path="/org/gnome/MultiWriter/">
<schema id="org.gnome.MultiWriter" path="/org/gnome/MultiWriter/" gettext-domain="gnome-multi-writer">
<key name="filename" type="s">
<default>''</default>
<!-- TRANSLATORS: schema summary -->
......
......@@ -5,6 +5,6 @@ if docbook2man.found()
input : 'gnome-multi-writer.sgml',
command : [docbook2man, '@INPUT@', '--output', 'man'],
install : true,
install_dir : 'share/man/man1'
install_dir : join_paths(prefixed_mandir, 'man1'),
)
endif
project('gnome-multi-writer', 'c',
version : '3.26.0',
version : '3.28.0',
default_options : ['warning_level=1'],
meson_version : '>=0.37.0'
)
......@@ -74,9 +74,14 @@ foreach arg: test_link_args
endforeach
add_global_link_arguments(
global_link_args,
language: 'c'
language: 'c',
)
prefixed_localedir = join_paths(get_option('prefix'), get_option('localedir'))
prefixed_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
prefixed_mandir = join_paths(get_option('prefix'), get_option('mandir'))
prefixed_datadir = join_paths(get_option('prefix'), get_option('datadir'))
gtk = dependency('gtk+-3.0', version : '>= 3.11.2')
gio = dependency('gio-2.0')
gusb = dependency('gusb', version : '>= 0.2.7')
......@@ -90,15 +95,12 @@ i18n = import('i18n')
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('VERSION', meson.project_version())
conf.set_quoted('LOCALEDIR',
join_paths(get_option('prefix'),
get_option('localedir')))
conf.set_quoted('LIBEXECDIR',
join_paths(get_option('prefix'),
get_option('libexecdir')))
conf.set_quoted('LOCALEDIR', prefixed_localedir)
conf.set_quoted('LIBEXECDIR', prefixed_libexecdir)
configure_file(
output : 'config.h',
configuration : conf
configuration : conf,
)
subdir('src')
......
......@@ -15,6 +15,7 @@ hr
hu
id
it
nb
nl
oc
pl
......
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)
# These two variables depend on the location of this directory.
subdir = po
top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
# package. (Note that the msgstr strings, extracted from the package's
# sources, belong to the copyright holder of the package.) Translators are
# expected to transfer the copyright for their translations to this person
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
COPYRIGHT_HOLDER = Richard Hughes
# This tells whether or not to prepend "GNU " prefix to the package
# name that gets inserted into the header of the $(DOMAIN).pot file.
# Possible values are "yes", "no", or empty. If it is empty, try to
# detect it automatically by scanning the files in $(top_srcdir) for
# "GNU packagename" string.
PACKAGE_GNU = no
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
# - Strings which are not entire sentences, see the maintainer guidelines
# in the GNU gettext documentation, section 'Preparing Strings'.
# - Strings which use unclear terms or require additional context to be
# understood.
# - Strings which make invalid assumptions about notation of date, time or
# money.
# - Pluralisation problems.
# - Incorrect English spelling.
# - Incorrect formatting.
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
MSGID_BUGS_ADDRESS = richard@hughsie.com
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
# context. Possible values are "yes" and "no". Set this to yes if the
# package uses functions taking also a message context, like pgettext(), or
# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
USE_MSGCTXT = no
# These options get passed to msgmerge.
# Useful options are in particular:
# --previous to keep previous msgids of translated messages,
# --quiet to reduce the verbosity.
MSGMERGE_OPTIONS = --no-location --no-wrap
# These options get passed to msginit.
# If you want to disable line wrapping when writing PO files, add
# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
# MSGINIT_OPTIONS.
MSGINIT_OPTIONS = --no-wrap
# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
# has changed. Possible values are "yes" and "no". Set this to no if
# the POT file is checked in the repository and the version control
# program ignores timestamps.
PO_DEPENDS_ON_POT = no
# This tells whether or not to forcibly update $(DOMAIN).pot and
# regenerate PO files on "make dist". Possible values are "yes" and
# "no". Set this to no if the POT file and PO files are maintained
# externally.
DIST_DEPENDS_ON_UPDATE_PO = no
......@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-multi-writer master\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"multi-writer&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2017-04-30 19:25+0000\n"
"PO-Revision-Date: 2017-05-06 23:09+0200\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-multi-writer/"
"issues\n"
"POT-Creation-Date: 2018-01-26 15:54+0000\n"
"PO-Revision-Date: 2018-03-12 01:15+0100\n"
"Last-Translator: gogo <trebelnik2@gmail.com>\n"
"Language-Team: Croatian <hr@li.org>\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
......@@ -17,7 +18,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"Last-Translator: gogo <trebelnik2@gmail.com>\n"
"X-Generator: Poedit 1.8.7.1\n"
#. TRANSLATORS: the application name
......@@ -104,7 +104,7 @@ msgstr "Svi uređaji su zapisani"
#. TRANSLATORS: Do NOT translate or transliterate this text (this is an icon file name)!
#: data/org.gnome.MultiWriter.desktop.in:6
msgid "org.gnome.MultiWriter"
msgstr ""
msgstr "org.gnome.MultiWriter"
#. TRANSLATORS: these are desktop keywords - remember the trailing ';' :)
#: data/org.gnome.MultiWriter.desktop.in:12
......@@ -134,12 +134,12 @@ msgstr "Najveći broj korištenih paralelnih postupaka pri kopiranju podataka"
#. TRANSLATORS: schema summary
#: data/org.gnome.MultiWriter.gschema.xml:20
msgid "Completely blank drive when writing"
msgstr ""
msgstr "Potpuno isprazni uređaj pri zapisivanju"
#. TRANSLATORS: schema description
#: data/org.gnome.MultiWriter.gschema.xml:22
msgid "Write the ISO to the drive and then blank the remainder of the drive."
msgstr ""
msgstr "Zapiši ISO na uređaj a zatim isprazni ostatak uređaja."
#. TRANSLATORS: schema summary
#: data/org.gnome.MultiWriter.gschema.xml:27
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -4,7 +4,7 @@ gnome_multi_writer_resources = gnome.compile_resources(
'gnome-multi-writer-resources',
'gnome-multi-writer.gresource.xml',
source_dir : '.',
c_name : 'gmw'
c_name : 'gmw',
)
executable(
......@@ -27,7 +27,6 @@ executable(
],
c_args : cargs,
install : true,
install_dir : 'bin'
)
executable(
......@@ -44,5 +43,5 @@ executable(
],
c_args : cargs,
install : true,
install_dir : 'libexec'
install_dir : prefixed_libexecdir,
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment