March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit gstreamer-0_10-plugins-ugly for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-ugly for openSUSE:Factory checked in at Thu Mar 26 02:32:49 CET 2009. -------- --- GNOME/gstreamer-0_10-plugins-ugly/gstreamer-0_10-plugins-ugly.changes 2009-01-02 01:00:50.000000000 +0100 +++ gstreamer-0_10-plugins-ugly/gstreamer-0_10-plugins-ugly.changes 2009-03-23 17:29:40.000000000 +0100 @@ -1,0 +2,21 @@ +Mon Mar 23 14:07:08 CET 2009 - vuntz(a)novell.com + +- Update to version 0.10.11: + + Migrate twolame element from -bad + + mp3parse improvements + + Support scaling in the synaesthsia visualisation + + Improve realmedia streaming, supporting RDT and pnm:// + + Improved ASF demuxing, including streaming-mode seeking + + Support for 4:4:4 MPEG-2 video + + Bugs fixed: bgo#571146, bgo#574461, bgo#454228, bgo#522699, + bgo#527112, bgo#556714, bgo#560348, bgo#562065, bgo#562086, + bgo#564885, bgo#568836, bgo#569317, bgo#575068, bgo#335067, + bgo#571358 +- Drop gstreamer010-plugins-ugly-enable-incomplete.patch: we + stopped applying it since resindvd from -bad should be better. +- Drop gstreamer010-plugins-ugly-dvdnav.patch since we don't build + dvdnav. +- Use makeinstall. +- Respin gstreamer010-plugins-ugly-patched.patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gst-plugins-ugly-0.10.10-patched.tar.bz2 gst-plugins-ugly-0.10.10.tar.bz2 gstreamer010-plugins-ugly-dvdnav.patch gstreamer010-plugins-ugly-enable-incomplete.patch New: ---- gst-plugins-ugly-0.10.11-patched.tar.bz2 gst-plugins-ugly-0.10.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-ugly.spec ++++++ --- /var/tmp/diff_new_pack.q25947/_old 2009-03-26 02:32:22.000000000 +0100 +++ /var/tmp/diff_new_pack.q25947/_new 2009-03-26 02:32:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gstreamer-0_10-plugins-ugly (Version 0.10.10) +# spec file for package gstreamer-0_10-plugins-ugly (Version 0.10.11) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gstreamer-0_10-plugins-ugly -Version: 0.10.10 +Version: 0.10.11 Release: 1 # Patched code is built by default. # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. @@ -40,9 +40,11 @@ BuildRequires: xorg-x11-devel %if 0%{?BUILD_ORIG} BuildRequires: a52dec-devel -BuildRequires: amrnb-devel lame +BuildRequires: amrnb-devel +BuildRequires: lame BuildRequires: libmpeg2-devel BuildRequires: mad-devel +# NOTE: twolame: Requires twolame: Optimised MPEG Audio Layer 2 (MP2) encoder %if 0%{?BUILD_ORIG_ADDON} Provides: patched_subset %else @@ -66,9 +68,7 @@ Source: %{_name}-%{version}-patched.tar.bz2 %endif Source1: %{name}-patch-source.sh -Patch: gstreamer010-plugins-ugly-enable-incomplete.patch Patch1: gstreamer010-plugins-ugly-patched.patch -Patch2: gstreamer010-plugins-ugly-dvdnav.patch Url: http://gstreamer.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: GStreamer Streaming-Media Framework Plug-Ins @@ -215,12 +215,9 @@ %lang_package %prep %setup -q -n %{_name}-%{version} -# WARNING: Disable this patch for release! -#%patch %if ! 0%{?BUILD_ORIG} %patch1 %endif -%patch2 %build NOCONFIGURE=1 ./autogen.sh @@ -230,7 +227,7 @@ make %{?jobs:-j%jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_branch}/*.*a %if ! 0%{?BUILD_ORIG} for MODULE in \ @@ -287,6 +284,24 @@ %{_datadir}/gtk-doc/html/gst-plugins-ugly-plugins-%{gst_branch} %changelog +* Mon Mar 23 2009 vuntz(a)novell.com +- Update to version 0.10.11: + + Migrate twolame element from -bad + + mp3parse improvements + + Support scaling in the synaesthsia visualisation + + Improve realmedia streaming, supporting RDT and pnm:// + + Improved ASF demuxing, including streaming-mode seeking + + Support for 4:4:4 MPEG-2 video + + Bugs fixed: bgo#571146, bgo#574461, bgo#454228, bgo#522699, + bgo#527112, bgo#556714, bgo#560348, bgo#562065, bgo#562086, + bgo#564885, bgo#568836, bgo#569317, bgo#575068, bgo#335067, + bgo#571358 +- Drop gstreamer010-plugins-ugly-enable-incomplete.patch: we + stopped applying it since resindvd from -bad should be better. +- Drop gstreamer010-plugins-ugly-dvdnav.patch since we don't build + dvdnav. +- Use makeinstall. +- Respin gstreamer010-plugins-ugly-patched.patch. * Fri Jan 02 2009 mboman(a)suse.de - Update to version 0.10.10: + Bugs fixed: bgo#546859, bgo#536274, bgo#554142, bgo#554150, bgo#556184, @@ -300,7 +315,7 @@ * Thu Nov 06 2008 sbrabec(a)suse.cz - Fixed valgrid BuildRequires. - Disabled incomplete dvdnav, resindvd from -bad should be better. -* Tue Sep 16 2008 jpr(a)novell.com +* Wed Sep 17 2008 jpr(a)novell.com - Update to version 0.10.9: * Bug fixes in Xing header muxer * Real streaming and demuxing improvements @@ -387,7 +402,7 @@ * fixes in mpeg2dec, asfdemux, mpegdemux, dvddemux, rmdemux, mpegparse, amrnb, mad, lame, a52dec * bug fixes -* Thu Feb 23 2006 jpr(a)suse.de +* Fri Feb 24 2006 jpr(a)suse.de - Update to 0.10.2 - This is GStreamer Ugly Plug-ins 0.10.2, "Season to Taste". Features since 0.10.1: @@ -417,7 +432,7 @@ - Fixed Requires. * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Mon Jan 23 2006 ro(a)suse.de +* Tue Jan 24 2006 ro(a)suse.de - avoid gstreamer installation (-gstreamer in nfb) * Wed Jan 18 2006 sbrabec(a)suse.cz - Updated to version 0.10.1. ++++++ gst-plugins-ugly-0.10.10-patched.tar.bz2 -> gst-plugins-ugly-0.10.11-patched.tar.bz2 ++++++ ++++ 67729 lines of diff (skipped) ++++++ gst-plugins-ugly-0.10.10-patched.tar.bz2 -> gst-plugins-ugly-0.10.11.tar.bz2 ++++++ ++++ 85609 lines of diff (skipped) ++++++ gstreamer010-plugins-ugly-patched.patch ++++++ --- /var/tmp/diff_new_pack.q25947/_old 2009-03-26 02:32:26.000000000 +0100 +++ /var/tmp/diff_new_pack.q25947/_new 2009-03-26 02:32:26.000000000 +0100 @@ -15,7 +15,7 @@ AG_GST_CHECK_PLUGIN(realmedia) AG_GST_CHECK_PLUGIN(synaesthesia) -@@ -423,12 +419,8 @@ Makefile +@@ -447,12 +443,8 @@ common/shave-libtool gst-libs/Makefile gst-libs/gst/Makefile gst/Makefile @@ -32,10 +32,10 @@ =================================================================== --- docs/plugins/Makefile.am.orig +++ docs/plugins/Makefile.am -@@ -91,8 +91,6 @@ EXTRA_HFILES = \ - $(top_srcdir)/ext/lame/gstlame.h \ +@@ -92,8 +92,6 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/mad/gstmad.h \ $(top_srcdir)/ext/sidplay/gstsiddec.h \ + $(top_srcdir)/ext/twolame/gsttwolame.h \ - $(top_srcdir)/gst/asfdemux/gstrtspwms.h \ - $(top_srcdir)/gst/mpegaudioparse/gstxingmux.h \ $(top_srcdir)/gst/realmedia/rademux.h \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Pango for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package perl-Pango for openSUSE:Factory checked in at Thu Mar 26 02:26:29 CET 2009. -------- New Changes file: --- /dev/null 2008-04-22 03:09:48.000000000 +0200 +++ perl-Pango/perl-Pango.changes 2009-03-23 18:11:02.000000000 +0100 @@ -0,0 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 23 18:09:51 CET 2009 - anicka(a)suse.cz + +- update to 1.220 + * Makefile.PL: Use Glib::MakeMaker to add a precompiled-headers + Makefile target that precompiles pango-perl.h. + * xs/PangoLayout.xs: Allow passing undef to + Gtk2::Pango::Layout::set_attributes(). + +------------------------------------------------------------------- +Thu Feb 12 13:05:03 CET 2009 - ro(a)suse.de + +- created package version 1.210 (unstable) + calling whatdependson for head-i586 New: ---- Pango-1.220.tar.bz2 perl-Pango.changes perl-Pango.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Pango.spec ++++++ # # spec file for package perl-Pango (Version 1.220) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: perl-Pango BuildRequires: cairo-devel pango-devel perl-Cairo perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib update-desktop-files xorg-x11 xorg-x11-Xvfb xorg-x11-server Version: 1.220 Release: 1 Requires: perl = %{perl_version} Requires: perl-Glib perl-Cairo AutoReqProv: on Group: Development/Libraries/Perl License: LGPL v2.1 or later Url: http://gtk2-perl.sourceforge.net Summary: Pango Perl module (bindings) Source: Pango-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Pango is a library for laying out and rendering text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, but using Pango in conjunction with L<Cairo> and/or L<Gtk2> provides a complete solution with high quality text handling and graphics rendering. %prep %setup -q -n Pango-%{version} %build export OPTIMIZE="$RPM_OPT_FLAGS" perl Makefile.PL OPTIMIZE="$OPTIMIZE" make OPTIMIZE="$OPTIMIZE" %check Xvfb -fp /usr/share/fonts/misc -extension RANDR :95 & trap "kill $! || true" EXIT sleep 5 DISPLAY=:95 make test %install %perl_make_install %perl_process_packlist %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS LICENSE NEWS README %doc %{_mandir}/man?/* %{perl_vendorarch}/Pango.pm %{perl_vendorarch}/Pango %{perl_vendorarch}/auto/Pango /var/adm/perl-modules/%{name} %changelog * Mon Mar 23 2009 anicka(a)suse.cz - update to 1.220 * Makefile.PL: Use Glib::MakeMaker to add a precompiled-headers Makefile target that precompiles pango-perl.h. * xs/PangoLayout.xs: Allow passing undef to Gtk2::Pango::Layout::set_attributes(). * Thu Feb 12 2009 ro(a)suse.de - created package version 1.210 (unstable) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit accerciser for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package accerciser for openSUSE:Factory checked in at Thu Mar 26 02:13:54 CET 2009. -------- --- GNOME/accerciser/accerciser.changes 2009-02-20 16:32:56.000000000 +0100 +++ accerciser/accerciser.changes 2009-03-16 16:25:27.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Mar 16 16:04:32 CET 2009 - vuntz(a)novell.com + +- Update to version 1.6.0: + + Fixed selection interface in interface viewer plugin + (bgo#574783). + + Added an informative window title (bgo#574103). + + Fixed empty padding issue in prefs dialog (bgo#574101). + + Ported script recorder to gtksourceview2 (bgo#574100). + + Don't allow the set_range to change the value of our accessible + (bgo#572201). + + Updated translations. +- Remove unneeded BuildRequires: gnome-common, gtk2-devel, + libgnome-devel, libgnomeui-devel, pkg-config, scrollkeeper +- Add python-gtksourceview Requires. +- Add py_requires. +- Remove AutoReqProv: it's default now. +- Remove definition of CFLAGS. +- Drop autoreconf call. +- Don't package omf files twice (they are in the lang package too). +- Clean up file list. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- accerciser-1.5.91.tar.bz2 New: ---- accerciser-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ accerciser.spec ++++++ --- /var/tmp/diff_new_pack.O30454/_old 2009-03-26 02:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.O30454/_new 2009-03-26 02:11:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package accerciser (Version 1.5.91) +# spec file for package accerciser (Version 1.6.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,21 +20,32 @@ Name: accerciser Summary: Accessibility debugging tool -Version: 1.5.91 +Version: 1.6.0 Release: 1 License: BSD 3-Clause; LGPL v2.1 or later Group: Development/Tools/Other Url: http://live.gnome.org/Accerciser Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on +BuildRequires: at-spi +BuildRequires: fdupes +BuildRequires: gconf2-devel +BuildRequires: gnome-doc-utils-devel +BuildRequires: gnome-python-desktop +BuildRequires: intltool +BuildRequires: python-gnome +BuildRequires: python-gnome-extras +BuildRequires: python-orbit +BuildRequires: update-desktop-files +Requires: IPython +Requires: at-spi +Requires: gnome-python-desktop +Requires: python-gnome +Requires: python-gnome-extras +Requires: python-gtksourceview +Requires: python-orbit Requires: %{name}-lang = %{version} -Requires: IPython python-gnome python-gnome-extras python-orbit -Requires: gnome-python-desktop at-spi -BuildRequires: fdupes gconf2-devel gnome-common gnome-doc-utils-devel gtk2-devel -BuildRequires: intltool libgnome-devel libgnomeui-devel pkg-config scrollkeeper -BuildRequires: python-gnome python-gnome-extras update-desktop-files -BuildRequires: at-spi >= 1.24.0 gnome-python-desktop python-orbit update-desktop-files +%py_requires %gconf_schemas_prereq %description @@ -59,15 +70,12 @@ %setup -n %{name}-%{version} %build -export CFLAGS=$RPM_OPT_FLAGS -autoreconf -f -i %configure \ --disable-scrollkeeper %__make %{?jobs:-j%jobs} %install %makeinstall -# % suse_update_desktop_file Development-Other accerciser %suse_update_desktop_file -r -N "Accerciser" -G "Accesibility Debugger" accerciser Utility GNOME Accessibility %find_gconf_schemas %find_lang %{name} @@ -87,35 +95,33 @@ %{_bindir}/%{name} %py_sitedir/%{name} %{_datadir}/%{name} -%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -%{_datadir}/icons/hicolor/22x22/apps/%{name}.png -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/man/man1/%{name}.1.gz %{_datadir}/applications/%{name}.desktop -%{_datadir}/omf/%{name} -## %{_bindir}/* -## %{_datadir}/applications/* -## %dir %{_datadir}/gnome/help/%{name} -## %dir %{_datadir}/gnome/help/%{name}/C -## %dir %{_datadir}/gnome/help/%{name}/C/figures -## %{_datadir}/gnome/help/%{name}/C/*.xml -## %{_datadir}/gnome/help/%{name}/C/figures/*.png -## %dir %{_datadir}/gnome/help/%{name}/oc -## %dir %{_datadir}/gnome/help/%{name}/oc/figures -## %{_datadir}/gnome/help/%{name}/oc/*.xml -## %{_datadir}/gnome/help/%{name}/oc/figures/*.png -## %dir %{_datadir}/gnome/help/%{name}/sv -## %dir %{_datadir}/gnome/help/%{name}/sv/figures -## %{_datadir}/gnome/help/%{name}/sv/*.xml -## %{_datadir}/gnome/help/%{name}/sv/figures/*.png -## %{_datadir}/icons/hicolor/48x48/apps/*.png -## %{_datadir}/omf/%{name}/*.omf %files lang -f %{name}.lang %changelog +* Mon Mar 16 2009 vuntz(a)novell.com +- Update to version 1.6.0: + + Fixed selection interface in interface viewer plugin + (bgo#574783). + + Added an informative window title (bgo#574103). + + Fixed empty padding issue in prefs dialog (bgo#574101). + + Ported script recorder to gtksourceview2 (bgo#574100). + + Don't allow the set_range to change the value of our accessible + (bgo#572201). + + Updated translations. +- Remove unneeded BuildRequires: gnome-common, gtk2-devel, + libgnome-devel, libgnomeui-devel, pkg-config, scrollkeeper +- Add python-gtksourceview Requires. +- Add py_requires. +- Remove AutoReqProv: it's default now. +- Remove definition of CFLAGS. +- Drop autoreconf call. +- Don't package omf files twice (they are in the lang package too). +- Clean up file list. * Fri Feb 20 2009 vuntz(a)novell.com - Review changes. * Thu Feb 19 2009 dominique-obs(a)leuenberger.net ++++++ accerciser-1.5.91.tar.bz2 -> accerciser-1.6.0.tar.bz2 ++++++ ++++ 8905 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cnetworkmanager for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package cnetworkmanager for openSUSE:Factory checked in at Thu Mar 26 02:06:07 CET 2009. -------- --- cnetworkmanager/cnetworkmanager.changes 2009-03-06 17:42:53.000000000 +0100 +++ cnetworkmanager/cnetworkmanager.changes 2009-03-21 08:03:29.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Mar 21 07:18:00 CET 2009 - mvidner(a)suse.cz + +- v0.8.4 +- New: When connecting (-C), monitor the NM connection state. +- Fix: RPM packaging: consistent PREFIX (bnc#485413), owning pkgdatadir. +- Fix: KeyError with --wep-hex. (James Hogan) +- Fix: knetworkmanagerrc: Don't let ConnectionSettings + override ConnectionSecrets. +- Updated pbkdf2.py to the newest upstream version (license + clarified). (Alexander Block) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cnetworkmanager-0.8.3.tar.gz New: ---- cnetworkmanager-0.8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cnetworkmanager.spec ++++++ --- /var/tmp/diff_new_pack.N20313/_old 2009-03-26 02:05:02.000000000 +0100 +++ /var/tmp/diff_new_pack.N20313/_new 2009-03-26 02:05:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cnetworkmanager (Version 0.8.3) +# spec file for package cnetworkmanager (Version 0.8.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: cnetworkmanager -Version: 0.8.3 -Release: 2 +Version: 0.8.4 +Release: 1 Summary: Command-line client for NetworkManager License: GPL v2 or later Url: http://vidner.net/martin/software/cnetworkmanager/ @@ -42,7 +42,7 @@ #% patch -p1 %build -make +make PREFIX=/usr %install make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr sysconfdir=/etc @@ -64,6 +64,15 @@ %doc /usr/share/doc/packages/cnetworkmanager %changelog +* Sat Mar 21 2009 mvidner(a)suse.cz +- v0.8.4 +- New: When connecting (-C), monitor the NM connection state. +- Fix: RPM packaging: consistent PREFIX (bnc#485413), owning pkgdatadir. +- Fix: KeyError with --wep-hex. (James Hogan) +- Fix: knetworkmanagerrc: Don't let ConnectionSettings + override ConnectionSecrets. +- Updated pbkdf2.py to the newest upstream version (license + clarified). (Alexander Block) * Fri Mar 06 2009 mvidner(a)suse.cz - Packaging fix: claim ownership of pkgdatadir * Thu Mar 05 2009 mvidner(a)suse.cz ++++++ cnetworkmanager-0.8.3.tar.gz -> cnetworkmanager-0.8.4.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cnetworkmanager-0.8.3/cnetworkmanager new/cnetworkmanager-0.8.4/cnetworkmanager --- old/cnetworkmanager-0.8.3/cnetworkmanager 2009-03-05 15:48:44.000000000 +0100 +++ new/cnetworkmanager-0.8.4/cnetworkmanager 2009-03-21 08:07:53.000000000 +0100 @@ -3,7 +3,7 @@ # by: http://en.opensuse.org/User:Mvidner # license: http://www.gnu.org/licenses/gpl-2.0.html or later -VERSION = "0.8.3" +VERSION = "0.8.4" print "cnetworkmanager %s - Command Line Interface for NetworkManager" % VERSION norpm = False @@ -100,21 +100,29 @@ for dev in self.Devices(): dev.ListNets() - def reply_handler(self, opath): - print "Connected:", opath - def err_handler(self, *args): print "ERR:", args def silent_handler(self, *args): pass - print "BOO!:", args + #print "BOO!:", args def quitter_handler(self, *args): # exit the loop that runs only because of us print "padla" sys.exit(0) + def WatchState(self): + bus.add_signal_receiver(self.state_changed_handler, + dbus_interface="org.freedesktop.NetworkManager", + signal_name="StateChanged") + + def state_changed_handler(self, *args): + s = args[0] + ss = self.NM_STATE[s] + print time.strftime("(%X)"), + print "State:", ss + def make_nm(opath): "Detects NM version and chooses appropriate class" @@ -178,16 +186,10 @@ def ActiveConnections(self): return [] # at most one active connection, FIXME find it - def reply_handler(self): - print "Connection requested" - - def err_handler(self, *args): - print "ERR:", args - def ActivateConnection(self, conn, device, ap): # passing *_handler makes the call asynchronous self.nmi.setActiveDevice(device.opath, ssid_str(conn.Ssid()), - reply_handler=self.reply_handler, + reply_handler=self.silent_handler, error_handler=self.err_handler, ) @@ -220,7 +222,7 @@ conn.__dbus_object_path__, device.opath, ap.opath, - reply_handler=self.reply_handler, + reply_handler=self.silent_handler, error_handler=self.err_handler, ) @@ -661,8 +663,11 @@ secrets = cSettings(si.GetSecrets(security,[],False)) secrets.Dump() except dbus.exceptions.DBusException, e: - print e - print " FIXME figure out 802-1x secrets" + if e.get_dbus_name() == "org.freedesktop.DBus.Error.AccessDenied": + print " Access denied" + else: + print " ", e + print " FIXME figure out 802-1x secrets" def Settings(self): return cSettings(self.ci.GetSettings()) @@ -863,6 +868,8 @@ def mkconmap_wep(ssid, key): cm = mkconmap_wifi(ssid) + cm["802-11-wireless"]["security"] = "802-11-wireless-security" + cm["802-11-wireless-security"] = {} cm["802-11-wireless-security"]["key-mgmt"] = "none" cm["802-11-wireless-security"]["wep-tx-keyidx"] = 0 cm["802-11-wireless-security"]["wep-key0"] = key @@ -1094,7 +1101,7 @@ self.conmaps_d = {} for s in p.sections(): path = s.split("_") - #print path + #print "##", path if path[0] in ["ConnectionSetting", "ConnectionSecrets"]: cid = path[1] self.conmaps_d.setdefault(cid, {}) @@ -1102,11 +1109,19 @@ values = {} for (n, v) in p.items(s): - # WTF, Value_ is transfrmed to value_ + # WTF, Value_ is transformed to value_ if n[:6] == "value_": n = n[6:] v = self.ParseValue(v) - values[n] = v + #print "# %s:%s" % (n, v) + # do not overwrite ConnectionSecrets + # with empty ConnectionSettings field + try: + vv = self.conmaps_d[cid][part][n] + except KeyError: + vv = "" + if vv == "": + values[n] = v if len(values) != 0: # empty 802-1x confuses NM!? self.conmaps_d[cid].setdefault(part, {}) self.conmaps_d[cid][part].update(**values) @@ -1148,24 +1163,34 @@ else: return "" -def abbr_signal_handler(*args, **kwargs): - ifc = kwargs["interface"] - sig = kwargs["member"] - opath = kwargs["path"] - line = "SIG %s: %s.%s%s" % (abbrev(opath,"/"), abbrev(ifc,"."), sig, args) - print line - -class Monitor: +class MonitorBase: def __init__(self): self.amap = {} - bus.add_signal_receiver(self.abbr_signal_handler, + self.specific = {} + bus.add_signal_receiver(self.abbr_h, path_keyword="path", interface_keyword="interface", member_keyword="member") - def abbr_signal_handler(self, *args, **kwargs): + def ignore(self, dbus_interface, signal_name): + self.watch(self.null_h, dbus_interface, signal_name) + + def null_h(self, *args, **kwargs): + pass + + def watch(self, handler, dbus_interface, signal_name): + self.specific[dbus_interface +"."+ signal_name] = True + bus.add_signal_receiver(handler, + dbus_interface=dbus_interface, + signal_name=signal_name, + path_keyword="path") + + def abbr_h(self, *args, **kwargs): ifc = kwargs["interface"] sig = kwargs["member"] + if self.specific.has_key(ifc +"."+ sig): + return + opath = kwargs["path"] line = "SIG %s: %s.%s%s" % (self.abbrev(opath,"/"), self.abbrev(ifc,"."), @@ -1176,19 +1201,81 @@ words = s.split(sep) words = map (self.a1, words) result = sep.join(words) - if not self.amap.has_key(s): - print "ABBR %s is %s" % (result, s) - self.amap[s] = result + if self.amap.has_key(result): + if self.amap[result] != s: + print "ABBR COLLISION %s was %s now %s" % (result, self.amap[result], s) else: - if self.amap[s] != result: - print "ABBR COLLISION %s was %s now %s" % (s, self.amap[s], result) + print "ABBR %s is %s" % (result, s) + self.amap[result] = s return result def a1(self, s): - try: - return s[0] - except: + if s == "": return "" + #print "#A", s + # first char, delete lowercase and _ from the rest + return s[0] + s[1:].translate(string.maketrans("", ""), + string.lowercase + "_") + +class Monitor(MonitorBase): + def __init__(self): + MonitorBase.__init__(self) + + self.watch( + self.propc_h, + dbus_interface="org.freedesktop.NetworkManager.Device.Wireless", + signal_name="PropertiesChanged") + self.watch( + self.propc_h, + dbus_interface="org.freedesktop.NetworkManager.AccessPoint", + signal_name="PropertiesChanged") + + self.ignore("org.freedesktop.Hal.Device", "PropertyModified") + self.ignore("fi.epitest.hostap.WPASupplicant.Interface", "ScanResultsAvailable") + self.ignore("com.redhat.PrinterSpooler", "QueueChanged") + self.ignore("org.freedesktop.NetworkManager", "StateChange") # deprecated + self.watch(self.nm_sc_h, "org.freedesktop.NetworkManager", "StateChanged") + self.watch(self.wpas_isc_h, "fi.epitest.hostap.WPASupplicant.Interface", "StateChange") + self.watch(self.nmd_sc_h, "org.freedesktop.NetworkManager.Device", "StateChanged") + self.watch(self.bus_noc_h, "org.freedesktop.DBus", "NameOwnerChanged") + + def bus_noc_h(self, *args, **kwargs): + (name, old, new) = args + if new == "": + new = "gone" + else: + new = "at " + new + print "\tBUS NOC\t%s %s" % (name, new) + + def wpas_isc_h(self, *args, **kwargs): + opath = kwargs["path"] + (new, old) = args + print "\tWPAS %s\t(%s, was %s)" % (new, opath, old.lower()) + + def nmd_sc_h(self, *args, **kwargs): + opath = kwargs["path"] + (new, old, reason) = args + news = cDevice_07.NM_DEVICE_STATE[new] + olds = cDevice_07.NM_DEVICE_STATE[old] + reasons = "" + if reason != 0: + reasons = "reason %d" % reason + print "\tDevice State %s\t(%s, was %s%s)" % (news, opath, olds.lower(), reasons) + + def nm_sc_h(self, *args, **kwargs): + s = args[0] + ss = cNM.NM_STATE[s] + print "\tNM State:", ss + + def propc_h(self, *args, **kwargs): + opath = kwargs["path"] + props = args[0] + for k, v in props.iteritems(): + if k == "Strength": + v = "%u" % v + line = "\tPROP\t%s\t%s\t(%s)" % (k, v, opath) + print line + # main @@ -1365,6 +1452,7 @@ print "pbkdf2", wpa_psk_hex c = mkconmap_psk(options.connect, wpa_psk_hex) us.addCon(c) + nm.WatchState() if Connect(options.connect): LOOP = True diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cnetworkmanager-0.8.3/cnetworkmanager.spec new/cnetworkmanager-0.8.4/cnetworkmanager.spec --- old/cnetworkmanager-0.8.3/cnetworkmanager.spec 2009-03-05 15:48:44.000000000 +0100 +++ new/cnetworkmanager-0.8.4/cnetworkmanager.spec 2009-03-21 08:07:53.000000000 +0100 @@ -18,7 +18,7 @@ Name: cnetworkmanager -Version: 0.8.3 +Version: 0.8.4 Release: 1 Summary: Command-line client for NetworkManager License: GPL v2 or later @@ -26,6 +26,7 @@ Group: Productivity/Networking/System BuildRequires: dbus-1 Requires: dbus-1-python python-gobject2 +Provides: NetworkManager-client BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Source: %{name}-%{version}.tar.gz @@ -41,7 +42,7 @@ #% patch -p1 %build -make +make PREFIX=/usr %install make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr sysconfdir=/etc @@ -55,6 +56,7 @@ %files %defattr(-,root,root) /usr/bin/cnetworkmanager +%dir /usr/share/cnetworkmanager /usr/share/cnetworkmanager/cnetworkmanager /usr/share/cnetworkmanager/pbkdf2.py /etc/dbus-1/system.d/cnetworkmanager.conf @@ -62,6 +64,17 @@ %doc /usr/share/doc/packages/cnetworkmanager %changelog +* Sat Mar 21 2009 mvidner(a)suse.cz +- v0.8.4 +- New: When connecting (-C), monitor the NM connection state. +- Fix: RPM packaging: consistent PREFIX (bnc#485413), owning pkgdatadir. +- Fix: KeyError with --wep-hex. (James Hogan) +- Fix: knetworkmanagerrc: Don't let ConnectionSettings + override ConnectionSecrets. +- Updated pbkdf2.py to the newest upstream version (license + clarified). (Alexander Block) +* Fri Mar 06 2009 mvidner(a)suse.cz +- Packaging fix: claim ownership of pkgdatadir * Thu Mar 05 2009 mvidner(a)suse.cz - v0.8.3 - Fix: secrets leak via o.fd.NMS.Connection.Secrets (CVE-2009-0365) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cnetworkmanager-0.8.3/Makefile new/cnetworkmanager-0.8.4/Makefile --- old/cnetworkmanager-0.8.3/Makefile 2009-03-05 15:48:44.000000000 +0100 +++ new/cnetworkmanager-0.8.4/Makefile 2009-03-21 08:07:53.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE=cnetworkmanager -VERSION=0.8.3 +VERSION=0.8.4 PREFIX=/usr/local bindir=${PREFIX}/bin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cnetworkmanager-0.8.3/NEWS new/cnetworkmanager-0.8.4/NEWS --- old/cnetworkmanager-0.8.3/NEWS 2009-03-05 15:48:44.000000000 +0100 +++ new/cnetworkmanager-0.8.4/NEWS 2009-03-21 08:07:53.000000000 +0100 @@ -1,3 +1,11 @@ +0.8.4, Sat 2009-03-21 +New: When connecting (-C), monitor the NM connection state. +Fix: RPM packaging: consistent PREFIX (bnc#485413), owning pkgdatadir. +Fix: KeyError with --wep-hex. (James Hogan) +Fix: knetworkmanagerrc: Don't let ConnectionSettings override ConnectionSecrets. +Updated pbkdf2.py to the newest upstream version (license +clarified). (Alexander Block) + 0.8.3, Thu 2009-03-05 Fix: secrets leak via o.fd.NMS.Connection.Secrets (CVE-2009-0365) Fix: secrets leak via o.fd.NMS.Connection.GetSettings (bnc#479566#c3) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cnetworkmanager-0.8.3/pbkdf2.py new/cnetworkmanager-0.8.4/pbkdf2.py --- old/cnetworkmanager-0.8.3/pbkdf2.py 2009-03-05 15:48:44.000000000 +0100 +++ new/cnetworkmanager-0.8.4/pbkdf2.py 2009-03-21 08:07:53.000000000 +0100 @@ -4,12 +4,14 @@ # for details. Basically, it derives a key from a password and salt. # (c) 2004 Matt Johnston <matt @ ucc asn au> -# This code may be freely used and modified for any purpose. +# This code may be freely used, distributed, relicensed, and modified for any +# purpose. # Revision history # v0.1 October 2004 - Initial release # v0.2 8 March 2007 - Make usable with hashlib in Python 2.5 and use # v0.3 "" the correct digest_size rather than always 20 +# v0.4 13 March 2009 - Mention distribution and relicensing in the copyright import sys import hmac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit colordiff for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package colordiff for openSUSE:Factory checked in at Thu Mar 26 02:04:53 CET 2009. -------- --- colordiff/colordiff.changes 2007-06-24 21:29:50.000000000 +0200 +++ colordiff/colordiff.changes 2009-03-23 08:34:27.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Mar 18 14:02:42 CET 2009 - mseben(a)suse.cz + +- updated to 1.0.8a version + +- Changes between version 1.0.6a and 1.0.7a + - Support introduced for 'wdiff' colourising (thanks to Tom Regner) + - Correctly handles undefined HOME (patches from various people). + - Support for p4 diffs added by Alexis Layton, plus bug fix for + blank first lines + +- Changes between version 1.0.7a and 1.0.8a + - Support for numeric colours added, for 256-colour terminals + (thanks to GautamIyer). + - Diff-types can now be specified explicitly, for use when + diff-type detection doesn't work or isn't possible. + - Return diff's exit code, patch from Tim Connors. Allow + extraneous diff text to be coloured separately. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- colordiff-1.0.6a.tar.bz2 New: ---- colordiff-1.0.8a.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colordiff.spec ++++++ --- /var/tmp/diff_new_pack.H15404/_old 2009-03-26 02:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.H15404/_new 2009-03-26 02:01:21.000000000 +0100 @@ -1,19 +1,27 @@ # -# spec file for package colordiff (Version 1.0.6a) +# spec file for package colordiff (Version 1.0.8a) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: colordiff -URL: http://colordiff.sourceforge.net/ -Version: 1.0.6a +Url: http://colordiff.sourceforge.net/ +Version: 1.0.8a Release: 1 -License: GPL +License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Productivity/Text/Utilities Summary: Colour-highlighted 'diff' output @@ -59,5 +67,19 @@ /etc/colordiffrc %changelog -* Sun Jun 24 2007 - bwalle(a)suse.de +* Wed Mar 18 2009 mseben(a)suse.cz +- updated to 1.0.8a version +- Changes between version 1.0.6a and 1.0.7a + - Support introduced for 'wdiff' colourising (thanks to Tom Regner) + - Correctly handles undefined HOME (patches from various people). + - Support for p4 diffs added by Alexis Layton, plus bug fix for + blank first lines +- Changes between version 1.0.7a and 1.0.8a + - Support for numeric colours added, for 256-colour terminals + (thanks to GautamIyer). + - Diff-types can now be specified explicitly, for use when + diff-type detection doesn't work or isn't possible. + - Return diff's exit code, patch from Tim Connors. Allow + extraneous diff text to be coloured separately. +* Sun Jun 24 2007 bwalle(a)suse.de - initial SUSE package ++++++ colordiff-1.0.6a.tar.bz2 -> colordiff-1.0.8a.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/BUGS new/colordiff-1.0.8a/BUGS --- old/colordiff-1.0.6a/BUGS 2006-07-11 22:32:11.000000000 +0200 +++ new/colordiff-1.0.8a/BUGS 2007-11-05 21:51:10.000000000 +0100 @@ -8,3 +8,6 @@ workaround is to choose either colordiffrc or colordiffrc-lightbg, as appropriate for the colour scheme in use. +Colourising of 'wdiff' output requires that the '-n' option is given, i.e. +'wdiff -n', which avoids spanning the end of line while showing deleted or +inserted text. See 'man wdiff' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/cdiff.1 new/colordiff-1.0.8a/cdiff.1 --- old/colordiff-1.0.6a/cdiff.1 1970-01-01 01:00:00.000000000 +0100 +++ new/colordiff-1.0.8a/cdiff.1 2009-01-25 12:18:59.000000000 +0100 @@ -0,0 +1,31 @@ +.\" Title: cdiff +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Date: 01/25/2009 +.\" Manual: +.\" Source: +.\" +.TH "CDIFF" "1" "01/25/2009" "" "" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +cdiff \- a wrapper tool for colordiff +.SH "SYNOPSIS" +.HP 6 +\fBcdiff\fR {\fIURL\fR} +.SH "DESCRIPTION" +.PP +cdiff +is a wrapper for colordiff and will add colour to a diff given in a URL, e\&.g\&. +.sp +.RS 4 +.nf +cdiff http://some\&.url\&.com/foo/thing\&.patch +.fi +.RE +.SH "SEE ALSO" +.PP +cdiff +is part of the colordiff package, which should be consulted for further reference\&. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/cdiff.xml new/colordiff-1.0.8a/cdiff.xml --- old/colordiff-1.0.6a/cdiff.xml 2006-04-16 21:39:32.000000000 +0200 +++ new/colordiff-1.0.8a/cdiff.xml 2009-01-25 12:18:50.000000000 +0100 @@ -22,121 +22,28 @@ <refsynopsisdiv id='synopsis'> <cmdsynopsis> <command>cdiff</command> - <arg><replaceable>&diff; options</replaceable></arg> - <arg choice='req'><replaceable>file1</replaceable></arg> - <arg choice='req'><replaceable>file2</replaceable></arg> + <arg choice='req'><replaceable>URL</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> <refsect1 id='description'><title>Description</title> -<para>&colordiff; is a wrapper for &diff; and produces the same output as -&diff; but with coloured syntax highlighting at the command line to improve -readability. The output is similar to how a &diff;-generated patch might appear -in <application>Vim</application> or <application>Emacs</application> with the -appropriate syntax highlighting options enabled. The colour schemes can be -read from a central configuration file or from a local user -<filename>~/.colordiffrc</filename> file.</para> - -<para>&colordiff; makes use of ANSI colours and as such will only work when -ANSI colours can be used - typical examples are xterms and Eterms, as well as -console sessions.</para> - -<para>&colordiff; has been tested on various flavours of Linux and under -OpenBSD, but should be broadly portable to other systems.</para> - -</refsect1> - -<refsect1 id="usage"><title>Usage</title> - -<para>Use &colordiff; wherever you would normally use &diff;, or pipe output -to &colordiff;:</para> - -<para>For example: - -<screen> -$ colordiff file1 file2 -$ diff -u file1 file2 | colordiff -</screen> - -</para> - -<para>You can pipe the output to 'less', using the '-R' option (some systems or -terminal types may get better results using '-r' instead), which keeps -the colour escape sequences, otherwise displayed incorrectly or discarded by -'less': - -<screen> -$ diff -u file1 file2 | colordiff | less -R -</screen> - -</para> - -<para>You may find it useful to make &diff; automatically call -<command>colordiff</command>. Add the following line to -<filename>~/.bashrc</filename> (or equivalent): +<para>&cdiff; is a wrapper for colordiff and will add colour to a diff given +in a URL, e.g.</para> <screen> -alias diff=colordiff +cdiff http://some.url.com/foo/thing.patch </screen> -</para> - -<para>Any options passed to &colordiff; are passed through to &diff;.</para> - -<para>Alternatively, a construct such as 'cvs diff SOMETHING | colordiff' can be -included in <filename>~/.bashrc</filename> as follows: - -<screen> -function cvsdiff () { cvs diff $@ | colordiff; } -</screen> - -</para> - -<para>Or, combining the idea above using 'less': - -<screen> -function cvsdiff () { cvs diff $@ | colordiff |less -R; } -</screen> - -</para> - -<para>Note that the function name, cvsdiff, can be customized.</para> - </refsect1> -<refsect1 id='files'><title>Files</title> +<refsect1 id='seealso'><title>See Also</title> -<variablelist><varlistentry> - <term><filename>/etc/colordiffrc</filename></term> - <listitem><para>Central configuration file. User-specific settings can be - enabled by copying this file to <filename>~/.colordiffrc</filename> and - making the appropriate changes.</para></listitem> -</varlistentry></variablelist> - -</refsect1> - -<refsect1 id='bugs'><title>Bugs</title> - -<para>Bug reports and suggestions/patches to <email>davee(a)sungate.co.uk</email> -please.</para> - -<para>&colordiff; does not work for side-by-side diffs (<command>diff --y</command>). Note that <emphasis>does not work</emphasis> simply means that -the resulting output will not be colour-highlighted -- correct output will -still be produced.</para> - -</refsect1> - -<refsect1 id='author'><title>Author</title> - -<para>&colordiff; is written and maintained by Dave Ewart -<email>davee(a)sungate.co.uk</email>. This manual page and the -source XML was written by Graham Wilson <email>bob(a)decoy.wox.org</email> for -Debian and is maintained by the author. Graham Wilson also maintains the Debian -package for &colordiff;.</para> +<para>&cdiff; is part of the colordiff package, which should be consulted for +further reference.</para> </refsect1> </refentry> +  diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/CHANGES new/colordiff-1.0.8a/CHANGES --- old/colordiff-1.0.6a/CHANGES 2006-09-13 21:43:58.000000000 +0200 +++ new/colordiff-1.0.8a/CHANGES 2009-01-25 12:09:01.000000000 +0100 @@ -78,5 +78,21 @@ Some changes have been made to the default colours used, to help visibility on as many different coloured terminals by default. +Changes between version 1.0.6 and 1.0.7 + +Support introduced for 'wdiff' colourising (thanks to Tom Regner); also +correctly handles undefined HOME (patches from various people). + +Support for p4 diffs added by Alexis Layton, plus bug fix for blank +first lines. + +Changes between version 1.0.7 and 1.0.8 + +Support for numeric colours added, for 256-colour terminals (thanks to Gautam +Iyer). Diff-types can now be specified explicitly, for use when diff-type +detection doesn't work or isn't possible. Return diff's exit code, patch from +Tim Connors. Allow extraneous diff text to be coloured separately. + + # vim: tw=72 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/colordiff.1 new/colordiff-1.0.8a/colordiff.1 --- old/colordiff-1.0.6a/colordiff.1 2006-09-13 21:45:19.000000000 +0200 +++ new/colordiff-1.0.8a/colordiff.1 2009-01-25 12:18:56.000000000 +0100 @@ -1,113 +1,145 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "COLORDIFF" 1 "" "" "" -.SH NAME +.\" Title: colordiff +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Date: 01/25/2009 +.\" Manual: +.\" Source: +.\" +.TH "COLORDIFF" "1" "01/25/2009" "" "" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" colordiff \- a tool to colorize diff output .SH "SYNOPSIS" -.ad l -.hy 0 .HP 10 -\fBcolordiff\fR [\fI\fBdiff\fR\ options\fR] {\fIfile1\fR} {\fIfile2\fR} -.ad -.hy - +\fBcolordiff\fR [\fI\fBdiff\fR\fR\fI\ options\fR] [\fIcolordiff\fR\fI\ options\fR] {\fIfile1\fR} {\fIfile2\fR} .SH "DESCRIPTION" - .PP -colordiff is a wrapper for \fBdiff\fR and produces the same output as \fBdiff\fR but with coloured syntax highlighting at the command line to improve readability\&. The output is similar to how a \fBdiff\fR\-generated patch might appear in Vim or Emacs with the appropriate syntax highlighting options enabled\&. The colour schemes can be read from a central configuration file or from a local user \fI~/\&.colordiffrc\fR file\&. - +colordiff +is a wrapper for +\fBdiff\fR +and produces the same output as +\fBdiff\fR +but with coloured syntax highlighting at the command line to improve readability\&. The output is similar to how a +\fBdiff\fR\-generated patch might appear in +Vim +or +Emacs +with the appropriate syntax highlighting options enabled\&. The colour schemes can be read from a central configuration file or from a local user +\fI~/\&.colordiffrc\fR +file\&. .PP -colordiff makes use of ANSI colours and as such will only work when ANSI colours can be used \- typical examples are xterms and Eterms, as well as console sessions\&. - +colordiff +makes use of ANSI colours and as such will only work when ANSI colours can be used \- typical examples are xterms and Eterms, as well as console sessions\&. .PP -colordiff has been tested on various flavours of Linux and under OpenBSD, but should be broadly portable to other systems\&. - +colordiff +has been tested on various flavours of Linux and under OpenBSD, but should be broadly portable to other systems\&. .SH "USAGE" - -.PP -Use colordiff wherever you would normally use \fBdiff\fR, or pipe output to colordiff: - .PP -For example: - -.IP - +Use +colordiff +wherever you would normally use +\fBdiff\fR, or pipe output to +colordiff: +.PP +For example: +.sp +.RS 4 +.nf $ colordiff file1 file2 $ diff \-u file1 file2 | colordiff - - +.fi +.RE .PP -You can pipe the output to 'less', using the '\-R' option (some systems or terminal types may get better results using '\-r' instead), which keeps the colour escape sequences, otherwise displayed incorrectly or discarded by 'less': - -.IP - +You can pipe the output to \'less\', using the \'\-R\' option (some systems or terminal types may get better results using \'\-r\' instead), which keeps the colour escape sequences, otherwise displayed incorrectly or discarded by \'less\': +.sp +.RS 4 +.nf $ diff \-u file1 file2 | colordiff | less \-R - - +.fi +.RE .PP -You may find it useful to make \fBdiff\fR automatically call \fBcolordiff\fR\&. Add the following line to \fI~/\&.bashrc\fR (or equivalent): - -.IP - +If you have +\fBwdiff\fR +installed, colordiff will correctly colourise the added and removed text, provided that the \'\-n\' option is given to +\fBwdiff\fR: +.sp +.RS 4 +.nf +$ wdiff \-n file1 file2 | colordiff +.fi +.RE +.PP +You may find it useful to make +\fBdiff\fR +automatically call +\fBcolordiff\fR\&. Add the following line to +\fI~/\&.bashrc\fR +(or equivalent): +.sp +.RS 4 +.nf alias diff=colordiff - - +.fi +.RE .PP -Any options passed to colordiff are passed through to \fBdiff\fR\&. - -.PP -Alternatively, a construct such as 'cvs diff SOMETHING | colordiff' can be included in \fI~/\&.bashrc\fR as follows: - -.IP - +Any options passed to +colordiff +are passed through to +\fBdiff\fR +except for the colordiff\-specific option \'difftype\', e\&.g\&. +.sp +.RS 4 +.nf +colordiff \-\-difftype=debdiff file1 file2 +.fi +.RE +.PP +Valid values for \'difftype\' are: diff, diffc, diffu, diffy, wdiff, debdiff; these correspond to plain diffs, context diffs, unified diffs, side\-by\-side diffs, wdiff output and debdiff output respectively\&. Use these overrides when colordiff is not able to determine the diff\-type automatically\&. +.PP +Alternatively, a construct such as \'cvs diff SOMETHING | colordiff\' can be included in +\fI~/\&.bashrc\fR +as follows: +.sp +.RS 4 +.nf function cvsdiff () { cvs diff $@ | colordiff; } - - +.fi +.RE .PP -Or, combining the idea above using 'less': - -.IP - +Or, combining the idea above using \'less\': +.sp +.RS 4 +.nf function cvsdiff () { cvs diff $@ | colordiff |less \-R; } - - +.fi +.RE .PP Note that the function name, cvsdiff, can be customized\&. - .SH "FILES" - -.TP +.PP \fI/etc/colordiffrc\fR -Central configuration file\&. User\-specific settings can be enabled by copying this file to \fI~/\&.colordiffrc\fR and making the appropriate changes\&. - -.TP +.RS 4 +Central configuration file\&. User\-specific settings can be enabled by copying this file to +\fI~/\&.colordiffrc\fR +and making the appropriate changes\&. +.RE +.PP \fIcolordiffrc\-lightbg\fR +.RS 4 Alternate configuration template for use with terminals having light backgrounds\&. Copy this to /etc/colordiffrc or ~/\&.colordiffrc and customize\&. - +.RE .SH "BUGS" - .PP -Bug reports and suggestions/patches to <davee(a)sungate\&.co\&.uk> please\&. - +Bug reports and suggestions/patches to +<davee(a)sungate\&.co\&.uk> +please\&. .SH "AUTHOR" - .PP -colordiff is written and maintained by Dave Ewart <davee(a)sungate\&.co\&.uk>\&. This manual page and the source XML was written by Graham Wilson <graham(a)mknod\&.org> for Debian and is maintained by the author\&. Dave Ewart maintains the Debian package, sponsored by Graham Wilson\&. - +colordiff +is written and maintained by Dave Ewart +<davee(a)sungate\&.co\&.uk>\&. This manual page and the source XML was written by Graham Wilson +<graham(a)mknod\&.org> +for Debian and is maintained by the author\&. Dave Ewart maintains the Debian package, sponsored by Graham Wilson\&. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/colordiff.pl new/colordiff-1.0.8a/colordiff.pl --- old/colordiff-1.0.6a/colordiff.pl 2006-09-17 20:52:06.000000000 +0200 +++ new/colordiff-1.0.8a/colordiff.pl 2009-01-25 12:06:48.000000000 +0100 @@ -5,7 +5,7 @@ # ColorDiff - a wrapper/replacment for 'diff' producing # # colourful output # # # -# Copyright (C)2002-2006 Dave Ewart (davee(a)sungate.co.uk) # +# Copyright (C)2002-2009 Dave Ewart (davee(a)sungate.co.uk) # # # ######################################################################## # # @@ -26,11 +26,11 @@ use IPC::Open2; my $app_name = 'colordiff'; -my $version = '1.0.6'; +my $version = '1.0.8'; my $author = 'Dave Ewart'; my $author_email = 'davee(a)sungate.co.uk'; my $app_www = 'http://colordiff.sourceforge.net/'; -my $copyright = '(C)2002-2006'; +my $copyright = '(C)2002-2009'; my $show_banner = 1; my $color_patch = 0; @@ -64,14 +64,16 @@ # Locations for personal and system-wide colour configurations my $HOME = $ENV{HOME}; my $etcdir = '/etc'; - my ($setting, $value); -my @config_files = ("$etcdir/colordiffrc", "$HOME/.colordiffrc"); +my @config_files = ("$etcdir/colordiffrc"); +push (@config_files, "$ENV{HOME}/.colordiffrc") if (defined $ENV{HOME}); my $config_file; foreach $config_file (@config_files) { - if (open(COLORDIFFRC, "<$config_file")) { + if (open (COLORDIFFRC, "<$config_file")) { while (<COLORDIFFRC>) { + my $colourval; + chop; next if (/^#/ || /^$/); s/\s+//g; @@ -93,28 +95,43 @@ next; } $setting =~ tr/A-Z/a-z/; - $value =~ tr/A-Z/a-z/; + $value =~ tr/A-Z/a-z/; if (($value eq 'normal') || ($value eq 'none')) { $value = 'off'; } - if (!defined $colour{$value}) { + if ($value =~ m/[0-9]+/ && $value >= 0 && $value <= 255) { + # Numeric color + if( $value < 8 ) { + $colourval = "\033[0;3${value}m"; + } + elsif( $value < 15 ) { + $colourval = "\033[0;9${value}m"; + } + else { + $colourval = "\033[0;38;5;${value}m"; + } + } + elsif (defined($colour{$value})) { + $colourval = $colour{$value}; + } + else { print STDERR "Invalid colour specification for setting $setting ($value) in $config_file\n"; next; } if ($setting eq 'plain') { - $plain_text = $colour{$value}; + $plain_text = $colourval; } elsif ($setting eq 'oldtext') { - $file_old = $colour{$value}; + $file_old = $colourval; } elsif ($setting eq 'newtext') { - $file_new = $colour{$value}; + $file_new = $colourval; } elsif ($setting eq 'diffstuff') { - $diff_stuff = $colour{$value}; + $diff_stuff = $colourval; } elsif ($setting eq 'cvsstuff') { - $cvs_stuff = $colour{$value}; + $cvs_stuff = $colourval; } else { print STDERR "Unknown option in $config_file: $setting\n"; @@ -127,54 +144,51 @@ # If output is to a file, switch off colours, unless 'color_patch' is set # Relates to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=378563 if ((-f STDOUT) && ($color_patch == 0)) { - $plain_text=''; - $file_old=''; - $file_new=''; - $diff_stuff=''; - $cvs_stuff=''; - $plain_text=''; - $colour{off}=''; + $plain_text = ''; + $file_old = ''; + $file_new = ''; + $diff_stuff = ''; + $cvs_stuff = ''; + $plain_text = ''; + $colour{off} = ''; } +my $specified_difftype; +GetOptions( + "difftype=s" => \$specified_difftype +); +# TODO - check that specified type is valid, issue warning if not # ---------------------------------------------------------------------------- -# FIXME -# -# Remove this (contributed) code for now - the long options break the addition -# of extra diff options supplied on the command line. On balance, modifying the -# diff options is probably more important than having colordiff customisations -# on the command line. -# -# Need to find a proper fix for this so that this can be reincluded - -### GetOptions( -### "no-banner" => sub { $show_banner = 0 }, -### "plain-text=s" => \&set_color, -### "file-old=s" => \&set_color, -### "file-new=s" => \&set_color, -### "cvs-stuff=s" => \&set_color, -### "diff-stuff=s" => \&set_color -### ); -# ---------------------------------------------------------------------------- if ($show_banner == 1) { print STDERR "$app_name $version ($app_www)\n"; print STDERR "$copyright $author, $author_email\n\n"; } +# FIXME - work out some magic here to make it rip off +# colordiff-specific long options, such as: +# +# --difftype={plain,context,unified,sideside,debdiff} +# +# then, optionally, throw away other options if in a pipe + my @inputstream; -if (defined $ARGV[0]) { +my $exitcode = 0; +if ((defined $ARGV[0]) && (-t STDIN)) { # More reliable way of pulling in arguments - open2(\*INPUTSTREAM, undef, "diff", @ARGV); + my $pid = open2(\*INPUTSTREAM, undef, "diff", @ARGV); @inputstream = <INPUTSTREAM>; close INPUTSTREAM; + waitpid $pid, 0; + $exitcode=$? >> 8; } else { @inputstream = <STDIN>; } -# Input stream has been read - need to examine it +# Input stream has been read - need to examine it # to determine type of diff we have. # # This may not be perfect - should identify most reasonably @@ -185,9 +199,13 @@ my $longest_record = 0; DIFF_TYPE: foreach $record (@inputstream) { + if (defined $specified_difftype) { + $diff_type = $specified_difftype; + last DIFF_TYPE; + } # Unified diffs are the only flavour having '+++' or '---' # at the start of a line - if ($record =~ /^(\+\+\+|---)/) { + if ($record =~ /^(\+\+\+|---|@@)/) { $diff_type = 'diffu'; last DIFF_TYPE; } @@ -210,6 +228,16 @@ $diff_type = 'diffy'; last DIFF_TYPE; } + # wdiff deleted/added patterns + # should almost always be pairwaise? + elsif ($record =~ /\[-.*?-\]/s) { + $diff_type = 'wdiff'; + last DIFF_TYPE; + } + elsif ($record =~ /\{\+.*?\+\}/s) { + $diff_type = 'wdiff'; + last DIFF_TYPE; + } } my $inside_file_old = 1; @@ -221,9 +249,9 @@ # second consists only of spaces, '<', '>' and '|' # This is not a 100% certain match, but should be good enough -my %separator_col = (); -my %candidate_col = (); -my $diffy_sep_col = 0; +my %separator_col = (); +my %candidate_col = (); +my $diffy_sep_col = 0; my $mostlikely_sum = 0; if ($diff_type eq 'diffy') { @@ -231,34 +259,37 @@ # Unfortunately requires parsing the input stream multiple times foreach (@inputstream) { # Convert tabs to spaces - while ((my $i = index($_, "\t")) > -1) { - substr( - $_, $i, 1, # range to replace - (' ' x (8 - ($i % 8))), # string to replace with - ); + while ((my $i = index ($_, "\t")) > -1) { + substr ( + $_, $i, 1, # range to replace + (' ' x (8 - ($i % 8))), # string to replace with + ); } $record = $_; - $longest_record = length($record) if (length($record) > $longest_record); + $longest_record = length ($record) if (length ($record) > $longest_record); } - for(my $i=0;$i <= $longest_record;$i++) { + for (my $i = 0 ; $i <= $longest_record ; $i++) { $separator_col{$i} = 1; $candidate_col{$i} = 0; } foreach (@inputstream) { # Convert tabs to spaces - while ((my $i = index($_, "\t")) > -1) { - substr( - $_, $i, 1, # range to replace - (' ' x (8 - ($i % 8))), # string to replace with - ); + while ((my $i = index ($_, "\t")) > -1) { + substr ( + $_, $i, 1, # range to replace + (' ' x (8 - ($i % 8))), # string to replace with + ); } - for(my $i=0;$i<(length($_)-2);$i++) { + for (my $i = 0 ; $i < (length ($_) - 2) ; $i++) { next if (!defined $separator_col{$i}); next if ($separator_col{$i} == 0); - my $subsub = substr($_,$i,2); - if ( ($subsub ne ' ') && ($subsub ne ' |') && ($subsub ne ' >') && - ($subsub ne ' <') ) { + my $subsub = substr ($_, $i, 2); + if ( ($subsub ne ' ') + && ($subsub ne ' |') + && ($subsub ne ' >') + && ($subsub ne ' <')) + { $separator_col{$i} = 0; } if (($subsub eq ' |') || ($subsub eq ' >') || ($subsub eq ' <')) { @@ -267,10 +298,10 @@ } } - for(my $i=0;$i<$longest_record-2;$i++) { + for (my $i = 0 ; $i < $longest_record - 2 ; $i++) { if ($separator_col{$i} == 1) { if ($candidate_col{$i} > $mostlikely_sum) { - $diffy_sep_col = $i; + $diffy_sep_col = $i; $mostlikely_sum = $i; } } @@ -286,12 +317,15 @@ elsif (/^>/) { print "$file_new"; } - elsif (/^[1-9]/) { + elsif (/^[0-9]/) { print "$diff_stuff"; } - elsif (/^(Index: |={5,}|RCS file: |retrieving |diff )/) { + elsif (/^(Index: |={4,}|RCS file: |retrieving |diff )/) { print "$cvs_stuff"; } + elsif (/^Only in/) { + print "$diff_stuff"; + } else { print "$plain_text"; } @@ -306,6 +340,9 @@ elsif (/^\*{4,}/) { print "$diff_stuff"; } + elsif (/^Only in/) { + print "$diff_stuff"; + } elsif (/^\*\*\* [0-9]+,[0-9]+/) { print "$diff_stuff"; $inside_file_old = 1; @@ -328,7 +365,7 @@ print "$file_new"; } } - elsif (/^(Index: |={5,}|RCS file: |retrieving |diff )/) { + elsif (/^(Index: |={4,}|RCS file: |retrieving |diff )/) { print "$cvs_stuff"; } else { @@ -345,7 +382,10 @@ elsif (/^\@/) { print "$diff_stuff"; } - elsif (/^(Index: |={5,}|RCS file: |retrieving |diff )/) { + elsif (/^Only in/) { + print "$diff_stuff"; + } + elsif (/^(Index: |={4,}|RCS file: |retrieving |diff )/) { print "$cvs_stuff"; } else { @@ -355,8 +395,8 @@ # Works with previously-identified column containing the diff-y # separator characters elsif ($diff_type eq 'diffy') { - if (length($_) > ($diffy_sep_col+2)) { - my $sepchars = substr($_, $diffy_sep_col, 2); + if (length ($_) > ($diffy_sep_col + 2)) { + my $sepchars = substr ($_, $diffy_sep_col, 2); if ($sepchars eq ' <') { print "$file_old"; } @@ -370,18 +410,23 @@ print "$plain_text"; } } + elsif (/^Only in/) { + print "$diff_stuff"; + } else { print "$plain_text"; } } + elsif ($diff_type eq 'wdiff') { + $_ =~ s/(\[-[^]]*?-\])/$file_old$1$colour{off}/g; + $_ =~ s/(\{\+[^]]*?\+\})/$file_new$1$colour{off}/g; + } + elsif ($diff_type eq 'debdiff') { + $_ =~ s/(\[-[^]]*?-\])/$file_old$1$colour{off}/g; + $_ =~ s/(\{\+[^]]*?\+\})/$file_new$1$colour{off}/g; + } s/$/$colour{off}/; print "$_"; } -# FIXME - See earlier commented-out code -### sub set_color { -### my ($type, $color) = @_; -### -### $type =~ s/-/_/; -### eval "\$$type = \$colour{$color}"; -### } +exit $exitcode; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/colordiff.xml new/colordiff-1.0.8a/colordiff.xml --- old/colordiff-1.0.6a/colordiff.xml 2006-07-11 22:38:03.000000000 +0200 +++ new/colordiff-1.0.8a/colordiff.xml 2009-01-25 11:59:25.000000000 +0100 @@ -23,6 +23,7 @@ <cmdsynopsis> <command>colordiff</command> <arg><replaceable>&diff; options</replaceable></arg> + <arg><replaceable>&colordiff; options</replaceable></arg> <arg choice='req'><replaceable>file1</replaceable></arg> <arg choice='req'><replaceable>file2</replaceable></arg> </cmdsynopsis> @@ -72,6 +73,16 @@ </para> +<para>If you have <command>wdiff</command> installed, colordiff will correctly +colourise the added and removed text, provided that the '-n' option is given to +<command>wdiff</command>: + +<screen> +$ wdiff -n file1 file2 | colordiff +</screen> + +</para> + <para>You may find it useful to make &diff; automatically call <command>colordiff</command>. Add the following line to <filename>~/.bashrc</filename> (or equivalent): @@ -82,7 +93,17 @@ </para> -<para>Any options passed to &colordiff; are passed through to &diff;.</para> +<para>Any options passed to &colordiff; are passed through to &diff; except for +the colordiff-specific option 'difftype', e.g.</para> + +<screen> +colordiff --difftype=debdiff file1 file2 +</screen> + +<para>Valid values for 'difftype' are: diff, diffc, diffu, diffy, wdiff, debdiff; +these correspond to plain diffs, context diffs, unified diffs, side-by-side +diffs, wdiff output and debdiff output respectively. Use these overrides when +colordiff is not able to determine the diff-type automatically.</para> <para>Alternatively, a construct such as 'cvs diff SOMETHING | colordiff' can be included in <filename>~/.bashrc</filename> as follows: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/Makefile new/colordiff-1.0.8a/Makefile --- old/colordiff-1.0.6a/Makefile 2007-04-25 21:18:54.000000000 +0200 +++ new/colordiff-1.0.8a/Makefile 2009-01-25 19:54:04.000000000 +0100 @@ -1,10 +1,10 @@ INSTALL_DIR=/usr/local/bin MAN_DIR=/usr/local/man/man1 ETC_DIR=/etc -VERSION=1.0.6a +VERSION=1.0.8a DIST_FILES=COPYING INSTALL Makefile README \ colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS TODO CHANGES colordiff.1 \ - colordiff.xml cdiff.xml + colordiff.xml cdiff.xml cdiff.1 TMPDIR=colordiff-${VERSION} TARBALL=${TMPDIR}.tar.gz @@ -29,6 +29,7 @@ install cdiff.sh ${INSTALL_DIR}/cdiff; \ fi install -D colordiff.1 ${MAN_DIR}/colordiff.1 + install -D cdiff.1 ${MAN_DIR}/cdiff.1 if [ -f ${ETC_DIR}/colordiffrc ]; then \ mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \ fi @@ -37,6 +38,11 @@ chmod 644 ${ETC_DIR}/colordiffrc rm -f colordiff.pl.for.install +uninstall: etc + rm -f ${INSTALL_DIR}/colordiff + rm -f ${ETC_DIR}/colordiffrc + rm -f ${INSTALL_DIR}/cdiff + dist: mkdir ${TMPDIR} cp -p ${DIST_FILES} ${TMPDIR} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/colordiff-1.0.6a/README new/colordiff-1.0.8a/README --- old/colordiff-1.0.6a/README 2006-09-13 21:45:21.000000000 +0200 +++ new/colordiff-1.0.8a/README 2009-01-25 19:53:24.000000000 +0100 @@ -39,6 +39,11 @@ $ diff -u file1 file2 | colordiff | less -R +If you have wdiff installed, colordiff will correctly colourise the added and +removed text, provided that the '-n' option is given to wdiff: + +$ wdiff -n file1 file2 | colordiff + You may find it useful to make diff automatically call colordiff. Add the following line to ~/.bashrc (or equivalent): @@ -57,6 +62,16 @@ Note that the function name, cvsdiff, can be customized. +Any options passed to colordiff are passed through to diff except for +the colordiff-specific option 'difftype', e.g. + +colordiff --difftype=debdiff file1 file2 + +Valid values for 'difftype' are: diff, diffc, diffu, diffy, wdiff, debdiff; +these correspond to plain diffs, context diffs, unified diffs, side-by-side +diffs, wdiff output and debdiff output respectively. Use these overrides when +colordiff is not able to determine the diff-type automatically. + Files /etc/colordiffrc @@ -78,5 +93,5 @@ colordiff is written and maintained by Dave Ewart <davee(a)sungate.co.uk>. This manual page and the source XML was written by Graham Wilson <graham(a)mknod.org> for Debian and is maintained by the author. Dave Ewart maintains the Debian -package, sponsored by Graham Wilson. +package. ++++++ colordiff-fix-permission.diff ++++++ --- /var/tmp/diff_new_pack.H15404/_old 2009-03-26 02:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.H15404/_new 2009-03-26 02:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: colordiff-1.0.6/Makefile +Index: colordiff-1.0.8/Makefile =================================================================== ---- colordiff-1.0.6.orig/Makefile -+++ colordiff-1.0.6/Makefile +--- colordiff-1.0.8.orig/Makefile ++++ colordiff-1.0.8/Makefile @@ -32,9 +32,7 @@ install: etc if [ -f ${ETC_DIR}/colordiffrc ]; then \ mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dasher for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package dasher for openSUSE:Factory checked in at Thu Mar 26 02:01:14 CET 2009. -------- --- GNOME/dasher/dasher.changes 2009-02-16 17:56:21.000000000 +0100 +++ dasher/dasher.changes 2009-03-17 03:16:38.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Mar 17 02:44:41 CET 2009 - vuntz(a)novell.com + +- Update to version 4.10.0: + + Fix click modes where letters near the edge of the selection + box to "leak" out so they could not be selected. + + Fix UTF-8 bug so e.g., Japanese and Hebrew work. + + Many code fixes (see ChangeLog) + + Updated translations. +- Remove unneeded autoreconf, intltoolize calls. +- Do not add DocPath to desktop file: yelp doesn't need this. +- Remove checks for old versions of openSUSE. +- Remove sr@Latn to sr@latin workaround (fixed upstream) +- Stop removing uz@cyrillic. +- Do not manually install gconf schemas: the tarball does this. +- Remove unneeded BuildRequires: docbook_4, libwnck-devel, + perl-XML-Parser, scrollkeeper. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dasher-4.9.0.tar.bz2 New: ---- dasher-4.10.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dasher.spec ++++++ --- /var/tmp/diff_new_pack.f11316/_old 2009-03-26 01:58:56.000000000 +0100 +++ /var/tmp/diff_new_pack.f11316/_new 2009-03-26 01:58:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package dasher (Version 4.9.0) +# spec file for package dasher (Version 4.10.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,18 +19,15 @@ Name: dasher -BuildRequires: at-spi-devel cairo-devel docbook_4 fdupes gcc-c++ gnome-doc-utils-devel gnome-speech-devel intltool libexpat-devel libglade2-devel libgnomeui-devel libstdc++ libwnck-devel perl-XML-Parser scrollkeeper translation-update-upstream update-desktop-files -Version: 4.9.0 -Release: 46 -%if %suse_version > 1020 +BuildRequires: at-spi-devel cairo-devel fdupes gcc-c++ gnome-doc-utils-devel gnome-speech-devel intltool libexpat-devel libglade2-devel libgnomeui-devel libstdc++ translation-update-upstream update-desktop-files +Version: 4.10.0 +Release: 1 Requires: %{name}-lang = %{version} -%endif Url: http://www.inference.phy.cam.ac.uk/dasher/ Group: System/GUI/GNOME License: GPL v2 or later Summary: Zooming Predictive Text Entry System Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/4.5/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM dasher-includes.patch bgo517642 BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -58,9 +55,6 @@ translation-update-upstream %build -#export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive" -autoreconf -f -i -intltoolize --force %configure --with-pic \ --with-gnome \ --disable-scrollkeeper @@ -68,20 +62,11 @@ %install %makeinstall -rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/uz@cyrillic -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas -cp Data/dasher.schemas $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas -echo DocPath=dasher >> $RPM_BUILD_ROOT%{_datadir}/applications/dasher.desktop %suse_update_desktop_file -G "Text Entry Tool" %name GNOME -# Change sr@Latn to sr@latin -mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin %find_lang %{name} %find_gconf_schemas -###cat %{name}.lang %{name}.schemas_list >%{name}.lst cat %{name}.schemas_list >%{name}.lst -%if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -105,6 +90,21 @@ %files lang -f %name.lang %changelog +* Tue Mar 17 2009 vuntz(a)novell.com +- Update to version 4.10.0: + + Fix click modes where letters near the edge of the selection + box to "leak" out so they could not be selected. + + Fix UTF-8 bug so e.g., Japanese and Hebrew work. + + Many code fixes (see ChangeLog) + + Updated translations. +- Remove unneeded autoreconf, intltoolize calls. +- Do not add DocPath to desktop file: yelp doesn't need this. +- Remove checks for old versions of openSUSE. +- Remove sr@Latn to sr@latin workaround (fixed upstream) +- Stop removing uz@cyrillic. +- Do not manually install gconf schemas: the tarball does this. +- Remove unneeded BuildRequires: docbook_4, libwnck-devel, + perl-XML-Parser, scrollkeeper. * Mon Feb 16 2009 sbrabec(a)suse.cz - Added support for translation-update-upstream (FATE#301344). * Sat Jan 31 2009 vuntz(a)novell.com ++++++ dasher-4.9.0.tar.bz2 -> dasher-4.10.0.tar.bz2 ++++++ GNOME/dasher/dasher-4.9.0.tar.bz2 dasher/dasher-4.10.0.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit deskbar-applet for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package deskbar-applet for openSUSE:Factory checked in at Thu Mar 26 01:58:47 CET 2009. -------- --- deskbar-applet/deskbar-applet.changes 2009-03-08 23:58:52.000000000 +0100 +++ deskbar-applet/deskbar-applet.changes 2009-03-19 17:33:13.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Mar 19 02:48:55 CET 2009 - vuntz(a)novell.com + +- Split lang package. + +------------------------------------------------------------------- +Tue Mar 17 20:35:15 CET 2009 - mboman(a)suse.de + +- Update to version 2.26.0: + + Translation updates +- Remove AutoReqProv, it's default +- Remove python and python-devel from BuildRequires. It's provided + via %py_requires +- Remove glib2-devel and gnome-common from BuildRequires +- Replace make DESTDIR=$RPM_BUILD_ROOT install with %makeinstall + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- deskbar-applet-2.25.92.tar.bz2 New: ---- deskbar-applet-2.26.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deskbar-applet.spec ++++++ --- /var/tmp/diff_new_pack.Rl9891/_old 2009-03-26 01:57:45.000000000 +0100 +++ /var/tmp/diff_new_pack.Rl9891/_new 2009-03-26 01:57:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package deskbar-applet (Version 2.25.92) +# spec file for package deskbar-applet (Version 2.26.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,19 +23,15 @@ BuildRequires: evolution-data-server-devel BuildRequires: fdupes BuildRequires: gconf2-devel -BuildRequires: glib2-devel -BuildRequires: gnome-common BuildRequires: gnome-desktop-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-python-desktop BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: notification-daemon -BuildRequires: python -BuildRequires: python-devel BuildRequires: python-gnome-devel BuildRequires: python-gtk-devel -Version: 2.25.92 +Version: 2.26.0 Release: 1 Url: http://raphael.slinckx.net/deskbar Group: System/GUI/GNOME @@ -43,8 +39,8 @@ Summary: Deskbar applet for GNOME Source: %{name}-%{version}.tar.bz2 Requires: gnome-python-desktop dbus-1-python +Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on %py_requires %gconf_schemas_prereq @@ -70,7 +66,6 @@ License: GPL v2 or later Summary: Deskbar applet for GNOME Group: System/GUI/GNOME -AutoReqProv: on Requires: %{name} = %{version} python-gtk-devel %description devel @@ -91,6 +86,7 @@ Mikkel Kamstrup Erlandsen <kamstrup(a)daimi.au.dk> Sebastian P�lsterl <marduk(a)k-d-w.org> +%lang_package %prep %setup @@ -100,7 +96,7 @@ make %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper %find_lang %{name} %find_gconf_schemas @@ -121,7 +117,7 @@ %{_datadir}/deskbar-applet %{_datadir}/icons/*/*/*/*.* %doc %{_datadir}/gnome/help/deskbar -%{_datadir}/omf/deskbar +%doc %{_datadir}/omf/deskbar %{_libdir}/bonobo/servers/Deskbar_Applet.server %{_libdir}/deskbar-applet %{py_sitedir}/deskbar @@ -130,7 +126,19 @@ %defattr (-, root, root) %{_libdir}/pkgconfig/deskbar-applet.pc +%files lang -f %{name}.lang + %changelog +* Thu Mar 19 2009 vuntz(a)novell.com +- Split lang package. +* Tue Mar 17 2009 mboman(a)suse.de +- Update to version 2.26.0: + + Translation updates +- Remove AutoReqProv, it's default +- Remove python and python-devel from BuildRequires. It's provided + via %%py_requires +- Remove glib2-devel and gnome-common from BuildRequires +- Replace make DESTDIR=$RPM_BUILD_ROOT install with %%makeinstall * Sun Mar 08 2009 vuntz(a)novell.com - Review changes. * Wed Mar 04 2009 lmedinas(a)gmail.com ++++++ deskbar-applet-2.25.92.tar.bz2 -> deskbar-applet-2.26.0.tar.bz2 ++++++ ++++ 20773 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit epiphany-extensions for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package epiphany-extensions for openSUSE:Factory checked in at Thu Mar 26 01:57:36 CET 2009. -------- --- GNOME/epiphany-extensions/epiphany-extensions.changes 2009-02-18 13:01:41.000000000 +0100 +++ epiphany-extensions/epiphany-extensions.changes 2009-03-16 14:49:11.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Mar 16 14:46:16 CET 2009 - sbrabec(a)suse.cz + +- Added support for translation-update-upstream (FATE#301344). + +------------------------------------------------------------------- +Sun Mar 15 19:17:32 CET 2009 - vuntz(a)novell.com + +- Update to version 2.26.0: + + Remove filterset.G update button from the UI for now. +- Do not package omf files twice (they are in the lang package + too). +- Remove AutoReqProv: it's default now. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- epiphany-extensions-2.25.91.tar.bz2 New: ---- epiphany-extensions-2.26.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany-extensions.spec ++++++ --- /var/tmp/diff_new_pack.uS9087/_old 2009-03-26 01:57:10.000000000 +0100 +++ /var/tmp/diff_new_pack.uS9087/_new 2009-03-26 01:57:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package epiphany-extensions (Version 2.25.91) +# spec file for package epiphany-extensions (Version 2.26.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: epiphany-extensions %define xulrunner_version 190 %define lang_version 2.26 -%define major_version 2.25 +%define major_version 2.26 BuildRequires: dbus-1-glib-devel BuildRequires: epiphany BuildRequires: epiphany-devel >= 2.25.0 @@ -35,14 +35,14 @@ BuildRequires: opensp-devel BuildRequires: pcre-devel BuildRequires: python-devel -Version: 2.25.91 +BuildRequires: translation-update-upstream +Version: 2.26.0 Release: 1 Url: http://www.gnome.org/projects/epiphany/ Group: Productivity/Networking/Web/Browsers License: GPL v2 or later; LGPL v2.1 or later Summary: Extensions Collection for Epiphany Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.20/%{name}-%{version}.tar.b… -AutoReqProv: on Provides: epiphany-plugins Obsoletes: epiphany-plugins Supplements: epiphany @@ -69,6 +69,7 @@ %lang_package %prep %setup -q +translation-update-upstream %build %configure \ @@ -100,13 +101,20 @@ %defattr (-, root, root) %doc AUTHORS COPYING COPYING.README ChangeLog NEWS README TODO %{_datadir}/epiphany-extensions -%{_datadir}/omf/epiphany-extensions %{_datadir}/epiphany/icons/hicolor/*/status/*.* %{_libdir}/epiphany/%{major_version}/extensions %files lang -f %{name}-%{lang_version}.lang %changelog +* Mon Mar 16 2009 sbrabec(a)suse.cz +- Added support for translation-update-upstream (FATE#301344). +* Sun Mar 15 2009 vuntz(a)novell.com +- Update to version 2.26.0: + + Remove filterset.G update button from the UI for now. +- Do not package omf files twice (they are in the lang package + too). +- Remove AutoReqProv: it's default now. * Tue Feb 17 2009 vuntz(a)novell.com - Update to version 2.25.91: + Remove engine check. ++++++ epiphany-extensions-2.25.91.tar.bz2 -> epiphany-extensions-2.26.0.tar.bz2 ++++++ ++++ 4712 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/epiphany-extensions-2.25.91/ChangeLog new/epiphany-extensions-2.26.0/ChangeLog --- old/epiphany-extensions-2.25.91/ChangeLog 2009-02-16 20:20:26.000000000 +0100 +++ new/epiphany-extensions-2.26.0/ChangeLog 2009-03-15 15:11:56.000000000 +0100 @@ -1,3 +1,71 @@ +commit 11a007fe15782aa114672bb254d60f6efdcf4d23 +Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a> +Date: Sun Mar 15 13:38:37 2009 +0000 + + Really fix ChangeLog rule + + git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1832 8bf08bfc-de25-0410-bf0f-dff8bc4d630a + + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 4cd07a343ac787d36d36d376f3fd7aaf95ccf958 +Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a> +Date: Sun Mar 15 13:15:07 2009 +0000 + + Fix ChangeLog generation + + git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1831 8bf08bfc-de25-0410-bf0f-dff8bc4d630a + + Makefile.am | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +commit ded3b974bb4126141e6a3ba94eff06520b37a807 +Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a> +Date: Sun Mar 15 13:12:23 2009 +0000 + + Remove SVN ChangeLog rule + + git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1830 8bf08bfc-de25-0410-bf0f-dff8bc4d630a + + Makefile.am | 9 +++------ + configure.ac | 11 ----------- + 2 files changed, 3 insertions(+), 17 deletions(-) + +commit 4cc417d66cedb8813eddbc561166e5460b484cdb +Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a> +Date: Sat Mar 14 15:29:19 2009 +0000 + + Remove SVN ChangeLog rule; only keep the git one + + git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1829 8bf08bfc-de25-0410-bf0f-dff8bc4d630a + + Makefile.am | 4 - + svn2cl.xsl | 295 ----------------------------------------------------------- + 2 files changed, 0 insertions(+), 299 deletions(-) + +commit e239c54a5617f43304aa25d31bef5290b2592e6c +Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a> +Date: Sat Mar 14 15:29:12 2009 +0000 + + Version 2.26.0 + + git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1828 8bf08bfc-de25-0410-bf0f-dff8bc4d630a + + configure.ac | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 04b4b11165ca542ac72295853a04ab2aa05a75b9 +Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a> +Date: Sat Mar 14 15:28:56 2009 +0000 + + Remove filterset.G update button from the UI for now. Bug #565915 + + git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1827 8bf08bfc-de25-0410-bf0f-dff8bc4d630a + + extensions/adblock/adblock.glade | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + commit d57988bc122c2a3ecca06fc19d5649ba9d0bff4b Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a> Date: Mon Feb 16 19:20:08 2009 +0000 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/epiphany-extensions-2.25.91/configure.ac new/epiphany-extensions-2.26.0/configure.ac --- old/epiphany-extensions-2.25.91/configure.ac 2009-02-16 19:56:55.000000000 +0100 +++ new/epiphany-extensions-2.26.0/configure.ac 2009-03-15 14:10:25.000000000 +0100 @@ -15,13 +15,10 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA m4_define([e_e_version_major],[2]) -m4_define([e_e_version_minor],[25]) -m4_define([e_e_version_micro],[91]) +m4_define([e_e_version_minor],[26]) +m4_define([e_e_version_micro],[0]) m4_define([e_e_version],[e_e_version_major.e_e_version_minor.e_e_version_micro]) -# This can be either "trunk" or "branches/gnome-x-y" -m4_define([e_e_branch],["branches/gnome-2-24"]) - AC_INIT([GNOME Web Browser Extensions],[e_e_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=…] EPIPHANY_API_VERSION=2.26 @@ -380,14 +377,6 @@ AC_DEFINE_UNQUOTED([EXTENSIONS_DATA_DIR], ["${datadir}/${PACKAGE}-${EPIPHANY_EXTENSIONS_MAJOR}"], [Directory of data files]) fi -# **************************** -# SVN for ChangeLog generation -# **************************** - -AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn]) -AC_SUBST([SVN_MODULE],[epiphany-extensions]) -AC_SUBST([SVN_BRANCH],[e_e_branch]) - # ******************************* # ******************************* 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/epiphany-extensions-2.25.91/extensions/adblock/adblock.glade new/epiphany-extensions-2.26.0/extensions/adblock/adblock.glade --- old/epiphany-extensions-2.25.91/extensions/adblock/adblock.glade 2008-05-18 19:37:38.000000000 +0200 +++ new/epiphany-extensions-2.26.0/extensions/adblock/adblock.glade 2009-03-14 15:46:45.000000000 +0100 @@ -271,7 +271,6 @@ <child> <widget class="GtkHBox" id="hbox3"> - <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">5</property> 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/epiphany-extensions-2.25.91/gnome-doc-utils.make new/epiphany-extensions-2.26.0/gnome-doc-utils.make --- old/epiphany-extensions-2.25.91/gnome-doc-utils.make 2009-01-25 19:16:45.000000000 +0100 +++ new/epiphany-extensions-2.26.0/gnome-doc-utils.make 2009-03-15 15:10:28.000000000 +0100 @@ -504,14 +504,13 @@ install-doc-figs: @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ for lc in C $(_DOC_REAL_LINGUAS); do \ + figsymlink=false; \ if test -f "$$lc/$$fig"; then \ figfile="$$lc/$$fig"; \ elif test -f "$(srcdir)/$$lc/$$fig"; then \ figfile="$(srcdir)/$$lc/$$fig"; \ - elif test -f "C/$$fig"; then \ - figfile="C/$$fig"; \ else \ - figfile="$(srcdir)/C/$$fig"; \ + figsymlink=true; \ fi; \ figdir="$$lc/"`echo $$fig | sed -e 's/^$.*\/$.*/\1/' -e '/\//!s/.*//'`; \ figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ @@ -520,8 +519,13 @@ $(mkinstalldirs) "$$figdir"; \ fi; \ figbase=`echo $$fig | sed -e 's/^.*\///'`; \ - echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ - $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + if $$figsymlink; then \ + echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ + ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ + else \ + echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ + $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + fi; \ done; \ done 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/epiphany-extensions-2.25.91/m4/gnome-doc-utils.m4 new/epiphany-extensions-2.26.0/m4/gnome-doc-utils.m4 --- old/epiphany-extensions-2.25.91/m4/gnome-doc-utils.m4 2009-01-25 19:16:45.000000000 +0100 +++ new/epiphany-extensions-2.26.0/m4/gnome-doc-utils.m4 2009-03-15 15:10:28.000000000 +0100 @@ -36,7 +36,8 @@ # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) # AC_DEFUN([GNOME_DOC_INIT], -[ +[AC_REQUIRE([AC_PROG_LN_S])dnl + ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], 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/epiphany-extensions-2.25.91/m4/intltool.m4 new/epiphany-extensions-2.26.0/m4/intltool.m4 --- old/epiphany-extensions-2.25.91/m4/intltool.m4 2009-01-25 19:16:45.000000000 +0100 +++ new/epiphany-extensions-2.26.0/m4/intltool.m4 2009-03-15 15:10:27.000000000 +0100 @@ -171,7 +171,7 @@ dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" 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/epiphany-extensions-2.25.91/Makefile.am new/epiphany-extensions-2.26.0/Makefile.am --- old/epiphany-extensions-2.25.91/Makefile.am 2008-09-22 20:40:10.000000000 +0200 +++ new/epiphany-extensions-2.26.0/Makefile.am 2009-03-15 14:38:22.000000000 +0100 @@ -30,16 +30,11 @@ --disable-scrollkeeper \ --disable-schemas-install -# Build ChangeLog from SVN history (r1572 was the first ChangeLog-less checkin). -# Only build this when in an svn checkout. - -ChangeLog: - if test -f $(top_srcdir)/.git/HEAD; then \ +ChangeLog: + @if test -f $(top_srcdir)/.git/HEAD; then \ git log --stat > $@; \ - elif test -f $(top_srcdir)/.svn/entries; then \ - svn log -v --xml -r HEAD:1572 $(SVN_ROOT)/$(SVN_MODULE)/$(SVN_BRANCH) | \ - xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \ - --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \ fi +dist: ChangeLog + .PHONY: ChangeLog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution-exchange for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package evolution-exchange for openSUSE:Factory checked in at Thu Mar 26 01:57:01 CET 2009. -------- --- GNOME/evolution-exchange/evolution-exchange.changes 2009-03-07 00:37:31.000000000 +0100 +++ evolution-exchange/evolution-exchange.changes 2009-03-16 16:29:21.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 16 16:27:20 CET 2009 - vuntz(a)novell.com + +- Update to version 2.26.0: + + Bug fixes: bgo#567852, bgo#572950. + + Performance improvements. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- evolution-exchange-2.25.92.tar.bz2 New: ---- evolution-exchange-2.26.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-exchange.spec ++++++ --- /var/tmp/diff_new_pack.Xm7136/_old 2009-03-26 01:56:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Xm7136/_new 2009-03-26 01:56:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package evolution-exchange (Version 2.25.92) +# spec file for package evolution-exchange (Version 2.26.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -44,7 +44,7 @@ License: GPL v2 or later Group: Productivity/Networking/Email/Utilities AutoReqProv: on -Version: 2.25.92 +Version: 2.26.0 Release: 1 Summary: Evolution Connector for Microsoft Exchange Server 2000/2003 Source: ftp://ftp.gnome.org/pub/GNOME/sources/evolution-exchange/2.25/%{name}-%{ver… @@ -179,6 +179,10 @@ %{_datadir}/gtk-doc/html/%{name} %changelog +* Mon Mar 16 2009 vuntz(a)novell.com +- Update to version 2.26.0: + + Bug fixes: bgo#567852, bgo#572950. + + Performance improvements. * Sat Mar 07 2009 vuntz(a)novell.com - Update to version 2.25.92: + Updated translations. ++++++ evolution-exchange-2.25.92.tar.bz2 -> evolution-exchange-2.26.0.tar.bz2 ++++++ ++++ 28817 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution-webcal for openSUSE:Factory
by root＠Hilbert.suse.de 26 Mar '09

