Mailinglist Archive: opensuse-commit (1500 mails)
| < Previous | Next > |
commit yast2-phone-services
- From: root@xxxxxxx (h_root)
- Date: Mon, 20 Nov 2006 18:46:18 +0100 (CET)
- Message-id: <20061120174618.23AD519AB24@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-phone-services
checked in at Mon Nov 20 18:46:17 CET 2006.
--------
--- yast2-phone-services/yast2-phone-services.changes 2006-03-02 13:18:53.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-phone-services/yast2-phone-services.changes 2006-11-20 14:18:10.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Nov 20 14:07:25 CET 2006 - jsrain@xxxxxxx
+
+- 2.14.0
+
+-------------------------------------------------------------------
Old:
----
yast2-phone-services-2.13.1.tar.bz2
New:
----
yast2-phone-services-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-phone-services.spec ++++++
--- /var/tmp/diff_new_pack.VtoQCD/_old 2006-11-20 18:46:08.000000000 +0100
+++ /var/tmp/diff_new_pack.VtoQCD/_new 2006-11-20 18:46:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-phone-services (Version 2.13.1)
+# spec file for package yast2-phone-services (Version 2.14.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-phone-services
-Version: 2.13.1
+Version: 2.14.0
Release: 1
-License: GPL
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-phone-services-2.13.1.tar.bz2
+Source0: yast2-phone-services-2.14.0.tar.bz2
prefix: /usr
BuildRequires: doxygen perl-XML-Writer pkg-config update-desktop-files yast2 yast2-devtools yast2-users
Requires: yast2 yast2-users
@@ -34,7 +34,7 @@
Karsten Keil <kkeil@xxxxxxx>
%prep
-%setup -n yast2-phone-services-2.13.1
+%setup -n yast2-phone-services-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -68,6 +68,8 @@
%doc %{prefix}/share/doc/packages/yast2-phone-services
%changelog -n yast2-phone-services
+* Mon Nov 20 2006 - jsrain@xxxxxxx
+- 2.14.0
* Thu Mar 02 2006 - jsuchome@xxxxxxx
- reduced BuildRequires
- 2.13.1
++++++ yast2-phone-services-2.13.1.tar.bz2 -> yast2-phone-services-2.14.0.tar.bz2 ++++++
++++ 5755 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-phone-services-2.13.1/Makefile.am new/yast2-phone-services-2.14.0/Makefile.am
--- old/yast2-phone-services-2.13.1/Makefile.am 2006-01-11 13:19:59.000000000 +0100
+++ new/yast2-phone-services-2.14.0/Makefile.am 2006-11-20 14:15:49.000000000 +0100
@@ -7,7 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -33,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +95,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +116,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +143,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +199,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-phone-services-2.13.1/Makefile.am.common new/yast2-phone-services-2.14.0/Makefile.am.common
--- old/yast2-phone-services-2.13.1/Makefile.am.common 2006-01-11 13:19:59.000000000 +0100
+++ new/yast2-phone-services-2.14.0/Makefile.am.common 2006-11-20 14:15:49.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-phone-services-2.13.1/VERSION new/yast2-phone-services-2.14.0/VERSION
--- old/yast2-phone-services-2.13.1/VERSION 2006-03-02 13:09:04.000000000 +0100
+++ new/yast2-phone-services-2.14.0/VERSION 2006-11-20 14:08:07.000000000 +0100
@@ -1 +1 @@
-2.13.1
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-phone-services-2.13.1/configure.in new/yast2-phone-services-2.14.0/configure.in
--- old/yast2-phone-services-2.13.1/configure.in 2006-01-11 13:19:59.000000000 +0100
+++ new/yast2-phone-services-2.14.0/configure.in 2006-11-20 14:15:49.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-phone-services
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-phone-services, 2.13.0, http://www.suse.de/feedback, yast2-phone-services)
+AC_INIT(yast2-phone-services, 2.14.0, http://bugs.opensuse.org/, yast2-phone-services)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.0"
+VERSION="2.14.0"
RPMNAME="yast2-phone-services"
MAINTAINER="Karsten Keil <kkeil@xxxxxxx>"
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile agents/Makefile
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |