Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2014-06-18 10:59:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-03-27 06:17:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2014-06-18 10:59:26.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Jun 6 14:32:01 CEST 2014 - [email protected] + +- gettextdomains: added support for single quotes around + textdomain (bnc#881277) +- 3.1.20 + +------------------------------------------------------------------- +Thu Jun 5 13:07:52 UTC 2014 - [email protected] + +- y2makepot: transform control files into glade compatible format + so they can be processed by xgettext (the latest xgettext does + some format validation before processing) (bnc#881278) +- 3.1.19 + +------------------------------------------------------------------- +Tue Jun 3 15:48:06 UTC 2014 - [email protected] + +- gettextdomains fix detection of files including somewhere "/*" + bnc#880659 +- 3.1.18 + +------------------------------------------------------------------- Old: ---- yast2-devtools-3.1.17.tar.bz2 New: ---- yast2-devtools-3.1.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.ToBRO1/_old 2014-06-18 10:59:26.000000000 +0200 +++ /var/tmp/diff_new_pack.ToBRO1/_new 2014-06-18 10:59:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.17 +Version: 3.1.20 Release: 0 Url: http://github.com/yast/yast-devtools @@ -143,6 +143,8 @@ %{_datadir}/YaST2/data/devtools/bin/y2makepot %{_datadir}/YaST2/data/devtools/bin/gettextdomains %{_datadir}/YaST2/data/devtools/bin/ycp_puttext +%dir %{_datadir}/YaST2/control/ +%{_datadir}/YaST2/control/control_to_glade.xsl %files -n yast2-buildtools %defattr(-,root,root) ++++++ yast2-devtools-3.1.17.tar.bz2 -> yast2-devtools-3.1.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.17/build-tools/scripts/Makefile.am new/yast2-devtools-3.1.20/build-tools/scripts/Makefile.am --- old/yast2-devtools-3.1.17/build-tools/scripts/Makefile.am 2014-03-25 15:44:10.000000000 +0100 +++ new/yast2-devtools-3.1.20/build-tools/scripts/Makefile.am 2014-06-06 14:49:28.000000000 +0200 @@ -11,4 +11,6 @@ y2makepot \ gettextdomains +dist_control_DATA = control_to_glade.xsl + EXTRA_DIST = $(bin_SCRIPTS) $(pkgdata_SCRIPTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.17/build-tools/scripts/control_to_glade.xsl new/yast2-devtools-3.1.20/build-tools/scripts/control_to_glade.xsl --- old/yast2-devtools-3.1.17/build-tools/scripts/control_to_glade.xsl 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.20/build-tools/scripts/control_to_glade.xsl 2014-06-06 14:49:28.000000000 +0200 @@ -0,0 +1,41 @@ +<!-- + Extract translatable strings from a Yast XML control file, output them in the + format accepted by xgettext (Glade compatible XML) +--> + +<xsl:stylesheet version="1.0" + xmlns:n="http://www.suse.com/1.0/yast2ns"; + xmlns:config="http://www.suse.com/1.0/configns"; + xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> + +<xsl:output method="xml" indent="yes"/> + +<!-- attribute definition for <interface> element --> +<xsl:attribute-set name="translatable_label"> + <xsl:attribute name="name">label</xsl:attribute> + <xsl:attribute name="translatable">yes</xsl:attribute> +</xsl:attribute-set> + +<!-- replace <label> by <property>, keep the original value --> +<xsl:template match="n:label"> + <xsl:element name="property" use-attribute-sets="translatable_label"> + <xsl:copy-of select="text()"/> + </xsl:element> +</xsl:template> + +<!-- + replace the root <productDefines> element by <interface> + due to namespace it cannot be used literally +--> +<xsl:template match="/n:productDefines"> + <xsl:element name="interface"> + <xsl:apply-templates select="node()|@*"/> + </xsl:element> +</xsl:template> + +<!-- remove the remaining non-matched text --> +<xsl:template match="text()"> +</xsl:template> + +</xsl:stylesheet> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.17/build-tools/scripts/gettextdomains new/yast2-devtools-3.1.20/build-tools/scripts/gettextdomains --- old/yast2-devtools-3.1.17/build-tools/scripts/gettextdomains 2014-03-25 15:44:10.000000000 +0100 +++ new/yast2-devtools-3.1.20/build-tools/scripts/gettextdomains 2014-06-06 14:49:28.000000000 +0200 @@ -33,13 +33,11 @@ for F in $SRCFILES; do # strip comments from the files and match [_]_( "..." ) # 1. perl: strip one-line-comments - # 2. perl: strip C comments (multiline too) - # 3. perl: match for _( "...") and __("..." ) (multiline too) + # 2. perl: match for _( "...") and __("..." ) (multiline too) # problems left: # - false matches of comments inside strings # - uncaught _( at line beginning MATCH=`perl -n -e 'print "$ARGV: $_" if not /(\/\/|#)/' $F | \ - perl -n -e 'print "$_" if not /\/\*/../\*\//' | \ perl -n -e 'print "$_" if /[^[:alnum:]_"<](_|__|gettext)\(/../\)/'` if [ -n "$MATCH" ]; then TR_FILES="$F $TR_FILES" ; @@ -53,7 +51,7 @@ for F in $TR_FILES $POTFILES; do D=`egrep '^[[:space:]]*<?[Tt]extdomain>?' $F | head -n 1 | \ sed 's/^[[:space:]]*<\?[Tt]extdomain[[:space:]]*[=: \ - "(>]*[[:space:]]*\([-_a-zA-Z0-9]*\).*/\1/'`; + '\''"(>]*[[:space:]]*\([-_[:alnum:]]*\).*/\1/'`; if [ -z $D ]; then ERR="$PWD/$F $ERR" ; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.17/build-tools/scripts/y2makepot new/yast2-devtools-3.1.20/build-tools/scripts/y2makepot --- old/yast2-devtools-3.1.17/build-tools/scripts/y2makepot 2014-03-25 15:44:10.000000000 +0100 +++ new/yast2-devtools-3.1.20/build-tools/scripts/y2makepot 2014-06-06 14:49:28.000000000 +0200 @@ -16,6 +16,9 @@ CWD=`dirname $0` . $CWD/gettextdomains +# list of generated files which should be removed at the end +CLEAN_FILES="" + function gettext_call() { MODULE=$1 @@ -41,6 +44,12 @@ xgettext_call "$MODULE" "$SOURCE_FILES" rxgettext_call "$MODULE" "$SOURCE_RUBY_FILES" fi + + if [ -n "$CLEAN_FILES" ]; then + echo "Removing generated files: $CLEAN_FILES" + rm -f $CLEAN_FILES + CLEAN_FILES="" + fi } function xgettext_call() @@ -147,7 +156,15 @@ if [[ "$F" =~ \.(erb|rb)$ ]]; then RUBY_FILES="$RUBY_FILES $F"; else - FILES="$FILES $F" ; + if [[ "$F" =~ \.glade$ ]]; then + echo "Processing $F file..." + GLADE_FILE="$F.translations.glade" + xsltproc /usr/share/YaST2/control/control_to_glade.xsl "$F" > "$GLADE_FILE" + FILES="$FILES $GLADE_FILE" ; + CLEAN_FILES="$CLEAN_FILES $GLADE_FILE" ; + else + FILES="$FILES $F" ; + fi fi done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.17/package/yast2-devtools.changes new/yast2-devtools-3.1.20/package/yast2-devtools.changes --- old/yast2-devtools-3.1.17/package/yast2-devtools.changes 2014-03-25 15:44:11.000000000 +0100 +++ new/yast2-devtools-3.1.20/package/yast2-devtools.changes 2014-06-06 14:49:28.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Fri Jun 6 14:32:01 CEST 2014 - [email protected] + +- gettextdomains: added support for single quotes around + textdomain (bnc#881277) +- 3.1.20 + +------------------------------------------------------------------- +Thu Jun 5 13:07:52 UTC 2014 - [email protected] + +- y2makepot: transform control files into glade compatible format + so they can be processed by xgettext (the latest xgettext does + some format validation before processing) (bnc#881278) +- 3.1.19 + +------------------------------------------------------------------- +Tue Jun 3 15:48:06 UTC 2014 - [email protected] + +- gettextdomains fix detection of files including somewhere "/*" + bnc#880659 +- 3.1.18 + +------------------------------------------------------------------- Tue Mar 25 14:15:03 UTC 2014 - [email protected] - y2makepot: added support for extracting translatable strings from diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.17/package/yast2-devtools.spec new/yast2-devtools-3.1.20/package/yast2-devtools.spec --- old/yast2-devtools-3.1.17/package/yast2-devtools.spec 2014-03-25 15:44:11.000000000 +0100 +++ new/yast2-devtools-3.1.20/package/yast2-devtools.spec 2014-06-06 14:49:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.17 +Version: 3.1.20 Release: 0 Url: http://github.com/yast/yast-devtools @@ -143,6 +143,8 @@ %{_datadir}/YaST2/data/devtools/bin/y2makepot %{_datadir}/YaST2/data/devtools/bin/gettextdomains %{_datadir}/YaST2/data/devtools/bin/ycp_puttext +%dir %{_datadir}/YaST2/control/ +%{_datadir}/YaST2/control/control_to_glade.xsl %files -n yast2-buildtools -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
