Hello community,
here is the log from the commit of package yast2-devtools for openSUSE:Factory
checked in at 2013-08-01 11:07:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old)
and /work/SRC/openSUSE:Factory/.yast2-devtools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-devtools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes
2013-07-29 09:26:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes
2013-08-01 11:07:59.000000000 +0200
@@ -1,0 +2,24 @@
+Tue Jul 30 08:28:39 UTC 2013 - yast-de...@opensuse.org
+
+- version 3.0.0
+
+-------------------------------------------------------------------
+Mon Jul 29 06:27:32 UTC 2013 - lsle...@suse.cz
+
+- autodocs fixes:
+ - doxygen: install _all_ JS and CSS files (dynsections.js,
+ jquery.js and tabs.css were missing, resulting in unusable
+ documentation)
+ - doxygen: updated the default doxygen config file - removed
+ obsolete options which caused warnings during build
+ - yard: use --title option with package name
+- 2.24.7
+
+-------------------------------------------------------------------
+Fri Jul 26 13:22:40 UTC 2013 - lsle...@suse.cz
+
+- y2makepot (used in "make pot") - extract translatable strings
+ from Ruby files using rxgettext (rubygem-gettext)
+- 2.24.6
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-2.24.5.tar.bz2
New:
----
yast2-devtools-3.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.JH029p/_old 2013-08-01 11:08:00.000000000 +0200
+++ /var/tmp/diff_new_pack.JH029p/_new 2013-08-01 11:08:00.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-devtools
-Version: 2.24.5
+Version: 3.0.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -52,6 +52,10 @@
Recommends: doxygen
# for svn builds of binary packages
Recommends: libtool
+# for extracting translatable strings from *.rb files using "make pot" command
+# weak dependency, "make pot" is usually not needed
+Suggests: rubygem-gettext
+
Provides: ycpdoc
Provides: ydoc
Obsoletes: ycpdoc
++++++ yast2-devtools-2.24.5.tar.bz2 -> yast2-devtools-3.0.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-2.24.5/VERSION
new/yast2-devtools-3.0.0/VERSION
--- old/yast2-devtools-2.24.5/VERSION 2013-07-24 10:51:32.000000000 +0200
+++ new/yast2-devtools-3.0.0/VERSION 2013-07-30 10:34:54.000000000 +0200
@@ -1 +1 @@
-2.24.5
+3.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-2.24.5/configure
new/yast2-devtools-3.0.0/configure
--- old/yast2-devtools-2.24.5/configure 2013-07-24 10:52:32.000000000 +0200
+++ new/yast2-devtools-3.0.0/configure 2013-07-30 10:35:12.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-devtools 2.24.5.
+# Generated by GNU Autoconf 2.69 for yast2-devtools 3.0.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-devtools'
PACKAGE_TARNAME='yast2-devtools'
-PACKAGE_VERSION='2.24.5'
-PACKAGE_STRING='yast2-devtools 2.24.5'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='yast2-devtools 3.0.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1383,7 +1383,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-devtools 2.24.5 to adapt to many kinds of
systems.
+\`configure' configures yast2-devtools 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1454,7 +1454,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-devtools 2.24.5:";;
+ short | recursive ) echo "Configuration of yast2-devtools 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1571,7 +1571,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-devtools configure 2.24.5
+yast2-devtools configure 3.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1970,7 +1970,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-devtools $as_me 2.24.5, which was
+It was created by yast2-devtools $as_me 3.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2909,7 +2909,7 @@
# Define the identity of the package.
PACKAGE='yast2-devtools'
- VERSION='2.24.5'
+ VERSION='3.0.0'
cat >>confdefs.h <<_ACEOF
@@ -3032,7 +3032,7 @@
-VERSION="2.24.5"
+VERSION="3.0.0"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
@@ -16315,7 +16315,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-devtools $as_me 2.24.5, which was
+This file was extended by yast2-devtools $as_me 3.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16372,7 +16372,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-devtools config.status 2.24.5
+yast2-devtools config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-2.24.5/configure.ac
new/yast2-devtools-3.0.0/configure.ac
--- old/yast2-devtools-2.24.5/configure.ac 2013-07-24 10:51:54.000000000
+0200
+++ new/yast2-devtools-3.0.0/configure.ac 2013-07-30 10:35:02.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2-devtools
dnl
-dnl -- This file is generated by y2autoconf 2.24.5 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.0 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2-devtools, 2.24.5, http://bugs.opensuse.org/, yast2-devtools)
+AC_INIT(yast2-devtools, 3.0.0, http://bugs.opensuse.org/, yast2-devtools)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.24.5"
+VERSION="3.0.0"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-devtools-2.24.5/devtools/admin/aminclude/autodocs-cc-base.ami
new/yast2-devtools-3.0.0/devtools/admin/aminclude/autodocs-cc-base.ami
--- old/yast2-devtools-2.24.5/devtools/admin/aminclude/autodocs-cc-base.ami
2013-01-21 16:11:19.000000000 +0100
+++ new/yast2-devtools-3.0.0/devtools/admin/aminclude/autodocs-cc-base.ami
2013-07-29 09:48:32.000000000 +0200
@@ -15,7 +15,7 @@
AUTODOCS_CC ?= $(srcdir)/../../src
AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h
-html_data = index.html $(filter-out index.html, $(wildcard *.html *.png))
doxygen.css @RPMNAME@.tag
+html_data = index.html $(filter-out index.html, $(wildcard *.html *.png *.css
*.js)) @RPMNAME@.tag
CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox
doxygen.css @RPMNAME@.tag: index.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-devtools-2.24.5/devtools/admin/aminclude/autodocs-ycp.ami
new/yast2-devtools-3.0.0/devtools/admin/aminclude/autodocs-ycp.ami
--- old/yast2-devtools-2.24.5/devtools/admin/aminclude/autodocs-ycp.ami
2013-07-23 10:47:13.000000000 +0200
+++ new/yast2-devtools-3.0.0/devtools/admin/aminclude/autodocs-ycp.ami
2013-07-29 09:48:32.000000000 +0200
@@ -44,4 +44,4 @@
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
- if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS)
$(AUTODOCS_RB); fi
+ if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc --title "@RPMNAME@ --
Development Documentation" $(YARD_OPTIONS) $(AUTODOCS_RB); fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-2.24.5/devtools/bin/gettextdomains
new/yast2-devtools-3.0.0/devtools/bin/gettextdomains
--- old/yast2-devtools-2.24.5/devtools/bin/gettextdomains 2013-01-21
16:11:19.000000000 +0100
+++ new/yast2-devtools-3.0.0/devtools/bin/gettextdomains 2013-07-29
09:16:48.000000000 +0200
@@ -21,7 +21,8 @@
-o -name "*.pm" \
-o -name "*.c" \
-o -name "*.cc" \
- -o -name "*.cpp"`
+ -o -name "*.cpp" \
+ -o -name "*.rb"`
if test "$?" != "0"; then
echo "Error: check-pot terminated unexpected."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-2.24.5/devtools/bin/version
new/yast2-devtools-3.0.0/devtools/bin/version
--- old/yast2-devtools-2.24.5/devtools/bin/version 2013-07-24
10:53:34.000000000 +0200
+++ new/yast2-devtools-3.0.0/devtools/bin/version 2013-07-30
10:35:23.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 2.24.5
+echo 3.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-2.24.5/devtools/bin/y2makepot
new/yast2-devtools-3.0.0/devtools/bin/y2makepot
--- old/yast2-devtools-2.24.5/devtools/bin/y2makepot 2013-01-21
16:11:19.000000000 +0100
+++ new/yast2-devtools-3.0.0/devtools/bin/y2makepot 2013-07-29
09:16:48.000000000 +0200
@@ -16,18 +16,65 @@
CWD=`dirname $0`
. $CWD/gettextdomains
+function gettext_call()
+{
+ MODULE=$1
+ SOURCE_FILES=$2
+ SOURCE_RUBY_FILES=$3
+
+ # Is POT file merge needed? (both Ruby and non-Ruby files found)
+ if [ -n "$SOURCE_FILES" -a -n "$SOURCE_RUBY_FILES" ]; then
+ # only one header is sufficient when merging POT files,
+ # more over it has undefined CHARSET which makes trouble
+ # when merging with rxgettext POT file (declares UTF-8 charset)
+ xgettext_call "$MODULE" "$SOURCE_FILES" "--omit-header"
+ mv "$MODULE.pot" "$MODULE.xgettext.pot"
+
+ rxgettext_call "$MODULE" "$SOURCE_RUBY_FILES"
+ mv "$MODULE.pot" "$MODULE.rxgettext.pot"
+
+ # merge the rxgettext POT with the xgettext POT file
+ echo "Merging the .pot files..."
+ msgcat -o "$MODULE.pot" "$MODULE.rxgettext.pot" "$MODULE.xgettext.pot"
+ rm "$MODULE.xgettext.pot" "$MODULE.rxgettext.pot"
+ else
+ xgettext_call "$MODULE" "$SOURCE_FILES"
+ rxgettext_call "$MODULE" "$SOURCE_RUBY_FILES"
+ fi
+}
function xgettext_call()
{
MODULE=$1
FILES=$2
+ OPTIONS=$3
+
+ if [ -n "$FILES" ]; then
+ echo "Creating ./$MODULE.pot from $FILES ...";
+ $XGETTEXT --no-wrap --add-comments --add-location \
+ --keyword=_ --keyword=_:1,2 --keyword=__ \
+ --foreign-user $OPTIONS \
+ --copyright-holder="SuSE Linux Products GmbH, Nuernberg" \
+ --default-domain=$MODULE --output=$MODULE.pot $FILES
+ fi
+}
+
+function rxgettext_call()
+{
+ MODULE=$1
+ FILES=$2
+
+ if [ -n "$FILES" ]; then
+ echo "Creating ./$MODULE.pot from $FILES ...";
- echo "Creating ./$MODULE.pot from $FILES ...";
- $XGETTEXT --no-wrap --add-comments --add-location \
- --keyword=_ --keyword=_:1,2 --keyword=__ \
- --foreign-user \
- --copyright-holder="SuSE Linux Products GmbH, Nuernberg" \
- --default-domain=$MODULE --output=$MODULE.pot $FILES
+ # rubygem-gettext is a weak dependency, check if it is present
+ if [ -x $RXGETTEXT ]; then
+ $RXGETTEXT --output=$MODULE.pot $FILES;
+ else
+ echo "ERROR: $RXGETTEXT is missing; please install rubygem-gettext
package" 1>&2
+ exit 1
+ fi
+ fi
}
function usage()
@@ -62,6 +109,8 @@
# gather files that share a domain to FILES and call xgettext
FILES="";
+ RUBY_FILES=""
+
for I in $DOMAINS; do
D=${I%%:*} ;
F=${I#*:} ;
@@ -69,18 +118,24 @@
if [ "$D" != "$MODULE" ]; then
POT_DST="$POT_DST $MODULE.pot"
- xgettext_call "$MODULE" "$FILES";
+ gettext_call "$MODULE" "$FILES" "$RUBY_FILES"
+
echo
MODULE=$D;
- FILES=$F;
- else
- FILES="$FILES $F" ;
+ FILES=""
+ RUBY_FILES=""
fi
+ # is it a Ruby file?
+ if [[ "$F" =~ \.rb$ ]]; then
+ RUBY_FILES="$RUBY_FILES $F";
+ else
+ FILES="$FILES $F" ;
+ fi
done
POT_DST="$POT_DST $MODULE.pot"
- xgettext_call "$MODULE" "$FILES"
+ gettext_call "$MODULE" "$FILES" "$RUBY_FILES"
echo
}
@@ -135,6 +190,8 @@
# define global variables
CHECKIN=1
XGETTEXT="xgettext"
+RXGETTEXT=/usr/bin/rxgettext
+
SRCDIR="."
POT_DST=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-devtools-2.24.5/doxygen/Doxyfile
new/yast2-devtools-3.0.0/doxygen/Doxyfile
--- old/yast2-devtools-2.24.5/doxygen/Doxyfile 2013-01-21 16:11:19.000000000
+0100
+++ new/yast2-devtools-3.0.0/doxygen/Doxyfile 2013-07-29 09:48:32.000000000
+0200
@@ -21,7 +21,6 @@
JAVADOC_AUTOBRIEF = NO
QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 8
@@ -65,7 +64,6 @@
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
@@ -121,7 +119,6 @@
HTML_HEADER =
HTML_FOOTER =
HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
GENERATE_DOCSET = NO
DOCSET_FEEDNAME = "Doxygen generated docs"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