26 Mar '09

Hello community, here is the log from the commit of package evolution-webcal for openSUSE:Factory checked in at Thu Mar 26 01:56:30 CET 2009. -------- --- GNOME/evolution-webcal/evolution-webcal.changes 2009-03-09 03:36:50.000000000 +0100 +++ evolution-webcal/evolution-webcal.changes 2009-03-16 22:46:15.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 16 22:45:06 CET 2009 - vuntz(a)novell.com + +- Update to version 2.26.0: + + Updated translations. +- Remove AutoReqProv: it's default now. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- evolution-webcal-2.25.91.tar.bz2 New: ---- evolution-webcal-2.26.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-webcal.spec ++++++ --- /var/tmp/diff_new_pack.Kh4427/_old 2009-03-26 01:54:56.000000000 +0100 +++ /var/tmp/diff_new_pack.Kh4427/_new 2009-03-26 01:54:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package evolution-webcal (Version 2.25.91) +# spec file for package evolution-webcal (Version 2.26.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,14 +27,13 @@ BuildRequires: update-desktop-files License: GPL v2 or later; Other uncritical OpenSource License; X11/MIT Group: Productivity/Office/Organizers -Version: 2.25.91 -Release: 2 +Version: 2.26.0 +Release: 1 Summary: Evolution Webcal Source: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/1.0/evolution-webca… Url: http://www.gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} -AutoReqProv: on %gconf_schemas_prereq %description @@ -78,6 +77,10 @@ %files lang -f %{name}.lang %changelog +* Mon Mar 16 2009 vuntz(a)novell.com +- Update to version 2.26.0: + + Updated translations. +- Remove AutoReqProv: it's default now. * Tue Feb 17 2009 mboman(a)suse.de - Update to version 2.25.91: + Remove dependency on bonobo ++++++ evolution-webcal-2.25.91.tar.bz2 -> evolution-webcal-2.26.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/evolution-webcal-2.25.91/ChangeLog new/evolution-webcal-2.26.0/ChangeLog --- old/evolution-webcal-2.25.91/ChangeLog 2009-02-17 06:06:11.000000000 +0100 +++ new/evolution-webcal-2.26.0/ChangeLog 2009-03-16 18:58:51.000000000 +0100 @@ -1,3 +1,8 @@ +2009-03-16 Rodney Dawes <dobey(a)gnome.org> + + * configure.ac: + Up version to 2.26.0 for release + 2009-02-17 Rodney Dawes <dobey(a)gnome.org> * configure.ac: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/evolution-webcal-2.25.91/configure new/evolution-webcal-2.26.0/configure --- old/evolution-webcal-2.25.91/configure 2009-02-17 06:06:20.000000000 +0100 +++ new/evolution-webcal-2.26.0/configure 2009-03-16 18:59:02.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for evolution-webcal 2.25.91. +# Generated by GNU Autoconf 2.61 for evolution-webcal 2.26.0. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='evolution-webcal' PACKAGE_TARNAME='evolution-webcal' -PACKAGE_VERSION='2.25.91' -PACKAGE_STRING='evolution-webcal 2.25.91' +PACKAGE_VERSION='2.26.0' +PACKAGE_STRING='evolution-webcal 2.26.0' PACKAGE_BUGREPORT='' ac_unique_file="config.h.in" @@ -1260,7 +1260,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 evolution-webcal 2.25.91 to adapt to many kinds of systems. +\`configure' configures evolution-webcal 2.26.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1326,7 +1326,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of evolution-webcal 2.25.91:";; + short | recursive ) echo "Configuration of evolution-webcal 2.26.0:";; esac cat <<\_ACEOF @@ -1424,7 +1424,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -evolution-webcal configure 2.25.91 +evolution-webcal configure 2.26.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by evolution-webcal $as_me 2.25.91, which was +It was created by evolution-webcal $as_me 2.26.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2133,7 +2133,7 @@ # Define the identity of the package. PACKAGE=evolution-webcal - VERSION=2.25.91 + VERSION=2.26.0 cat >>confdefs.h <<_ACEOF @@ -7851,7 +7851,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by evolution-webcal $as_me 2.25.91, which was +This file was extended by evolution-webcal $as_me 2.26.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7904,7 +7904,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -evolution-webcal config.status 2.25.91 +evolution-webcal config.status 2.26.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/evolution-webcal-2.25.91/configure.ac new/evolution-webcal-2.26.0/configure.ac --- old/evolution-webcal-2.25.91/configure.ac 2009-02-17 06:05:44.000000000 +0100 +++ new/evolution-webcal-2.26.0/configure.ac 2009-03-16 18:58:29.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT([evolution-webcal], [2.25.91]) +AC_INIT([evolution-webcal], [2.26.0]) AC_CONFIG_SRCDIR(config.h.in) AC_COPYRIGHT([Copyright 2008-2009 Rodney Dawes]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/evolution-webcal-2.25.91/po/ChangeLog new/evolution-webcal-2.26.0/po/ChangeLog --- old/evolution-webcal-2.25.91/po/ChangeLog 2009-01-25 17:45:55.000000000 +0100 +++ new/evolution-webcal-2.26.0/po/ChangeLog 2009-03-16 18:57:07.000000000 +0100 @@ -1,3 +1,16 @@ +2009-03-14 Ignacio Casal Quinteiro <nacho.resa(a)gmail.com> + + * gl.po: Updated Galician translation + +2009-03-05 Krishnababu K <kkrothap(a)redhat.com> + + * te.po: Updated Telugu Translation. + +2009-02-20 Jani Monoses <jani(a)ubuntu.com> + + * ro.po: Updated Romanian translation + by Adi Roiban <adi(a)roiban.ro> + 2008-08-11 Andre Klapper <a9016009(a)gmx.de> * LINGUAS: Added af. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/evolution-webcal-2.25.91/po/gl.po new/evolution-webcal-2.26.0/po/gl.po --- old/evolution-webcal-2.25.91/po/gl.po 2008-07-16 22:50:29.000000000 +0200 +++ new/evolution-webcal-2.26.0/po/gl.po 2009-03-16 18:57:07.000000000 +0100 @@ -2,19 +2,21 @@ # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # Ignacio Casal Quinteiro <nacho.resa(a)gmail.com>, 2005. +# Mancomún - Centro de Referencia e Servizos de Software Libre <g11n(a)mancomun.org>, 2009. # msgid "" msgstr "" "Project-Id-Version: evolution-webcal.gnome-2-10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-30 20:38+0200\n" -"PO-Revision-Date: 2005-06-20 12:53+0200\n" -"Last-Translator: Ignacio Casal Quinteiro <nacho.resa(a)gmail.com>\n" -"Language-Team: Galego\n" +"POT-Creation-Date: 2009-03-14 13:13+0100\n" +"PO-Revision-Date: 2009-03-10 20:17+0000\n" +"Last-Translator: Suso Baleato <suso.baleato(a)xunta.es>\n" +"Language-Team: Galego <proxecto(a)trasno.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../evolution-webcal.schemas.in.in.h:1 msgid "How to handle webcal URLs" @@ -39,57 +41,57 @@ msgid "URL handler for webcal uris" msgstr "Manipulador URL para os URI webcal" -#: ../src/evolution-webcal-main.c:54 +#: ../src/evolution-webcal-main.c:56 #, c-format msgid "" "There was an error parsing the calendar, \"%s\". Please verify that it is a " "valid calendar, and try again." msgstr "" -"Houbo un erro ao analizar o calendario \"%s\". Verifique que é un calendario " -"válido e ténteo outra vez." +"Houbo un erro ao analizar o calendario, \"%s\". Verifique que é un " +"calendario válido e ténteo outra vez." -#: ../src/evolution-webcal-main.c:59 +#: ../src/evolution-webcal-main.c:61 msgid "Error Parsing Calendar" msgstr "Erro ao analizar o calendario" -#: ../src/evolution-webcal-main.c:127 +#: ../src/evolution-webcal-main.c:133 #, c-format msgid "Access to the calendar, \"%s\", is forbidden." msgstr "O acceso ao calendario, \"%s\", está prohibido." -#: ../src/evolution-webcal-main.c:132 +#: ../src/evolution-webcal-main.c:138 #, c-format msgid "The calendar, \"%s\", was not found on the server." msgstr "O calendario, \"%s\", non se localizou no servidor." -#: ../src/evolution-webcal-main.c:137 +#: ../src/evolution-webcal-main.c:143 #, c-format msgid "There was an internal server error while trying to load \"%s\"." msgstr "Houbo un erro interno do servidor ao tentar cargar \"%s\"." -#: ../src/evolution-webcal-main.c:142 +#: ../src/evolution-webcal-main.c:148 #, c-format msgid "There was an error loading the calendar, \"%s\"." msgstr "Houbo un erro ao cargar o calendario, \"%s\"." -#: ../src/evolution-webcal-main.c:147 +#: ../src/evolution-webcal-main.c:153 msgid "Error Loading Calendar" msgstr "Erro ao cargar o calendario" -#: ../src/evolution-webcal-main.c:178 +#: ../src/evolution-webcal-main.c:182 #, c-format msgid "The URI \"%s\" is invalid." msgstr "O URI \"%s\" non é válido." -#: ../src/evolution-webcal-main.c:179 +#: ../src/evolution-webcal-main.c:183 msgid "Invalid URI Specified" msgstr "O URI especificado non é válido" -#: ../src/evolution-webcal-main.c:227 +#: ../src/evolution-webcal-main.c:231 msgid "No URI Specified" msgstr "Non se especificou un URI" -#: ../src/evolution-webcal-main.c:228 +#: ../src/evolution-webcal-main.c:232 msgid "" "No URI to load was specified. You need to pass the URI of the calendar to " "subscribe to, as an argument on the command line." @@ -97,20 +99,20 @@ "Non se especificou un URI para cargar. Necesita indicar o URI do calendario " "ao que subscribirse como un argumento na liña de comandos." -#: ../src/evolution-webcal-main.c:250 +#: ../src/evolution-webcal-main.c:253 msgid "- Evolution webcal: URI Handler" msgstr "- Evolution webcal: manipulador URI" -#: ../src/evolution-webcal-notify.c:272 +#: ../src/evolution-webcal-notify.c:264 #, c-format msgid "No events or tasks were found in the calendar \"%s\"." msgstr "Non se encontraron eventos nin tarefas no calendario \"%s\"." -#: ../src/evolution-webcal-notify.c:275 +#: ../src/evolution-webcal-notify.c:267 msgid "No Tasks or Events Found" msgstr "Non se encontraron eventos ou tarefas" -#: ../src/evolution-webcal-notify.c:331 +#: ../src/evolution-webcal-notify.c:323 #, c-format msgid "" "You are already subscribed to the calendar \"%s\". Please subscribe to " @@ -118,45 +120,45 @@ msgstr "" "Xa está subscrito ao calendario \"%s\". Subscríbase a outro calendario." -#: ../src/evolution-webcal-notify.c:334 +#: ../src/evolution-webcal-notify.c:326 msgid "Already Subscribed" msgstr "Xa está subscrito" -#: ../src/evolution-webcal-notify.c:359 +#: ../src/evolution-webcal-notify.c:350 msgid "Subscribe to Calendar" msgstr "Subscribirse a un calendario" -#: ../src/evolution-webcal-notify.c:404 +#: ../src/evolution-webcal-notify.c:390 msgid "_Subscribe" msgstr "_Subscribirse" #. Description -#: ../src/evolution-webcal-notify.c:443 +#: ../src/evolution-webcal-notify.c:430 msgid "No Description" msgstr "Sen descrición" #. Refresh entry label -#: ../src/evolution-webcal-notify.c:461 +#: ../src/evolution-webcal-notify.c:448 msgid "_Refresh Every:" msgstr "_Actualizar cada:" #. Color picker label -#: ../src/evolution-webcal-notify.c:467 +#: ../src/evolution-webcal-notify.c:454 msgid "C_olor:" msgstr "C_or:" -#: ../src/evolution-webcal-notify.c:496 +#: ../src/evolution-webcal-notify.c:483 msgid "Days" msgstr "Días" -#: ../src/evolution-webcal-notify.c:500 +#: ../src/evolution-webcal-notify.c:487 msgid "Hours" msgstr "Horas" -#: ../src/evolution-webcal-notify.c:504 +#: ../src/evolution-webcal-notify.c:491 msgid "Minutes" msgstr "Minutos" -#: ../src/evolution-webcal-notify.c:508 +#: ../src/evolution-webcal-notify.c:495 msgid "Weeks" msgstr "Semanas" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/evolution-webcal-2.25.91/po/ro.po new/evolution-webcal-2.26.0/po/ro.po --- old/evolution-webcal-2.25.91/po/ro.po 2008-07-16 22:50:29.000000000 +0200 +++ new/evolution-webcal-2.26.0/po/ro.po 2009-03-16 18:57:07.000000000 +0100 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: evolution-webcal\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-12-21 07:26+0100\n" -"PO-Revision-Date: 2007-01-15 20:50+0200\n" -"Last-Translator: Mugurel Tudor <mugurelu(a)gnome.ro>\n" +"POT-Creation-Date: 2008-11-07 11:06+0100\n" +"PO-Revision-Date: 2009-02-20 23:07+0200\n" +"Last-Translator: Adi Roiban <adi(a)roiban.ro>\n" "Language-Team: Romanian <gnomero-list(a)lists.sourceforge.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,89 +19,77 @@ #: ../evolution-webcal.schemas.in.in.h:1 msgid "How to handle webcal URLs" -msgstr "Cum să procesez legăturile URL webcal" +msgstr "Cum să fie gestionate URL-urile webcal" #: ../evolution-webcal.schemas.in.in.h:2 msgid "Run program in terminal" -msgstr "Porneşte programul în terminal" +msgstr "Pornește programul în terminal" #: ../evolution-webcal.schemas.in.in.h:3 msgid "Set to true to have a program specified in command handle webcal URLs" -msgstr "" -"Activaţi pentru a avea un program specificat ce procesează URL-urile webcal" +msgstr "Activați pentru a avea un program specificat ce procesează URL-urile webcal" #: ../evolution-webcal.schemas.in.in.h:4 msgid "True if the program to handle this URL should be run in a terminal" -msgstr "" -"Adevărat, dacă programul folosit pentu procesarea acestui URL ar trebui " -"lansat din terminal" +msgstr "Adevărat, dacă programul folosit pentu procesarea acestui URL ar trebui lansat în terminal" #: ../evolution-webcal.schemas.in.in.h:5 msgid "URL handler for webcal uris" -msgstr "Procesor URL-uri pentru adrese webcal" +msgstr "Gestionar URI-uri pentru adrese webcal" #: ../src/evolution-webcal-main.c:54 #, c-format -msgid "" -"There was an error parsing the calendar, \"%s\". Please verify that it is a " -"valid calendar, and try again." -msgstr "" -"A apărut o eroare la procesarea calendarului „%s”. Verificaţi că este un " -"calendar valid şi incercaţi din nou." +msgid "There was an error parsing the calendar, \"%s\". Please verify that it is a valid calendar, and try again." +msgstr "A apărut o eroare la procesarea calendarului „%s”. Verificați că este un calendar valid și incercați din nou." #: ../src/evolution-webcal-main.c:59 msgid "Error Parsing Calendar" msgstr "Eroare la procesarea calendarului" -#: ../src/evolution-webcal-main.c:127 +#: ../src/evolution-webcal-main.c:131 #, c-format msgid "Access to the calendar, \"%s\", is forbidden." msgstr "Accesul la calendarul „%s” este interzis." -#: ../src/evolution-webcal-main.c:132 +#: ../src/evolution-webcal-main.c:136 #, c-format msgid "The calendar, \"%s\", was not found on the server." msgstr "Calendarul „%s” nu a fost găsit pe server." -#: ../src/evolution-webcal-main.c:137 +#: ../src/evolution-webcal-main.c:141 #, c-format msgid "There was an internal server error while trying to load \"%s\"." msgstr "S-a produs o eroare la încărcarea „%s”." -#: ../src/evolution-webcal-main.c:142 +#: ../src/evolution-webcal-main.c:146 #, c-format msgid "There was an error loading the calendar, \"%s\"." msgstr "S-a produs o eroare la încărcarea calendarului „%s”." -#: ../src/evolution-webcal-main.c:147 +#: ../src/evolution-webcal-main.c:151 msgid "Error Loading Calendar" msgstr "Eroare la încărcarea calendarului" -#: ../src/evolution-webcal-main.c:178 +#: ../src/evolution-webcal-main.c:180 #, c-format msgid "The URI \"%s\" is invalid." -msgstr "URI-ul „%s” este invalid." +msgstr "URI-ul „%s” nu este valid." -#: ../src/evolution-webcal-main.c:179 +#: ../src/evolution-webcal-main.c:181 msgid "Invalid URI Specified" -msgstr "URI-ul specificat este invalid" +msgstr "URI-ul specificat nu este valid" -#: ../src/evolution-webcal-main.c:227 +#: ../src/evolution-webcal-main.c:229 msgid "No URI Specified" msgstr "Nu a fost specificat un URI" -#: ../src/evolution-webcal-main.c:228 -msgid "" -"No URI to load was specified. You need to pass the URI of the calendar to " -"subscribe to, as an argument on the command line." -msgstr "" -"Nu a fost specificat un URI pentru a fi încărcat. Trebuie să trimiteţi ca " -"argument în linia de comandă URI-ul calendarului la care doriţi să vă " -"abonaţi." +#: ../src/evolution-webcal-main.c:230 +msgid "No URI to load was specified. You need to pass the URI of the calendar to subscribe to, as an argument on the command line." +msgstr "Nu a fost specificat un URI pentru a fi încărcat. Trebuie să trimiteți ca argument în linia de comandă URI-ul calendarului la care doriți să vă abonați." -#: ../src/evolution-webcal-main.c:250 +#: ../src/evolution-webcal-main.c:252 msgid "- Evolution webcal: URI Handler" -msgstr "- Evolution webcal: Procesare URI" +msgstr "- Evolution webcal: Gestionar URI" #: ../src/evolution-webcal-notify.c:272 #, c-format @@ -114,16 +102,12 @@ #: ../src/evolution-webcal-notify.c:331 #, c-format -msgid "" -"You are already subscribed to the calendar \"%s\". Please subscribe to " -"another calendar." -msgstr "" -"Sunteţi deja abonat la calendarul „%s”. Vă rog să vă abonaţi la un alt " -"calendar." +msgid "You are already subscribed to the calendar \"%s\". Please subscribe to another calendar." +msgstr "Sunteți deja abonat la calendarul „%s”. Abonați-vă la un alt calendar." #: ../src/evolution-webcal-notify.c:334 msgid "Already Subscribed" -msgstr "Deja abonat" +msgstr "Abonat deja" #: ../src/evolution-webcal-notify.c:359 msgid "Subscribe to Calendar" @@ -163,3 +147,4 @@ #: ../src/evolution-webcal-notify.c:508 msgid "Weeks" msgstr "Săptămâni" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/evolution-webcal-2.25.91/po/te.po new/evolution-webcal-2.26.0/po/te.po --- old/evolution-webcal-2.25.91/po/te.po 2008-07-16 22:50:29.000000000 +0200 +++ new/evolution-webcal-2.26.0/po/te.po 2009-03-16 18:57:07.000000000 +0100 @@ -1,23 +1,26 @@ -# Telugu translation of evolution-webcal +# translation of te.po to Telugu +# Telugu translation of evolution-webcal # This file is distributed under the same license as the evolution-webcal package. # Copyright (C) Sree Ganesh <mrthottempudi(a)yahoo.com>, 2006. # +# Krishna Babu K <kkrothap(a)redhat.com>, 2009. msgid "" msgstr "" -"Project-Id-Version: evolution-webcal.HEAD\n" +"Project-Id-Version: te\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-19 20:26+0530\n" -"PO-Revision-Date: 2006-09-14 14:59+0530\n" -"Last-Translator: Sree Ganesh <mrthottempudi(a)yahoo.com>\n" -"Language-Team: Swecha <localisation(a)swecha.org>\n" +"POT-Creation-Date: 2008-11-07 11:06+0100\n" +"PO-Revision-Date: 2009-03-05 18:50+0530\n" +"Last-Translator: Krishna Babu K <kkrothap(a)redhat.com>\n" +"Language-Team: Telugu <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n\n" #: ../evolution-webcal.schemas.in.in.h:1 msgid "How to handle webcal URLs" -msgstr "వెబ్ కల్ యు ఆర్ ఎల్ ను ఎలా ఉపయోగించాలి" +msgstr "వెబ్‌కాల్ URLను ఎలా సంభాలించాలి" #: ../evolution-webcal.schemas.in.in.h:2 msgid "Run program in terminal" @@ -25,7 +28,7 @@ #: ../evolution-webcal.schemas.in.in.h:3 msgid "Set to true to have a program specified in command handle webcal URLs" -msgstr "" +msgstr "వెబ్‌కాల్ URLలను సంభాలించుటకు ఆదేశమునందు తెలుపబడిన ప్రోగ్రామ్‌ను కలిగివుండుటకు సత్యమునకు అమర్చుము" #: ../evolution-webcal.schemas.in.in.h:4 msgid "True if the program to handle this URL should be run in a terminal" @@ -40,55 +43,60 @@ msgid "" "There was an error parsing the calendar, \"%s\". Please verify that it is a " "valid calendar, and try again." -msgstr "" -"కాలెండరును విశ్లేషించటంలో దోషంఉంది, \"%s\". దయచెసి అది సరైన కాలెండరోకాదో సరిచూసి మళ్లీ ప్రయత్నించండి." +msgstr "కాలెండరును విశ్లేషించటంలో దోషంఉంది, \"%s\". దయచెసి అది సరైన కాలెండరోకాదో సరిచూసి మళ్లీ ప్రయత్నించండి." #: ../src/evolution-webcal-main.c:59 msgid "Error Parsing Calendar" msgstr "కాలెండరును విశ్లేషించటంలో దోషం" -#: ../src/evolution-webcal-main.c:127 +#: ../src/evolution-webcal-main.c:131 #, c-format msgid "Access to the calendar, \"%s\", is forbidden." msgstr "\"%s\" కాలెండరు అందుబాటు సిద్ధంగా ఉంది." -#: ../src/evolution-webcal-main.c:132 +#: ../src/evolution-webcal-main.c:136 #, c-format msgid "The calendar, \"%s\", was not found on the server." msgstr "\"%s\" కాలెండరు సర్వరులో కనుగొనబడలేదు." -#: ../src/evolution-webcal-main.c:137 +#: ../src/evolution-webcal-main.c:141 #, c-format msgid "There was an internal server error while trying to load \"%s\"." msgstr "\"%s\"ని లోడుచేస్తున్నప్పుడు అంతర్గత సర్వరు దోషం ఉంది" -#: ../src/evolution-webcal-main.c:142 +#: ../src/evolution-webcal-main.c:146 #, c-format msgid "There was an error loading the calendar, \"%s\"." msgstr "కేలండరును లోడుచెయటంలో దోషం, \"%s\"." -#: ../src/evolution-webcal-main.c:147 +#: ../src/evolution-webcal-main.c:151 msgid "Error Loading Calendar" msgstr "కేలండరును లోడుచెయటంలో దోషం" -#: ../src/evolution-webcal-main.c:178 +#: ../src/evolution-webcal-main.c:180 #, c-format msgid "The URI \"%s\" is invalid." msgstr " \"%s\" యుఆర్ఐ చెల్లనిది." -#: ../src/evolution-webcal-main.c:179 +#: ../src/evolution-webcal-main.c:181 msgid "Invalid URI Specified" msgstr "చెల్లని యుఆర్ఐ నిర్ధారణ" -#: ../src/evolution-webcal-main.c:227 +#: ../src/evolution-webcal-main.c:229 msgid "No URI Specified" msgstr "ఏ యూఆర్ఐ నిర్ధారించబడలేదు" -#: ../src/evolution-webcal-main.c:228 +#: ../src/evolution-webcal-main.c:230 msgid "" "No URI to load was specified. You need to pass the URI of the calendar to " "subscribe to, as an argument on the command line." msgstr "" +"లోడవుటకు యెటువంటి URI తెలుపలేదు. చందాదారు కావడానికి, మీరు ఆదేశ వరుసవద్ద " +"క్యాలెండర్‌యొక్క URIను ఆర్గుమెంటువలె పంపవలసివుంటుంది." + +#: ../src/evolution-webcal-main.c:252 +msgid "- Evolution webcal: URI Handler" +msgstr "- ఎవాల్యూషన్ వెబ్‌కాల్: URI సంభాలిక" #: ../src/evolution-webcal-notify.c:272 #, c-format @@ -105,6 +113,8 @@ "You are already subscribed to the calendar \"%s\". Please subscribe to " "another calendar." msgstr "" +"మీరు యిప్పటికే క్యాలెండర్ \"%s\"కు చందాదారు అయినారు. దయచేసి వేరొక క్యాలెండర్‌కు " +"చందాదారు కండి." #: ../src/evolution-webcal-notify.c:334 msgid "Already Subscribed" @@ -148,3 +158,4 @@ #: ../src/evolution-webcal-notify.c:508 msgid "Weeks" msgstr "వారాలు" + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0