Hello community, here is the log from the commit of package patterns-openSUSE checked in at Fri Mar 7 23:09:08 CET 2008. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2008-03-02 17:24:02.000000000 +0100 +++ patterns-openSUSE/patterns-openSUSE.changes 2008-03-07 11:59:08.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 7 11:58:12 CET 2008 - coolo@suse.de + +- as a direct consequence of the discussion on the pattern + concept between software management group: reduce heavily the + use of requirements to packages + +------------------------------------------------------------------- +Thu Mar 6 20:33:27 CET 2008 - coolo@suse.de + +- only take gnome games on i386 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.d10222/_old 2008-03-07 23:07:54.000000000 +0100 +++ /var/tmp/diff_new_pack.d10222/_new 2008-03-07 23:07:54.000000000 +0100 @@ -18,7 +18,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.0 -Release: 46 +Release: 48 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess @@ -178,6 +178,12 @@ /CD1/suse/setup/descr/non_oss-*.pat %changelog +* Fri Mar 07 2008 coolo@suse.de +- as a direct consequence of the discussion on the pattern + concept between software management group: reduce heavily the + use of requirements to packages +* Thu Mar 06 2008 coolo@suse.de +- only take gnome games on i386 * Sun Mar 02 2008 coolo@suse.de - do not rely on file permissions * Fri Feb 29 2008 coolo@suse.de ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/APPARMOR new/patterns-openSUSE-data/data/APPARMOR --- old/patterns-openSUSE-data/data/APPARMOR 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/APPARMOR 2008-03-07 11:52:25.000000000 +0100 @@ -1,7 +1,10 @@ +Prq: apparmor-parser apparmor-profiles -apparmor-utils -yast2-apparmor audit -Prq: + ++Prc: +yast2-apparmor +apparmor-utils +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/APPARMOR-OPT new/patterns-openSUSE-data/data/APPARMOR-OPT --- old/patterns-openSUSE-data/data/APPARMOR-OPT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/APPARMOR-OPT 2008-03-07 11:51:54.000000000 +0100 @@ -1,3 +1,3 @@ -+Prq: ++Prc: apparmor-docs --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/CONSOLE new/patterns-openSUSE-data/data/CONSOLE --- old/patterns-openSUSE-data/data/CONSOLE 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/CONSOLE 2008-03-07 11:51:19.000000000 +0100 @@ -1,10 +1,8 @@ -+Prq: ++Prc: ivman mc w3m wodim --Prq: -+Prc: emacs-nox mtools sox diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-BASIS new/patterns-openSUSE-data/data/DEVEL-BASIS --- old/patterns-openSUSE-data/data/DEVEL-BASIS 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-BASIS 2008-03-07 11:50:44.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: autoconf automake binutils @@ -18,9 +18,7 @@ rcs texinfo zlib-devel --Prq: -+Prc: bin86 libdb-4_5-devel gcc-c++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-GNOME new/patterns-openSUSE-data/data/DEVEL-GNOME --- old/patterns-openSUSE-data/data/DEVEL-GNOME 2008-02-29 09:49:45.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-GNOME 2008-03-07 11:51:40.000000000 +0100 @@ -1,9 +1,6 @@ -+Prq: ++Prc: gtk2-devel gtk-doc --Prq: - -+Prc: aalib-devel alsa-devel at-spi-devel diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Java new/patterns-openSUSE-data/data/DEVEL-Java --- old/patterns-openSUSE-data/data/DEVEL-Java 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Java 2008-03-07 11:51:47.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: ant ant-antlr ant-apache-bcel @@ -25,8 +25,6 @@ xml-commons-apis xml-commons-resolver xml-commons-which --Prq: -+Prc: java-1_5_0-gcj-compat-devel -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-KDE new/patterns-openSUSE-data/data/DEVEL-KDE --- old/patterns-openSUSE-data/data/DEVEL-KDE 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-KDE 2008-03-07 11:53:01.000000000 +0100 @@ -1,9 +1,6 @@ -+Prq: ++Prc: cmake kdebase4-workspace-devel --Prq: - -+Prc: alsa-devel aspell-devel avahi-compat-mDNSResponder-devel diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Kernel new/patterns-openSUSE-data/data/DEVEL-Kernel --- old/patterns-openSUSE-data/data/DEVEL-Kernel 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Kernel 2008-03-07 11:50:22.000000000 +0100 @@ -1,7 +1,5 @@ -+Prq: -kernel-source --Prq: +Prc: +kernel-source cscope diffstat git-core diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Mono new/patterns-openSUSE-data/data/DEVEL-Mono --- old/patterns-openSUSE-data/data/DEVEL-Mono 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Mono 2008-03-07 11:53:26.000000000 +0100 @@ -1,9 +1,7 @@ -+Prq: ++Prc: mono-core mono-devel monodevelop --Prq: -+Prc: apache2-mod_mono boo bytefx-data-mysql diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Python new/patterns-openSUSE-data/data/DEVEL-Python --- old/patterns-openSUSE-data/data/DEVEL-Python 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Python 2008-03-07 11:52:38.000000000 +0100 @@ -1,7 +1,7 @@ -+Prq: ++Prc: pychecker python --Prq: +-Prc: +Psg: eric libxml2-python diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-QT4 new/patterns-openSUSE-data/data/DEVEL-QT4 --- old/patterns-openSUSE-data/data/DEVEL-QT4 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-QT4 2008-03-07 11:51:33.000000000 +0100 @@ -1,8 +1,6 @@ -+Prq: ++Prc: libqt4-devel libqt4-devel-doc --Prq: -+Prc: libqt4-sql-sqlite -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Rails new/patterns-openSUSE-data/data/DEVEL-Rails --- old/patterns-openSUSE-data/data/DEVEL-Rails 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Rails 2008-03-07 11:53:56.000000000 +0100 @@ -1,7 +1,5 @@ -+Prq: -rubygem-rails --Prq: +Prc: +rubygem-rails rubygem-mongrel -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-RPM-Build-Environment new/patterns-openSUSE-data/data/DEVEL-RPM-Build-Environment --- old/patterns-openSUSE-data/data/DEVEL-RPM-Build-Environment 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-RPM-Build-Environment 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -+Prq: -acl -attr -autoconf -automake -binutils -cpp -cracklib -cvs -gawk -gcc -gettext-tools -glibc-devel -glibc-locale -less -libtool -make -man -netcfg -patch -rpm -sysvinit -tar -texinfo -timezone -util-linux --Prq: - -+Psg: -build -inst-source-utils --Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Ruby new/patterns-openSUSE-data/data/DEVEL-Ruby --- old/patterns-openSUSE-data/data/DEVEL-Ruby 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Ruby 2008-03-07 11:49:15.000000000 +0100 @@ -1,7 +1,7 @@ -+Prq: ++Prc: ruby rubygems --Prq: +-Prc: +Psg: ruby-devel ruby-doc-html diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Tcl new/patterns-openSUSE-data/data/DEVEL-Tcl --- old/patterns-openSUSE-data/data/DEVEL-Tcl 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Tcl 2008-03-07 11:50:16.000000000 +0100 @@ -1,8 +1,5 @@ -+Prq: -tcl --Prq: - +Prc: +tcl blt bwidget expect diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-YaST new/patterns-openSUSE-data/data/DEVEL-YaST --- old/patterns-openSUSE-data/data/DEVEL-YaST 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-YaST 2008-03-07 11:45:15.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: yast2-devtools yast2-testsuite // Bug 304645 gives the list below: @@ -15,7 +15,9 @@ yast2-ruby-bindings subversion libzypp-devel --Prq: +yast2-libyui-devel +yast2-ycp-ui-bindings-devel +-Prc: +Psg: inst-source-utils createrepo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DHCP_DNS new/patterns-openSUSE-data/data/DHCP_DNS --- old/patterns-openSUSE-data/data/DHCP_DNS 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DHCP_DNS 2008-03-07 11:55:12.000000000 +0100 @@ -1,12 +1,10 @@ -+Prq: ++Prc: bind dhcp-relay dhcp-server dhcp-tools yast2-dhcp-server yast2-dns-server --Prq: -+Prc: bind-doc dhcpv6 -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/ENHANCED-BASIS new/patterns-openSUSE-data/data/ENHANCED-BASIS --- old/patterns-openSUSE-data/data/ENHANCED-BASIS 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS 2008-03-07 11:51:12.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: // having a ftp command line client is good for moving log files lukemftp // needed for detecting software raid - required by yast2-storage too @@ -50,9 +50,7 @@ // create log file tars tar wget --Prq: -+Prc: // #302569 alsa-plugins // useful for debugging diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/FILE-SERVER new/patterns-openSUSE-data/data/FILE-SERVER --- old/patterns-openSUSE-data/data/FILE-SERVER 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/FILE-SERVER 2008-03-07 11:55:33.000000000 +0100 @@ -1,11 +1,9 @@ -+Prq: ++Prc: nfsidmap nfs-kernel-server samba yast2-nfs-server yast2-samba-server --Prq: -+Prc: vsftpd samba-client samba-winbind diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/FONTS new/patterns-openSUSE-data/data/FONTS --- old/patterns-openSUSE-data/data/FONTS 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/FONTS 2008-03-07 11:49:43.000000000 +0100 @@ -1,8 +1,6 @@ -+Prq: ++Prc: ghostscript-fonts-std xorg-x11-fonts-core --Prq: -+Prc: dejavu ifnteuro -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-ADMIN new/patterns-openSUSE-data/data/GNOME-ADMIN --- old/patterns-openSUSE-data/data/GNOME-ADMIN 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-ADMIN 2008-03-07 11:44:01.000000000 +0100 @@ -1,5 +1,5 @@ -+Prq: ++Prc: alacarte pessulus sabayon --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-BASIS new/patterns-openSUSE-data/data/GNOME-BASIS --- old/patterns-openSUSE-data/data/GNOME-BASIS 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-BASIS 1970-01-01 01:00:00.000000000 +0100 @@ -1,133 +0,0 @@ -+Prq: -gdm -gnome-applets -gnome-main-menu -gnome-panel -gnome-session -gtk2-themes -gnome-vfs2 -// SUSE gnome greeter (#302026) -ggreeter --Prq: - -+Prc: -// #302205 -libgail-gnome -// gconf-editor by default (#304663) -gconf-editor -// #332596 -gnome-keyring-pam -gnome-mount -at-spi -awesfx -beagle -beagle-evolution -beagle-firefox -beagle-gui -bug-buddy -cdparanoia -cdrdao -control-center2 -cups-backends -dbus-1-x11 -desktop-file-utils -dirmngr -eog -evince -evolution -fam-server -file-roller -gail -pidgin -gcalctool -gconf2 -gedit -gle -// open terminal from RMB on desktop -nautilus-open-terminal -gnome2-SuSE -gnome2-user-docs -gnome-audio -gnome-cups-manager -gnome-desktop -gnome-icon-theme -gnome-keyring -gnome-keyring-manager -gnome-mag -gnome-media -gnome-menus -gnome-nettool -gnome-power-manager -gnome-printer-add -gnome-screensaver -gnome-spell2 -gnome-system-monitor -gnome-terminal -gnome-themes -gnome-utils -gnome-volume-manager -// thumbnailing in nautilus -gnome-web-photo -gpg2 -gpgme -gstreamer-0_10 -gstreamer-0_10-plugins-base -gstreamer-0_10-plugins-good -gtk2-engines -gtkhtml2 -gtksourceview -gtkspell -gucharmap -guile -input-utils -metacity -nautilus -// #302492 -brasero -nautilus-sendto -nautilus-share -ncpfs -NetworkManager -NetworkManager-gnome -notification-daemon -orca -pinentry-gtk2 -python-gnome -python-gtk -python-numeric -python-orbit -samba -shared-mime-info -sox -startup-notification -susehelp -tango-icon-theme -tomboy -vcdimager -vino -vte -xkeyboard-config -yast2-control-center-gnome -yast2-sound -yelp -zenity -// we want useful bug reports -gdb -// #301664 -gnome-commander -// Pulseaudio is the default sound server -pulseaudio-esound-compat -pulseaudio-module-bluetooth -pulseaudio-module-gconf -pulseaudio-module-jack -pulseaudio-module-lirc -pulseaudio-module-x11 -pulseaudio-module-zeroconf -pulseaudio-utils -padevchooser -paman -paprefs -pavucontrol -pavumeter -gstreamer-0_10-pulse --Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Games new/patterns-openSUSE-data/data/GNOME-Games --- old/patterns-openSUSE-data/data/GNOME-Games 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Games 2008-03-04 11:27:55.000000000 +0100 @@ -1,3 +1,4 @@ +Prc: gnome-games +phalanx -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-IDE new/patterns-openSUSE-data/data/GNOME-IDE --- old/patterns-openSUSE-data/data/GNOME-IDE 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-IDE 2008-03-07 11:44:22.000000000 +0100 @@ -1,3 +1,3 @@ -+Prq: ++Prc: anjuta --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-IMAGE new/patterns-openSUSE-data/data/GNOME-IMAGE --- old/patterns-openSUSE-data/data/GNOME-IMAGE 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-IMAGE 2008-03-07 11:44:29.000000000 +0100 @@ -1,6 +1,4 @@ -+Prq: -eog --Prq: +Prc: +eog f-spot -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Internet new/patterns-openSUSE-data/data/GNOME-Internet --- old/patterns-openSUSE-data/data/GNOME-Internet 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Internet 2008-03-07 11:36:44.000000000 +0100 @@ -1,6 +1,7 @@ -+Prq: ++Prc: liferea --Prq: +xchat-gnome +-Prc: +Psg: pan NetworkManager-openvpn-gnome diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Multimedia new/patterns-openSUSE-data/data/GNOME-Multimedia --- old/patterns-openSUSE-data/data/GNOME-Multimedia 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Multimedia 2008-03-07 11:44:35.000000000 +0100 @@ -1,11 +1,11 @@ -+Prq: ++Prc: banshee-player f-spot totem totem-plugin // software.openSUSE.org/codecs opensuse-codecs-installer --Prq: +-Prc: +Psg: banshee diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Office new/patterns-openSUSE-data/data/GNOME-Office --- old/patterns-openSUSE-data/data/GNOME-Office 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Office 2008-03-07 11:51:26.000000000 +0100 @@ -1,5 +1,5 @@ -+Prq: ++Prc: #if !defined(__s390__) && !defined (__ia64__) OpenOffice_org-gnome #endif --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Utilities new/patterns-openSUSE-data/data/GNOME-Utilities --- old/patterns-openSUSE-data/data/GNOME-Utilities 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Utilities 2008-03-07 11:44:07.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: deskbar-applet evolution-pilot fast-user-switch-applet @@ -10,7 +10,5 @@ libopensync-plugin-file seahorse vino --Prq: -+Prc: dasher -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Utilities-OPT new/patterns-openSUSE-data/data/GNOME-Utilities-OPT --- old/patterns-openSUSE-data/data/GNOME-Utilities-OPT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Utilities-OPT 2008-03-07 11:50:05.000000000 +0100 @@ -1,6 +1,6 @@ -+Prq: ++Prc: alacarte --Prq: +-Prc: +Psg: libopensync-plugin-evolution2 libopensync-plugin-gnokii diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-XGL new/patterns-openSUSE-data/data/GNOME-XGL --- old/patterns-openSUSE-data/data/GNOME-XGL 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-XGL 2008-03-07 11:53:14.000000000 +0100 @@ -1,3 +1,3 @@ -+Prq: ++Prc: compiz-gnome --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/IMAGE-OPT new/patterns-openSUSE-data/data/IMAGE-OPT --- old/patterns-openSUSE-data/data/IMAGE-OPT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/IMAGE-OPT 2008-03-07 11:53:43.000000000 +0100 @@ -1,5 +1,4 @@ +Prc: -AdobeICCProfiles gimp-help exiftool gimp @@ -7,6 +6,7 @@ ufraw-gimp -Prc: +Psg: +AdobeICCProfiles pfstools pfstmo pfscalibration diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-ADMIN new/patterns-openSUSE-data/data/KDE3-ADMIN --- old/patterns-openSUSE-data/data/KDE3-ADMIN 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-ADMIN 2008-03-07 11:38:11.000000000 +0100 @@ -1,3 +1,3 @@ -+Prq: ++Prc: kiosktool --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-BASIS new/patterns-openSUSE-data/data/KDE3-BASIS --- old/patterns-openSUSE-data/data/KDE3-BASIS 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-BASIS 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -+Prq: -kdebase3-kdm -kdebase3-SuSE -kdebase3-session -kdelibs3 -kwin-decor-suse2 --Prq: -+Prc: -#if defined(__i386__) -kdebase3-nsplugin -#endif -kpowersave -NetworkManager -NetworkManager-kde -kdeaddons3-konqueror -kdegraphics3-pdf -kdepim3 -kdepim3-notes -kdeutils3 -kcm_gtk -kdebase3-samba -kio_iso -pinentry-qt -preload -qtcurve-gtk2 -susehelp -yast2-control-center-qt -// we want useful bug reports -gdb --Prc: -+Psc: -NetworkManager-vpnc -NetworkManager-vpnc-kde --Psc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-Edutainment new/patterns-openSUSE-data/data/KDE3-Edutainment --- old/patterns-openSUSE-data/data/KDE3-Edutainment 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-Edutainment 2008-03-07 11:41:33.000000000 +0100 @@ -1,3 +1,3 @@ -+Prq: ++Prc: kdeedu3 --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-IMAGE new/patterns-openSUSE-data/data/KDE3-IMAGE --- old/patterns-openSUSE-data/data/KDE3-IMAGE 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-IMAGE 2008-03-07 11:41:15.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: gwenview digikam kipi-plugins @@ -7,7 +7,5 @@ kdegraphics3 kdegraphics3-kamera kdegraphics3-postscript --Prq: -+Prc: digikamimageplugins -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-Internet new/patterns-openSUSE-data/data/KDE3-Internet --- old/patterns-openSUSE-data/data/KDE3-Internet 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-Internet 2008-03-07 11:37:45.000000000 +0100 @@ -1,11 +1,9 @@ -+Prq: ++Prc: kdenetwork3 kdenetwork3-InstantMessenger kdenetwork3-news kio_slp ktorrent --Prq: -+Prc: // 297684 for these 2 kde4-krfb kde4-krdc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-Multimedia new/patterns-openSUSE-data/data/KDE3-Multimedia --- old/patterns-openSUSE-data/data/KDE3-Multimedia 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-Multimedia 2008-03-07 11:41:26.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: amarok k3b kdemultimedia3 @@ -6,9 +6,6 @@ kdemultimedia3-CD // software.openSUSE.org/codecs opensuse-codecs-installer --Prq: - -+Prc: amarok-yauap amarok-libvisual kaffeine diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-Office new/patterns-openSUSE-data/data/KDE3-Office --- old/patterns-openSUSE-data/data/KDE3-Office 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-Office 2008-03-07 11:40:51.000000000 +0100 @@ -1,6 +1,6 @@ -+Prq: ++Prc: #if !defined(__s390__) && !defined (ia64) OpenOffice_org-kde OpenOffice_org-Quickstarter #endif --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-OFFICE-OPT new/patterns-openSUSE-data/data/KDE3-OFFICE-OPT --- old/patterns-openSUSE-data/data/KDE3-OFFICE-OPT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-OFFICE-OPT 2008-03-07 11:40:58.000000000 +0100 @@ -1,9 +1,3 @@ -+Prq: -#if !defined(__s390__) && !defined (ia64) -OpenOffice_org-Quickstarter -#endif --Prq: - +Psg: koffice koffice-database diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-Utilities new/patterns-openSUSE-data/data/KDE3-Utilities --- old/patterns-openSUSE-data/data/KDE3-Utilities 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-Utilities 2008-03-07 11:40:13.000000000 +0100 @@ -1,9 +1,7 @@ -+Prq: ++Prc: kdeartwork3-kscreensaver kdebluetooth kitchensync --Prq: -+Prc: kdepim3-kpilot -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-UTILITIES-OPT new/patterns-openSUSE-data/data/KDE3-UTILITIES-OPT --- old/patterns-openSUSE-data/data/KDE3-UTILITIES-OPT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-UTILITIES-OPT 2008-03-07 11:40:04.000000000 +0100 @@ -1,7 +1,5 @@ -+Prq: -kdeaddons3-kicker --Prq: +Prc: +kdeaddons3-kicker kdeartwork3-xscreensaver -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE3-XGL new/patterns-openSUSE-data/data/KDE3-XGL --- old/patterns-openSUSE-data/data/KDE3-XGL 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE3-XGL 2008-03-07 11:39:54.000000000 +0100 @@ -1,3 +1,3 @@ -+Prq: ++Prc: compiz-kde --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-ADMIN new/patterns-openSUSE-data/data/KDE4-ADMIN --- old/patterns-openSUSE-data/data/KDE4-ADMIN 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-ADMIN 2008-03-07 11:41:59.000000000 +0100 @@ -1,3 +1,3 @@ -+Prq: ++Prc: kiosktool --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-BASIS new/patterns-openSUSE-data/data/KDE4-BASIS --- old/patterns-openSUSE-data/data/KDE4-BASIS 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-BASIS 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -+Prq: -kdebase4 -kdebase4-session -kdebase4-workspace -kde4-dolphin -kde4-kwin -kde4-kwrite --Prq: -+Prc: -kde4-keditbookmarks -kde4-konqueror -kde4-konsole -#if !defined(__s390__) -kdebase4-nsplugin -#endif -NetworkManager -NetworkManager-kde -kdepim3 -kdepim3-notes -pinentry-qt -qtcurve-gtk2 -yast2-control-center-qt -// we want useful bug reports -gdb -kde4-kdm --Prc: -+Psc: -NetworkManager-vpnc -NetworkManager-vpnc-kde -kpowersave --Psc: - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-Edutainment new/patterns-openSUSE-data/data/KDE4-Edutainment --- old/patterns-openSUSE-data/data/KDE4-Edutainment 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-Edutainment 2008-03-07 11:37:55.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: kde4-blinken kde4-marble kde4-kalzium @@ -16,7 +16,7 @@ kde4-ktouch kde4-parley kde4-kwordquiz --Prq: +-Prc: +Psg: kde4-kturtle diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-IMAGE new/patterns-openSUSE-data/data/KDE4-IMAGE --- old/patterns-openSUSE-data/data/KDE4-IMAGE 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-IMAGE 2008-03-07 11:42:20.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: gwenview digikam kipi-plugins @@ -8,7 +8,5 @@ kde4-kio_kamera kde4-kcolorchooser kde4-kgamma --Prq: -+Prc: digikamimageplugins -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-Internet new/patterns-openSUSE-data/data/KDE4-Internet --- old/patterns-openSUSE-data/data/KDE4-Internet 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-Internet 2008-03-07 11:37:37.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: kde4-kdnssd kde4-kget kde4-kopete @@ -6,8 +6,6 @@ // not KDE4 related //kio_slp ktorrent --Prq: -+Prc: // 297684 for these 2 kde4-krfb kde4-krdc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-Multimedia new/patterns-openSUSE-data/data/KDE4-Multimedia --- old/patterns-openSUSE-data/data/KDE4-Multimedia 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-Multimedia 2008-03-07 11:42:28.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: amarok k3b kde4-kmix @@ -6,9 +6,6 @@ kde4-kio_audiocd // software.openSUSE.org/codecs opensuse-codecs-installer --Prq: - -+Prc: amarok-yauap amarok-libvisual kaffeine diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-Office new/patterns-openSUSE-data/data/KDE4-Office --- old/patterns-openSUSE-data/data/KDE4-Office 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-Office 2008-03-07 11:42:39.000000000 +0100 @@ -1,6 +1,6 @@ -+Prq: ++Prc: #if !defined(__s390__) && !defined (ia64) OpenOffice_org-kde OpenOffice_org-Quickstarter #endif --Prq: +-Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-OFFICE-OPT new/patterns-openSUSE-data/data/KDE4-OFFICE-OPT --- old/patterns-openSUSE-data/data/KDE4-OFFICE-OPT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-OFFICE-OPT 2008-03-07 11:42:51.000000000 +0100 @@ -1,9 +1,3 @@ -+Prq: -#if !defined(__s390__) && !defined (ia64) -OpenOffice_org-Quickstarter -#endif --Prq: - +Psg: koffice koffice-database diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-Utilities new/patterns-openSUSE-data/data/KDE4-Utilities --- old/patterns-openSUSE-data/data/KDE4-Utilities 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-Utilities 2008-03-07 11:42:59.000000000 +0100 @@ -1,9 +1,7 @@ -+Prq: ++Prc: kdeartwork4-screensaver kdebluetooth kitchensync --Prq: -+Prc: kdepim3-kpilot -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-UTILITIES-OPT new/patterns-openSUSE-data/data/KDE4-UTILITIES-OPT --- old/patterns-openSUSE-data/data/KDE4-UTILITIES-OPT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-UTILITIES-OPT 2008-03-07 11:43:07.000000000 +0100 @@ -1,7 +1,5 @@ -+Prq: -kde4-konqueror-plugins --Prq: +Prc: +kde4-konqueror-plugins extragear-plasma -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/LAMP new/patterns-openSUSE-data/data/LAMP --- old/patterns-openSUSE-data/data/LAMP 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/LAMP 2008-03-07 11:55:18.000000000 +0100 @@ -1,9 +1,6 @@ -+Prq: ++Prc: apache2 yast2-http-server --Prq: - -+Prc: apache2-doc apache2-example-pages apache2-mod_perl diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/LAPTOP new/patterns-openSUSE-data/data/LAPTOP --- old/patterns-openSUSE-data/data/LAPTOP 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/LAPTOP 2008-03-07 11:44:55.000000000 +0100 @@ -1,9 +1,7 @@ -+Prq: ++Prc: #if defined(__i386__) || defined (__x86_64__) suspend #endif --Prq: -+Prc: dockutils irda jarnal diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/LDAP_SERVER new/patterns-openSUSE-data/data/LDAP_SERVER --- old/patterns-openSUSE-data/data/LDAP_SERVER 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/LDAP_SERVER 2008-03-07 11:55:05.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: nss_ldap openldap2 pam_ldap @@ -7,7 +7,7 @@ nss_ldap-32bit pam_ldap-32bit #endif --Prq: +-Prc: +Prc: -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/NETWORK-ADMIN new/patterns-openSUSE-data/data/NETWORK-ADMIN --- old/patterns-openSUSE-data/data/NETWORK-ADMIN 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/NETWORK-ADMIN 2008-03-07 11:44:44.000000000 +0100 @@ -1,11 +1,9 @@ -+Prq: ++Prc: nmap quagga tcpdump whois wireshark --Prq: -+Prc: arpwatch iftop nagios diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/NON-OSS-JAVA new/patterns-openSUSE-data/data/NON-OSS-JAVA --- old/patterns-openSUSE-data/data/NON-OSS-JAVA 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/NON-OSS-JAVA 2008-03-07 11:54:18.000000000 +0100 @@ -1,9 +1,9 @@ -+Prq: ++Prc: java-1_6_0-sun #ifdef __i386__ java-plugin #endif --Prq: +-Prc: +Psg: ant-javamail java-1_5_0-sun-alsa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/OFFICE new/patterns-openSUSE-data/data/OFFICE --- old/patterns-openSUSE-data/data/OFFICE 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/OFFICE 2008-03-07 11:54:08.000000000 +0100 @@ -1,10 +1,8 @@ -+Prq: ++Prc: #if !defined(__s390__) && !defined (__ia64__) OpenOffice_org #endif --Prq: -+Prc: #if !defined(__s390__) && !defined (__ia64__) OpenOffice_org-calc OpenOffice_org-draw diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/PRINT_SERVER new/patterns-openSUSE-data/data/PRINT_SERVER --- old/patterns-openSUSE-data/data/PRINT_SERVER 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/PRINT_SERVER 2008-03-07 11:54:56.000000000 +0100 @@ -1,8 +1,5 @@ -+Prq: -cups --Prq: - +Prc: +cups cups-backends cups-drivers filters diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-DVD new/patterns-openSUSE-data/data/REST-DVD --- old/patterns-openSUSE-data/data/REST-DVD 2008-02-22 10:18:18.000000000 +0100 +++ new/patterns-openSUSE-data/data/REST-DVD 2008-03-05 14:18:46.000000000 +0100 @@ -161,5 +161,9 @@ uvcvideo-kmp-xen wlan-ng-kmp-pae wlan-ng-kmp-xen +quickcam-kmp-default +quickcam-kmp-pae +// drag in -lang for the easy ones +bundle-lang-other -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/SW-MANGEMENT new/patterns-openSUSE-data/data/SW-MANGEMENT --- old/patterns-openSUSE-data/data/SW-MANGEMENT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/SW-MANGEMENT 2008-03-07 11:52:49.000000000 +0100 @@ -1,8 +1,6 @@ -+Prq: ++Prc: zypper -// workaround for broken Ooo provides -libicu --Prq: +-Prc: +Psg: pin -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/X11 new/patterns-openSUSE-data/data/X11 --- old/patterns-openSUSE-data/data/X11 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/X11 2008-03-07 11:49:02.000000000 +0100 @@ -3,12 +3,12 @@ #if defined __x86_64__ nss-mdns-32bit #endif -#if !defined(__s390__) -yast2-x11 -#endif -Prq: +Prc: +#if !defined(__s390__) +yast2-x11 +#endif // needed e.g. for nvidia drivers 3ddiag // needed for fetchmsfonts (#327524) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/XEN new/patterns-openSUSE-data/data/XEN --- old/patterns-openSUSE-data/data/XEN 2008-02-22 10:18:10.000000000 +0100 +++ new/patterns-openSUSE-data/data/XEN 2008-03-07 11:55:24.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: bridge-utils vm-install xen @@ -7,8 +7,6 @@ #if defined(__x86_64__) || defined(__i386__) kernel-xen #endif --Prq: -+Prc: virt-manager xen-doc-html xen-doc-pdf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/YAST_BASIS new/patterns-openSUSE-data/data/YAST_BASIS --- old/patterns-openSUSE-data/data/YAST_BASIS 2008-03-02 17:18:28.000000000 +0100 +++ new/patterns-openSUSE-data/data/YAST_BASIS 2008-03-07 11:54:39.000000000 +0100 @@ -1,4 +1,4 @@ -+Prq: ++Prc: // #304686 yast2-fingerprint-reader #if defined(__x86_64__) || defined(__s390x__) || defined(__ppc__) @@ -42,8 +42,8 @@ yast2-update yast2-users yast2-xml --Prq: -+Prc: + +// second class yast2-backup yast2-inetd yast2-iscsi-client diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_cd_gnome/requires new/patterns-openSUSE-data/toinstall/rest_cd_gnome/requires --- old/patterns-openSUSE-data/toinstall/rest_cd_gnome/requires 2008-02-29 12:32:29.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_cd_gnome/requires 2008-03-06 19:56:13.000000000 +0100 @@ -22,5 +22,7 @@ xgl yast2_basis yast2_install_wf +#if defined(__i386__) games gnome_games +#endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org