Hello community,
here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2011-10-25 17:23:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old)
and /work/SRC/openSUSE:Factory/.yast2-devtools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-devtools", Maintainer is "mvidner@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2011-10-19 00:56:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2011-10-28 15:31:57.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Oct 25 12:14:21 UTC 2011 - lslezak@suse.cz
+
+- fixed oscsubmit to not submit *.rej and *.orig files left after
+ failed merging
+- 2.21.6
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-2.21.5.tar.bz2
New:
----
yast2-devtools-2.21.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.AaT2Bl/_old 2011-10-28 15:32:22.000000000 +0200
+++ /var/tmp/diff_new_pack.AaT2Bl/_new 2011-10-28 15:32:22.000000000 +0200
@@ -19,7 +19,7 @@
Name: yast2-devtools
-Version: 2.21.5
+Version: 2.21.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-devtools-2.21.5.tar.bz2 -> yast2-devtools-2.21.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.21.5/Makefile.am new/yast2-devtools-2.21.6/Makefile.am
--- old/yast2-devtools-2.21.5/Makefile.am 2011-09-27 11:21:58.000000000 +0200
+++ new/yast2-devtools-2.21.6/Makefile.am 2011-10-25 14:27:24.000000000 +0200
@@ -198,4 +198,4 @@
test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = devtools docbook doxygen scrdoc y2logview yast2 ycpdoc ydoc
+SUBDIRS = devtools docbook doxygen scrdoc yast2 ycpdoc ydoc y2logview
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.21.5/Makefile.in new/yast2-devtools-2.21.6/Makefile.in
--- old/yast2-devtools-2.21.5/Makefile.in 2011-09-27 11:22:07.000000000 +0200
+++ new/yast2-devtools-2.21.6/Makefile.in 2011-10-25 14:27:30.000000000 +0200
@@ -343,7 +343,7 @@
TAGVERSION = $(Y2TOOL) tagversion
# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = devtools docbook doxygen scrdoc y2logview yast2 ycpdoc ydoc
+SUBDIRS = devtools docbook doxygen scrdoc yast2 ycpdoc ydoc y2logview
all: all-recursive
.SUFFIXES:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.21.5/VERSION new/yast2-devtools-2.21.6/VERSION
--- old/yast2-devtools-2.21.5/VERSION 2011-10-04 15:14:32.000000000 +0200
+++ new/yast2-devtools-2.21.6/VERSION 2011-10-25 14:15:23.000000000 +0200
@@ -1 +1 @@
-2.21.5
+2.21.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.21.5/configure new/yast2-devtools-2.21.6/configure
--- old/yast2-devtools-2.21.5/configure 2011-09-27 11:22:05.000000000 +0200
+++ new/yast2-devtools-2.21.6/configure 2011-10-25 14:27:29.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-devtools 2.21.2.
+# Generated by GNU Autoconf 2.68 for yast2-devtools 2.21.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -709,8 +709,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-devtools'
PACKAGE_TARNAME='yast2-devtools'
-PACKAGE_VERSION='2.21.2'
-PACKAGE_STRING='yast2-devtools 2.21.2'
+PACKAGE_VERSION='2.21.6'
+PACKAGE_STRING='yast2-devtools 2.21.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1498,7 +1498,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.21.2 to adapt to many kinds of systems.
+\`configure' configures yast2-devtools 2.21.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1569,7 +1569,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-devtools 2.21.2:";;
+ short | recursive ) echo "Configuration of yast2-devtools 2.21.6:";;
esac
cat <<\_ACEOF
@@ -1682,7 +1682,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-devtools configure 2.21.2
+yast2-devtools configure 2.21.6
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2081,7 +2081,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.21.2, which was
+It was created by yast2-devtools $as_me 2.21.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3011,7 +3011,7 @@
# Define the identity of the package.
PACKAGE='yast2-devtools'
- VERSION='2.21.2'
+ VERSION='2.21.6'
cat >>confdefs.h <<_ACEOF
@@ -3133,7 +3133,7 @@
-VERSION="2.21.2"
+VERSION="2.21.6"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -14988,7 +14988,7 @@
ac_config_files="$ac_config_files devtools/bin/version"
-ac_config_files="$ac_config_files Makefile devtools/bin/Makefile devtools/admin/po/Makefile devtools/admin/copyright/yast/Makefile devtools/admin/copyright/gpl/Makefile devtools/admin/copyright/Makefile devtools/admin/aclocal/Makefile devtools/admin/aminclude/Makefile devtools/admin/Makefile devtools/skeletons/Makefile devtools/doc/skeletons/config/Makefile devtools/doc/skeletons/Makefile devtools/doc/Makefile devtools/data/Makefile devtools/cmake/modules/Makefile devtools/cmake/Makefile devtools/Makefile docbook/stylesheets/Makefile docbook/css/Makefile docbook/images/navig/Makefile docbook/images/admon/Makefile docbook/images/Makefile docbook/Makefile doxygen/Makefile scrdoc/doc/Makefile scrdoc/src/Makefile scrdoc/Makefile y2logview/y2log_ana/Makefile y2logview/Makefile yast2/check_ycp/doc/Makefile yast2/check_ycp/Makefile yast2/Makefile ycpdoc/doc/example/Makefile ycpdoc/doc/Makefile ycpdoc/src/Makefile ycpdoc/testsuite/Makefile ycpdoc/Makefile ydoc/doc/Makefile ydoc/src/Makefile ydoc/po-tools/Makefile ydoc/Makefile"
+ac_config_files="$ac_config_files Makefile devtools/bin/Makefile devtools/admin/po/Makefile devtools/admin/copyright/yast/Makefile devtools/admin/copyright/gpl/Makefile devtools/admin/copyright/Makefile devtools/admin/aclocal/Makefile devtools/admin/aminclude/Makefile devtools/admin/Makefile devtools/skeletons/Makefile devtools/doc/skeletons/config/Makefile devtools/doc/skeletons/Makefile devtools/doc/Makefile devtools/data/Makefile devtools/cmake/modules/Makefile devtools/cmake/Makefile devtools/Makefile docbook/stylesheets/Makefile docbook/css/Makefile docbook/images/navig/Makefile docbook/images/admon/Makefile docbook/images/Makefile docbook/Makefile doxygen/Makefile scrdoc/doc/Makefile scrdoc/src/Makefile scrdoc/Makefile yast2/check_ycp/doc/Makefile yast2/check_ycp/Makefile yast2/Makefile ycpdoc/doc/example/Makefile ycpdoc/doc/Makefile ycpdoc/src/Makefile ycpdoc/testsuite/Makefile ycpdoc/Makefile ydoc/doc/Makefile ydoc/src/Makefile ydoc/po-tools/Makefile ydoc/Makefile y2logview/y2log_ana/Makefile y2logview/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -15584,7 +15584,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.21.2, which was
+This file was extended by yast2-devtools $as_me 2.21.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15641,7 +15641,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.21.2
+yast2-devtools config.status 2.21.6
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -16140,8 +16140,6 @@
"scrdoc/doc/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/doc/Makefile" ;;
"scrdoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/src/Makefile" ;;
"scrdoc/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/Makefile" ;;
- "y2logview/y2log_ana/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/y2log_ana/Makefile" ;;
- "y2logview/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/Makefile" ;;
"yast2/check_ycp/doc/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/check_ycp/doc/Makefile" ;;
"yast2/check_ycp/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/check_ycp/Makefile" ;;
"yast2/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/Makefile" ;;
@@ -16154,6 +16152,8 @@
"ydoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/src/Makefile" ;;
"ydoc/po-tools/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/po-tools/Makefile" ;;
"ydoc/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/Makefile" ;;
+ "y2logview/y2log_ana/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/y2log_ana/Makefile" ;;
+ "y2logview/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.21.5/configure.in new/yast2-devtools-2.21.6/configure.in
--- old/yast2-devtools-2.21.5/configure.in 2011-09-27 11:21:58.000000000 +0200
+++ new/yast2-devtools-2.21.6/configure.in 2011-10-25 14:27:24.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-devtools
dnl
-dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-devtools, 2.21.2, http://bugs.opensuse.org/, yast2-devtools)
+AC_INIT(yast2-devtools, 2.21.6, 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.21.2"
+VERSION="2.21.6"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -217,8 +217,6 @@
scrdoc/doc/Makefile
scrdoc/src/Makefile
scrdoc/Makefile
-y2logview/y2log_ana/Makefile
-y2logview/Makefile
yast2/check_ycp/doc/Makefile
yast2/check_ycp/Makefile
yast2/Makefile
@@ -230,6 +228,8 @@
ydoc/doc/Makefile
ydoc/src/Makefile
ydoc/po-tools/Makefile
-ydoc/Makefile)
+ydoc/Makefile
+y2logview/y2log_ana/Makefile
+y2logview/Makefile)
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.21.5/devtools/bin/oscsubmit new/yast2-devtools-2.21.6/devtools/bin/oscsubmit
--- old/yast2-devtools-2.21.5/devtools/bin/oscsubmit 2011-09-27 11:18:59.000000000 +0200
+++ new/yast2-devtools-2.21.6/devtools/bin/oscsubmit 2011-10-25 14:26:26.000000000 +0200
@@ -86,7 +86,11 @@
# FIXME directory may be empty
rm $OBS_PROJECT/$PACKAGE/* 2>&1 | tee -a $LOGFILE
test -d build/package && cp build/package/* $OBS_PROJECT/$PACKAGE # needed for cmake-based modules
+
cp package/* $OBS_PROJECT/$PACKAGE
+# do not submit *.rej and *.orig files left after failed patching/merging
+rm -rf $OBS_PROJECT/$PACKAGE/*.rej $OBS_PROJECT/$PACKAGE/*.orig
+
echo "OK" | tee -a $LOGFILE
diff $OBS_PROJECT/$PACKAGE/*changes $OBS_PROJECT/$PACKAGE/.osc/*changes >diff
test -f $OBS_PROJECT/$PACKAGE/.osc/*changes || echo "< New package" >diff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.21.5/devtools/bin/showy2log new/yast2-devtools-2.21.6/devtools/bin/showy2log
--- old/yast2-devtools-2.21.5/devtools/bin/showy2log 2011-09-27 11:18:59.000000000 +0200
+++ new/yast2-devtools-2.21.6/devtools/bin/showy2log 2007-09-17 09:31:28.000000000 +0200
@@ -41,7 +41,7 @@
my $debuglvl = 0;
my $vcs_id = '$Id: showy2log 40869 2007-09-12 11:50:09Z dfiser $';
-my $vcs_date = '$Date: 2007-09-12 13:50:09 +0200 (Wed, 12 Sep 2007) $';
+my $vcs_date = '$Date: 2007-09-12 13:50:09 +0200 (St, 12 zář 2007) $';
$vcs_id =~ /^\$[[:alpha:]]+: [^ ]+ ([^ ]+ [^ ]+ [^ ]+) [^ ]+.*$/;
my $version = $1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.21.5/devtools/bin/version new/yast2-devtools-2.21.6/devtools/bin/version
--- old/yast2-devtools-2.21.5/devtools/bin/version 2011-09-27 11:22:11.000000000 +0200
+++ new/yast2-devtools-2.21.6/devtools/bin/version 2011-10-25 14:27:34.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 2.21.2
+echo 2.21.6
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org