Hello community,
here is the log from the commit of package yast2-metapackage-handler
checked in at Mon Sep 3 18:21:01 CEST 2007.
--------
--- yast2-metapackage-handler/yast2-metapackage-handler.changes 2007-08-30 11:06:08.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-metapackage-handler/yast2-metapackage-handler.changes 2007-09-03 14:20:00.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Sep 3 14:16:44 CEST 2007 - mvidner@suse.cz
+
+- Added associations for Firefox, via shared-mime-info (#295677).
+- Use translations for buttons and heading (benji).
+- 0.7.0
+
+-------------------------------------------------------------------
Old:
----
yast2-metapackage-handler-0.6.0.tar.bz2
New:
----
yast2-metapackage-handler-0.7.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-metapackage-handler.spec ++++++
--- /var/tmp/diff_new_pack.U28168/_old 2007-09-03 18:20:40.000000000 +0200
+++ /var/tmp/diff_new_pack.U28168/_new 2007-09-03 18:20:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-metapackage-handler (Version 0.6.0)
+# spec file for package yast2-metapackage-handler (Version 0.7.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-metapackage-handler
URL: http://en.opensuse.org/Meta_Packages
-Version: 0.6.0
+Version: 0.7.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-metapackage-handler-0.6.0.tar.bz2
+Source0: yast2-metapackage-handler-0.7.0.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -31,6 +31,8 @@
BuildRequires: yast2
BuildRequires: yast2-country
BuildRequires: yast2-installation
+# desktop files
+BuildRequires: update-desktop-files
Requires: yast2-perl-bindings
Requires: perl-XML-XPath
Requires: yast2
@@ -56,7 +58,7 @@
Benjamin Weber
%prep
-%setup -n yast2-metapackage-handler-0.6.0
+%setup -n yast2-metapackage-handler-0.7.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +86,8 @@
install -m 0644 src/x-suse-ymp.desktop \
$RPM_BUILD_ROOT/opt/kde3/share/mimelnk/text/
%endif
+%suse_update_desktop_file yast2-metapackage-handler
+%suse_update_desktop_file yast2-metapackage-handler-ymu
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -91,6 +95,7 @@
%files
%defattr(-,root,root)
%doc %{prefix}/share/doc/packages/yast2-metapackage-handler
+/sbin/OneClickInstallUI
/sbin/OneClickInstallUrlHandler
%dir /usr/share/YaST2/clients
/usr/share/YaST2/clients/*.ycp
@@ -101,8 +106,14 @@
%if %suse_version <= 1020
/opt/kde3
%endif
+%{_datadir}/mime/packages/*.xml
+%{_datadir}/applications/yast2-metapackage-handler*.desktop
%changelog
+* Mon Sep 03 2007 - mvidner@suse.cz
+- Added associations for Firefox, via shared-mime-info (#295677).
+- Use translations for buttons and heading (benji).
+- 0.7.0
* Thu Aug 30 2007 - mvidner@suse.cz
- Do not add duplicate repositories (#300974). Also uses correct
name when adding repositories. This change breaks compatibility
++++++ yast2-metapackage-handler-0.6.0.tar.bz2 -> yast2-metapackage-handler-0.7.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/configure new/yast2-metapackage-handler-0.7.0/configure
--- old/yast2-metapackage-handler-0.6.0/configure 2007-08-30 13:01:38.000000000 +0200
+++ new/yast2-metapackage-handler-0.7.0/configure 2007-09-03 15:21:01.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-metapackage-handler 0.6.0.
+# Generated by GNU Autoconf 2.60 for yast2-metapackage-handler 0.7.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-metapackage-handler'
PACKAGE_TARNAME='yast2-metapackage-handler'
-PACKAGE_VERSION='0.6.0'
-PACKAGE_STRING='yast2-metapackage-handler 0.6.0'
+PACKAGE_VERSION='0.7.0'
+PACKAGE_STRING='yast2-metapackage-handler 0.7.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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-metapackage-handler 0.6.0 to adapt to many kinds of systems.
+\`configure' configures yast2-metapackage-handler 0.7.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-metapackage-handler 0.6.0:";;
+ short | recursive ) echo "Configuration of yast2-metapackage-handler 0.7.0:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-metapackage-handler configure 0.6.0
+yast2-metapackage-handler configure 0.7.0
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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-metapackage-handler $as_me 0.6.0, which was
+It was created by yast2-metapackage-handler $as_me 0.7.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-metapackage-handler'
- VERSION='0.6.0'
+ VERSION='0.7.0'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="0.6.0"
+VERSION="0.7.0"
RPMNAME="yast2-metapackage-handler"
MAINTAINER="Martin Vidner "
@@ -3265,7 +3265,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-metapackage-handler $as_me 0.6.0, which was
+This file was extended by yast2-metapackage-handler $as_me 0.7.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3308,7 +3308,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-metapackage-handler config.status 0.6.0
+yast2-metapackage-handler config.status 0.7.0
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/configure.in new/yast2-metapackage-handler-0.7.0/configure.in
--- old/yast2-metapackage-handler-0.6.0/configure.in 2007-08-30 13:01:28.000000000 +0200
+++ new/yast2-metapackage-handler-0.7.0/configure.in 2007-09-03 15:20:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-metapackage-handler, 0.6.0, http://bugs.opensuse.org/, yast2-metapackage-handler)
+AC_INIT(yast2-metapackage-handler, 0.7.0, http://bugs.opensuse.org/, yast2-metapackage-handler)
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="0.6.0"
+VERSION="0.7.0"
RPMNAME="yast2-metapackage-handler"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/OneClickInstall.pot new/yast2-metapackage-handler-0.7.0/OneClickInstall.pot
--- old/yast2-metapackage-handler-0.6.0/OneClickInstall.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-metapackage-handler-0.7.0/OneClickInstall.pot 2007-09-03 14:25:50.000000000 +0200
@@ -0,0 +1,255 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-03 14:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. * <region name="String constants"> *
+#: src/OneClickInstallUI.ycp:50
+msgid "Select the software components you wish to install:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:51
+msgid "Select the software components you wish to remove:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:52
+msgid "Select the software repositories you wish to subscribe to:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:53
+msgid "Repository Description:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:54
+msgid "Package Description:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:55
+msgid "Additional Software Repositories"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:56
+msgid "Software to be Installed"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:57
+msgid "Software to be Removed"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:58
+msgid "Please wait while this software is being installed."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:59
+msgid "Software installation"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:60
+msgid "This wizard will install software onto your computer."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:61
+msgid "See http://en.opensuse.org/MetaPackages for more information."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:62
+msgid "Warning:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:63
+msgid "If you choose to continue, the following changes will be made to your system"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:64
+msgid "The following repositories will be subscribed to:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:65
+msgid "The following software items will be installed:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:66
+msgid "The following software items will be REMOVED:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:67
+msgid "Unfortunately the installation has failed, see the log file at /var/log/YaST2/y2log for more information. Failure stage was: "
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:68
+msgid "Error Message"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:69
+msgid "Installation was successful"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:70
+msgid "Installation was only partially successful."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:71
+msgid "Installation status:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:72
+msgid "Remain subscribed to these repositories after installation"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:73
+msgid "You will remain subscribed to these repositories after installation."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:74
+msgid "These repositories will only be added during installation, you will not remain subscribed."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:75
+msgid "Note:"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:76
+msgid "There is nothing to do."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:77
+msgid "Advanced mode with ability to change settings."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:78
+msgid "Welcome"
+msgstr ""
+
+#. %1: software package
+#: src/OneClickInstallUI.ycp:80
+#, ycp-format
+msgid "This wizard will install <b>%1</b> onto your computer."
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:81
+msgid "Summary"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:82
+msgid "Description"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:83
+msgid "The following repositories could not be added"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:84
+msgid "The following patterns could not be installed"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:85
+msgid "The following packages could not be installed"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:191
+msgid "Software Description"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:192 src/OneClickInstallUI.ycp:217
+#: src/OneClickInstallUI.ycp:237 src/OneClickInstallUI.ycp:255
+#: src/OneClickInstallUI.ycp:271 src/OneClickInstallUI.ycp:288
+msgid "Installation Settings"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:193 src/OneClickInstallUI.ycp:218
+#: src/OneClickInstallUI.ycp:238 src/OneClickInstallUI.ycp:256
+#: src/OneClickInstallUI.ycp:272 src/OneClickInstallUI.ycp:289
+msgid "Perform Installation"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:194 src/OneClickInstallUI.ycp:219
+#: src/OneClickInstallUI.ycp:239 src/OneClickInstallUI.ycp:257
+#: src/OneClickInstallUI.ycp:273 src/OneClickInstallUI.ycp:290
+msgid "Results"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:215 src/OneClickInstallUI.ycp:234
+#: src/OneClickInstallUI.ycp:254
+msgid "Repositories"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:216 src/OneClickInstallUI.ycp:235
+#: src/OneClickInstallUI.ycp:270 src/OneClickInstallUI.ycp:286
+msgid "Software"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:236 src/OneClickInstallUI.ycp:287
+msgid "Removals"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:304
+msgid "Nothing to do"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:389
+msgid "Installation Steps"
+msgstr ""
+
+#: src/OneClickInstallUI.ycp:509
+msgid ""
+"Have you reviewed the changes that will be made to your system?\n"
+"\n"
+"Malicious packages could damage your system."
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:81
+msgid "An error occurred while creating the installation source."
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:81
+msgid "Details:"
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:81
+msgid "Try again?"
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:237
+msgid "An error occurred while attempting to subscribe to the required repositories. Please review the yast2 logs for more information."
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:248
+msgid "An error occurred while attempting to remove the specified packages. Please review the yast2 logs for more information."
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:259
+msgid "An error occurred while attempting to install the specified patterns. Please review the yast2 logs for more information."
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:270
+msgid "An error occurred while attempting to install the specified packages. Please review the yast2 logs for more information."
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:281
+msgid "An error occurred while attempting to unsubscribe from the repositories that were used to perform the installation. You can remove them manually in YaST > Software Repositories. Please review the yast2 logs for more information."
+msgstr ""
+
+#: src/OneClickInstallWorker.ycp:289
+msgid "No error occurred."
+msgstr ""
+
+#: src/OneClickInstallWorkerResponse.ycp:7
+msgid "unknown"
+msgstr ""
+
+#: src/OneClickInstallWorkerResponse.ycp:8
+msgid "An unknown error occurred."
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/src/Makefile.am new/yast2-metapackage-handler-0.7.0/src/Makefile.am
--- old/yast2-metapackage-handler-0.6.0/src/Makefile.am 2007-08-06 15:34:42.000000000 +0200
+++ new/yast2-metapackage-handler-0.7.0/src/Makefile.am 2007-09-03 14:43:43.000000000 +0200
@@ -10,10 +10,19 @@
YPX.pm
dist_sbin_SCRIPTS = OneClickInstallUrlHandler
+install-exec-hook:
+ $(LN_S) OneClickInstallUrlHandler $(DESTDIR)$(sbindir)/OneClickInstallUI
old_distro_Data = kdeymp.desktop x-suse-ymp.desktop
-EXTRA_DIST = $(client_DATA) $(module_DATA) $(old_distro_Data)
+mimedir = $(datadir)/mime/packages
+mime_DATA = yast2-metapackage-handler-mimetypes.xml
+
+# overrides devtools
+desktopdir = $(datadir)/applications
+desktop_DATA = yast2-metapackage-handler.desktop yast2-metapackage-handler-ymu.desktop
+
+EXTRA_DIST = $(client_DATA) $(module_DATA) $(old_distro_Data) $(mime_DATA) $(desktop_DATA)
# module compilation
include $(top_srcdir)/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/src/Makefile.in new/yast2-metapackage-handler-0.7.0/src/Makefile.in
--- old/yast2-metapackage-handler-0.6.0/src/Makefile.in 2007-08-30 13:01:41.000000000 +0200
+++ new/yast2-metapackage-handler-0.7.0/src/Makefile.in 2007-09-03 15:21:07.000000000 +0200
@@ -51,6 +51,7 @@
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(clientdir)" \
+ "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" \
"$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"
dist_sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(dist_sbin_SCRIPTS)
@@ -63,9 +64,12 @@
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
clientDATA_INSTALL = $(INSTALL_DATA)
+desktopDATA_INSTALL = $(INSTALL_DATA)
+mimeDATA_INSTALL = $(INSTALL_DATA)
moduleDATA_INSTALL = $(INSTALL_DATA)
modulebinDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(client_DATA) $(module_DATA) $(modulebin_DATA)
+DATA = $(client_DATA) $(desktop_DATA) $(mime_DATA) $(module_DATA) \
+ $(modulebin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -128,7 +132,9 @@
clientdir = @clientdir@
datadir = @datadir@
datarootdir = @datarootdir@
-desktopdir = @desktopdir@
+
+# overrides devtools
+desktopdir = $(datadir)/applications
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -188,7 +194,10 @@
dist_sbin_SCRIPTS = OneClickInstallUrlHandler
old_distro_Data = kdeymp.desktop x-suse-ymp.desktop
-EXTRA_DIST = $(client_DATA) $(module_DATA) $(old_distro_Data)
+mimedir = $(datadir)/mime/packages
+mime_DATA = yast2-metapackage-handler-mimetypes.xml
+desktop_DATA = yast2-metapackage-handler.desktop yast2-metapackage-handler-ymu.desktop
+EXTRA_DIST = $(client_DATA) $(module_DATA) $(old_distro_Data) $(mime_DATA) $(desktop_DATA)
modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
modulebindir = $(moduledir)
ybcfiles = $(filter %.ybc,$(modulebin_DATA))
@@ -271,6 +280,40 @@
echo " rm -f '$(DESTDIR)$(clientdir)/$$f'"; \
rm -f "$(DESTDIR)$(clientdir)/$$f"; \
done
+install-desktopDATA: $(desktop_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
+ @list='$(desktop_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
+ $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
+ done
+
+uninstall-desktopDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(desktop_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
+ done
+install-mimeDATA: $(mime_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(mimedir)" || $(mkdir_p) "$(DESTDIR)$(mimedir)"
+ @list='$(mime_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(mimeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimedir)/$$f'"; \
+ $(mimeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimedir)/$$f"; \
+ done
+
+uninstall-mimeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mime_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(mimedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimedir)/$$f"; \
+ done
install-moduleDATA: $(module_DATA)
@$(NORMAL_INSTALL)
test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
@@ -347,7 +390,7 @@
check: check-am
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"; do \
+ for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -394,10 +437,12 @@
info-am:
-install-data-am: install-clientDATA install-moduleDATA \
- install-modulebinDATA
+install-data-am: install-clientDATA install-desktopDATA \
+ install-mimeDATA install-moduleDATA install-modulebinDATA
install-exec-am: install-dist_sbinSCRIPTS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-info: install-info-am
@@ -421,21 +466,28 @@
ps-am:
-uninstall-am: uninstall-clientDATA uninstall-dist_sbinSCRIPTS \
- uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA
+uninstall-am: uninstall-clientDATA uninstall-desktopDATA \
+ uninstall-dist_sbinSCRIPTS uninstall-info-am \
+ uninstall-mimeDATA uninstall-moduleDATA \
+ uninstall-modulebinDATA
.PHONY: all all-am check check-am clean clean-generic dist-hook \
distclean distclean-generic distdir dvi dvi-am html html-am \
info info-am install install-am install-clientDATA \
- install-data install-data-am install-dist_sbinSCRIPTS \
- install-exec install-exec-am install-info install-info-am \
- install-man install-moduleDATA install-modulebinDATA \
+ install-data install-data-am install-desktopDATA \
+ install-dist_sbinSCRIPTS install-exec install-exec-am \
+ install-exec-hook install-info install-info-am install-man \
+ install-mimeDATA install-moduleDATA install-modulebinDATA \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-clientDATA uninstall-dist_sbinSCRIPTS \
- uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA
+ uninstall-clientDATA uninstall-desktopDATA \
+ uninstall-dist_sbinSCRIPTS uninstall-info-am \
+ uninstall-mimeDATA uninstall-moduleDATA \
+ uninstall-modulebinDATA
+install-exec-hook:
+ $(LN_S) OneClickInstallUrlHandler $(DESTDIR)$(sbindir)/OneClickInstallUI
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/src/OneClickInstallUI.ycp new/yast2-metapackage-handler-0.7.0/src/OneClickInstallUI.ycp
--- old/yast2-metapackage-handler-0.6.0/src/OneClickInstallUI.ycp 2007-08-30 10:59:30.000000000 +0200
+++ new/yast2-metapackage-handler-0.7.0/src/OneClickInstallUI.ycp 2007-09-03 14:17:20.000000000 +0200
@@ -379,15 +379,14 @@
{
UI::OpenDialog(`opt(`defaultsize ),
`Wizard(`opt(`stepsEnabled),
- `back, "&Back",
- `abort, "Ab&ort",
- `next, "&Next" ) );
-
- UI::WizardCommand(`SetDialogIcon( "/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
- UI::WizardCommand(`SetDialogHeading( "Software Installation" ) );
+ `back, Label::BackButton(),
+ `abort, Label::AbortButton(),
+ `next, Label::NextButton() ) );
+
+ UI::WizardCommand(`SetDialogHeading( INSTALLATION_HEADING ) );
UI::WizardCommand(`SetHelpText( HELP_TEXT ) );
- UI::WizardCommand(`AddStepHeading( "Installation Steps" ) );
+ UI::WizardCommand(`AddStepHeading( _("Installation Steps") ) );
foreach ( map step,installation_steps, ``{
UI::WizardCommand(`AddStep( step["label"]:"", step["id"]:"" ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/src/OneClickInstallUrlHandler new/yast2-metapackage-handler-0.7.0/src/OneClickInstallUrlHandler
--- old/yast2-metapackage-handler-0.6.0/src/OneClickInstallUrlHandler 2007-07-30 17:43:30.000000000 +0200
+++ new/yast2-metapackage-handler-0.7.0/src/OneClickInstallUrlHandler 2007-09-02 22:47:54.000000000 +0200
@@ -1,3 +1,4 @@
#!/bin/sh
# This is just a wrapper to be used by Firefox.
-/sbin/yast2 OneClickInstallUrlHandler "$@"
+MODULE=${0##*/}
+/sbin/yast2 $MODULE "$@"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/src/yast2-metapackage-handler.desktop new/yast2-metapackage-handler-0.7.0/src/yast2-metapackage-handler.desktop
--- old/yast2-metapackage-handler-0.6.0/src/yast2-metapackage-handler.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-metapackage-handler-0.7.0/src/yast2-metapackage-handler.desktop 2007-09-03 15:08:59.000000000 +0200
@@ -0,0 +1,15 @@
+# to ${PREFIX-~/.local}/share/applications
+[Desktop Entry]
+Encoding=UTF-8
+Name=YaST Meta Package Handler
+GenericName=Meta Package Handler
+Comment=Install packages without manually adding repositories
+Exec=/sbin/OneClickInstallUI %f
+Terminal=false
+MultipleArgs=false
+Type=Application
+MimeType=text/x-suse-ymp
+Categories=SystemSetup
+# thx Beineri
+Hidden=True
+X-KDE-StartupNotify=false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/src/yast2-metapackage-handler-mimetypes.xml new/yast2-metapackage-handler-0.7.0/src/yast2-metapackage-handler-mimetypes.xml
--- old/yast2-metapackage-handler-0.6.0/src/yast2-metapackage-handler-mimetypes.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-metapackage-handler-0.7.0/src/yast2-metapackage-handler-mimetypes.xml 2007-09-03 14:15:34.000000000 +0200
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!-- http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec -->
+<!-- to to ${PREFIX-~/.local}/share/mime/packages -->
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+ <mime-type type="text/x-suse-ymp">
+ <comment>YaST Meta Package</comment>
+ <glob pattern="*.ymp"/>
+ </mime-type>
+
+ <mime-type type="text/x-suse-ymu">
+ <comment>URL of a YaST Meta Package</comment>
+ <glob pattern="*.ymu"/>
+ </mime-type>
+</mime-info>
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/src/yast2-metapackage-handler-ymu.desktop new/yast2-metapackage-handler-0.7.0/src/yast2-metapackage-handler-ymu.desktop
--- old/yast2-metapackage-handler-0.6.0/src/yast2-metapackage-handler-ymu.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-metapackage-handler-0.7.0/src/yast2-metapackage-handler-ymu.desktop 2007-09-03 15:09:05.000000000 +0200
@@ -0,0 +1,15 @@
+# to ${PREFIX-~/.local}/share/applications
+[Desktop Entry]
+Encoding=UTF-8
+Name=YaST Meta Package Handler
+GenericName=Meta Package Handler
+Comment=Install packages without manually adding repositories
+Exec=/sbin/OneClickInstallUrlHandler %f
+Terminal=false
+MultipleArgs=false
+Type=Application
+MimeType=text/x-suse-ymu
+Categories=SystemSetup
+# thx Beineri
+Hidden=True
+X-KDE-StartupNotify=false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.6.0/VERSION new/yast2-metapackage-handler-0.7.0/VERSION
--- old/yast2-metapackage-handler-0.6.0/VERSION 2007-08-30 11:01:22.000000000 +0200
+++ new/yast2-metapackage-handler-0.7.0/VERSION 2007-09-03 14:16:04.000000000 +0200
@@ -1 +1 @@
-0.6.0
+0.7.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org