From vmiklos at frugalware.org Fri Sep 1 00:13:54 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 00:13:58 2006 Subject: [Frugalware-darcs] frugalware-current: docs/release-howto Message-ID: <20060831221355.07FE04E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060831220850-e2957-08d892a424004fdfe06398ef349cfe6f655ee76e.gz; [docs/release-howto VMiklos **20060831220850 a few words about a -testing release ] { hunk ./docs/tech/release-howto.txt 7 + +A testing release +----------------- + +Just because I don't know where to document this, here is the command line what +I use to sync changes from -current to -testing before a release: + + rsync -avP --delete-after frugalware-current/* frugalware-testing/ } From vmiklos at frugalware.org Fri Sep 1 00:50:07 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 00:50:10 2006 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-2.0.3.999.2-1-x86_64 Message-ID: <20060831225007.5724A4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060831223928-e2957-cf99056353d356f51572ae9f2f7c67ecde53aa8b.gz; [openoffice.org-2.0.3.999.2-1-x86_64 VMiklos **20060831223928 update to oood680-m2 ] { hunk ./source/xapps/openoffice.org/FrugalBuild 16 - milestone=1 + milestone=2 hunk ./source/xapps/openoffice.org/FrugalBuild 19 - snapshot=20060822 + snapshot=20060831 } From crazy at frugalware.org Fri Sep 1 02:40:35 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 02:40:37 2006 Subject: [Frugalware-darcs] frugalware-current: konversation-1.0-1-i686 Message-ID: <20060901004035.2D8F74E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901003744-f6986-4382321bbaa83a8e1b9bbeb821c748e0fe77578b.gz; [konversation-1.0-1-i686 crazy **20060901003744 * Version bump ] { hunk ./source/kde-extra/konversation/FrugalBuild 1 -# Last Modified: Sun, 26 Feb 2006 14:57:19 +0100 +# Last Modified: Fri, 01 Sep 2006 02:35:40 +0200 hunk ./source/kde-extra/konversation/FrugalBuild 7 -pkgver=0.19 +pkgver=1.0 hunk ./source/kde-extra/konversation/FrugalBuild 11 -depends=('kdebase') +depends=('kdebase>=3.5.4') hunk ./source/kde-extra/konversation/FrugalBuild 16 -source=(http://download.berlios.de/konversation/konversation-$pkgver.tar.bz2) -sha1sums=('d4463fc8413f6a6c35448ab9e600da6464bd6adf') +source=($url/downloads/$pkgname-$pkgver.tar.bz2) +Finclude kdeapps +sha1sums=('f592727626845e568696d06b3a086d4b607f4ab3') hunk ./source/kde-extra/konversation/FrugalBuild 20 -build() -{ - Fbuild --disable-debug --without-debug --with-gnu-ld \ - --disable-dependency-tracking -} -# optimalization OK +# optimization OK } From crazy at frugalware.org Fri Sep 1 04:15:56 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 04:16:00 2006 Subject: [Frugalware-darcs] frugalware-current: kmymoney2-0.8.5-1-i686 Message-ID: <20060901021557.301E74E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901021227-f6986-3a13730db2e803542ecc70608e0dd6069f32b034.gz; [kmymoney2-0.8.5-1-i686 crazy **20060901021227 * Version bump ] { hunk ./source/kde-extra/kmymoney2/FrugalBuild 1 -# Last Modified: Sun, 21 May 2006 14:41:28 +0200 +# Last Modified: Fri, 01 Sep 2006 04:03:22 +0200 hunk ./source/kde-extra/kmymoney2/FrugalBuild 6 -pkgver=0.8.4 +pkgver=0.8.5 hunk ./source/kde-extra/kmymoney2/FrugalBuild 9 -license="GPL 2" -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge -url="http://kmymoney2.sourceforge.net" -sha1sums=('7343607c41270c9102b09eb0a4442864ed1edae1') +depends=('kdelibs>=3.5.4' 'libofx') hunk ./source/kde-extra/kmymoney2/FrugalBuild 12 -depends=('qt' 'kdelibs') -Finclude kdeapps +license="GPL 2" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge kdeapps +Fconfopts="$Fconfopts --enable-finale --enable-gcc-hidden-visibility" +sha1sums=('1c0780621f381cf096baf975ecad9e94571372d4') } From krics at linuxforum.hu Fri Sep 1 09:23:13 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 09:23:17 2006 Subject: [Frugalware-darcs] frugalware-current: util.sh: Fautoreconf changes Message-ID: <20060901072314.36E294E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901072048-d209c-e6974d16d5ae3f54ecfc235eb44b93e8d9a5eb37.gz; [util.sh: Fautoreconf changes Christian Hamar alias krix **20060901072048 * Remove -s flag - NOTE: -s cause that freshed up files are only symlinks but this brokes some packages docs. Example: INSTALL file is a symlink to /usr/share/automake-1.9/INSTALL and package got a wrong symlink in it. ] { hunk ./source/include/util.sh 668 - Fmessage "Running autoreconf -vifs ..." - autoreconf -vifs || Fdie + Fmessage "Running autoreconf -vif ..." + autoreconf -vif || Fdie } From krics at linuxforum.hu Fri Sep 1 09:29:47 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 09:30:03 2006 Subject: [Frugalware-darcs] frugalware-current: libsndfile-1.0.17-1-x86_64 Message-ID: <20060901072948.763AE4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901072835-d209c-32a71142c255179470ea49798075bec1c9c9f3ff.gz; [libsndfile-1.0.17-1-x86_64 Christian Hamar alias krix **20060901072835 * Version bump * Added a patch to fix html doc installation * Reworked FB ] { hunk ./source/lib/libsndfile/FrugalBuild 1 -# Last Modified: Fri, 05 May 2006 16:48:37 +0200 +# Last Modified: Fri, 01 Sep 2006 09:27:03 +0200 hunk ./source/lib/libsndfile/FrugalBuild 4 -# Contributor: VMiklos -# Old Maintainer: Zsolt Szalai hunk ./source/lib/libsndfile/FrugalBuild 6 -pkgver=1.0.16 +pkgver=1.0.17 hunk ./source/lib/libsndfile/FrugalBuild 14 -source=(http://www.mega-nerd.com/libsndfile/$pkgname-$pkgver.tar.gz) -sha1sums=('b844603fe5106459663123630dc42abbdd06e215') +source=(http://www.mega-nerd.com/libsndfile/$pkgname-$pkgver.tar.gz \ + libsndfile-fixhtmldocsdir.patch) +sha1sums=('2f66798d596a15491fbd1191ded8125ed71ef411' \ + '7c61fe6d99ebe664647ce5a1eaf0dce13a183c17') hunk ./source/lib/libsndfile/FrugalBuild 21 - Fconf - sed -e "s:^htmldocdir.*:htmldocdir = /usr/share/doc/${pkgname}1-dev/html:" \ - -i $Fsrcdir/$pkgname-$pkgver/doc/Makefile || Fdie - make || Fdie + Fpatchall + Fautoreconf + Fmake addfile ./source/lib/libsndfile/libsndfile-fixhtmldocsdir.patch hunk ./source/lib/libsndfile/libsndfile-fixhtmldocsdir.patch 1 +diff -Naur libsndfile-1.0.17.orig/configure.ac libsndfile-1.0.17/configure.ac +--- libsndfile-1.0.17.orig/configure.ac 2006-09-01 09:14:59.000000000 +0200 ++++ libsndfile-1.0.17/configure.ac 2006-09-01 09:15:31.000000000 +0200 +@@ -386,12 +386,12 @@ + #==================================================================================== + # Settings for the HTML documentation. + +-htmldocdir=$prefix/share/doc/libsndfile1-dev/html ++htmldocdir=$prefix/share/doc/$PACKAGE_NAME-$PACKAGE_VERSION/html + + if test $prefix = "NONE" ; then +- htmldocdir=/usr/local/share/doc/libsndfile1-dev/html ++ htmldocdir=/usr/local/share/doc/$PACKAGE_NAME-$PACKAGE_VERSION/html + else +- htmldocdir=$prefix/share/doc/libsndfile1-dev/html ++ htmldocdir=$prefix/share/doc/$PACKAGE_NAME-$PACKAGE_VERSION/html + fi + + if test x$enable_bow_docs = "xyes" ; then } From krics at linuxforum.hu Fri Sep 1 09:42:29 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 09:42:39 2006 Subject: [Frugalware-darcs] frugalware-current: joomla-1.0.11-1-x86_64 Message-ID: <20060901074230.13E414E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901074043-d209c-9936bd7b2ee8c2f19e8ece4a66c237f49c4cb264.gz; [joomla-1.0.11-1-x86_64 Christian Hamar alias krix **20060901074043 * Version bump * Fixes [SEC] #1086 * Fixed source URI now from ftp://ftp.frugalware..../other/sources/joomla/ ] { hunk ./source/network-extra/joomla/FrugalBuild 1 -# Last Modified: Mon, 03 Jul 2006 07:22:56 +0200 +# Last Modified: Fri, 01 Sep 2006 09:39:09 +0200 hunk ./source/network-extra/joomla/FrugalBuild 6 -pkgver=1.0.10 +pkgver=1.0.11 hunk ./source/network-extra/joomla/FrugalBuild 15 -source=(http://frugalware.org/~gimb/download/Joomla_"$pkgver"-Stable-Full_Package.tar.bz2 joomlasetup README.Frugalware) -sha1sums=('2a650ae0d3b42f75db06b90cdb082c7c3dc899ca' \ +source=(http://ftp.frugalware.org/pub/other/sources/joomla/Joomla_"$pkgver"-Stable-Full_Package.tar.bz2 joomlasetup README.Frugalware) +sha1sums=('c3fd5f31e76932fb98331d4ec50176f53e904c77' \ hunk ./source/network-extra/joomla/FrugalBuild 24 - mv "$Fsrcdir"/* "$Fdestdir"/var/www/joomla - rm "$Fdestdir"/var/www/joomla/Joomla_"$pkgver"-Stable-Full_Package.tar.bz2 - mv "$Fdestdir"/var/www/joomla/joomlasetup . - mv "$Fdestdir"/var/www/joomla/README.Frugalware . + mv "$Fsrcdir"/* "$Fdestdir"/var/www/joomla || Fdie + rm "$Fdestdir"/var/www/joomla/Joomla_"$pkgver"-Stable-Full_Package.tar.bz2 || Fdie + mv "$Fdestdir"/var/www/joomla/joomlasetup . || Fdie + mv "$Fdestdir"/var/www/joomla/README.Frugalware . || Fdie hunk ./source/network-extra/joomla/FrugalBuild 32 -# vim: ft=sh - } From krics at linuxforum.hu Fri Sep 1 10:21:12 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 10:21:19 2006 Subject: [Frugalware-darcs] frugalware-current: librsvg-2.16.0-1-x86_64 Message-ID: <20060901082112.DDFCB4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901081950-d209c-6ac2d8f319f7bd60ad741e9cb75a318b42017d60.gz; [librsvg-2.16.0-1-x86_64 Christian Hamar alias krix **20060901081950 * Version bump ] { hunk ./source/gnome/librsvg/FrugalBuild 1 -# Last modified: Thu, 24 Aug 2006 09:57:30 +0100 +# Last modified: Fri, 01 Sep 2006 10:16:55 +0200 hunk ./source/gnome/librsvg/FrugalBuild 7 -pkgver=2.15.90 -pkgrel=2 +pkgver=2.16.0 +pkgrel=1 hunk ./source/gnome/librsvg/FrugalBuild 12 -makedepends=('firefox>=1.5.0.5' 'gtk-doc') +makedepends=('firefox>=1.5.0.6' 'gtk-doc') hunk ./source/gnome/librsvg/FrugalBuild 16 -sha1sums=('1fcfc624fdbc24260d3401f1e12eb99bcea1566a') +sha1sums=('87917ea1300ca592e9901eb99ce070bd565b0807') } From krics at linuxforum.hu Fri Sep 1 10:46:04 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 10:46:25 2006 Subject: [Frugalware-darcs] frugalware-current: netpbm-10.34-2-x86_64 Message-ID: <20060901084604.A47E44E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901084518-d209c-e86eaacd5b80abd4dcac03cfd31c1c7368b7554e.gz; [netpbm-10.34-2-x86_64 Christian Hamar alias krix **20060901084518 * Release bump * PATCH1: Fix build and now we ship .a lib and .so symlink for netpbm libs. :S * PATCH2: Fix RGB paths for new xorg ] { hunk ./source/xapps/netpbm/FrugalBuild 1 -# Last Modified: Mon, 19 Jun 2006 21:11:57 +0200 +# Last Modified: Fri, 01 Sep 2006 10:43:37 +0200 hunk ./source/xapps/netpbm/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xapps/netpbm/FrugalBuild 14 -source=(${source[@]} config) +source=(${source[@]} config netpbm-10.34-build.patch \ + netpbm-10.34-rgb-paths.patch) +sha1sums=('530458871f9d3dc763a1bf82f227eeb79098c601' \ + '15ce21b3ee9b4d4d40aa7ac6e6a02dcb7e809381' \ + 'b6bc9dde7e1482477d27cd00bf8f0884394a9b07' \ + '358d0057fe4d10c4148d732bca225fd6e69c6b0c') hunk ./source/xapps/netpbm/FrugalBuild 21 -build() -{ +build() { hunk ./source/xapps/netpbm/FrugalBuild 24 + Fpatchall hunk ./source/xapps/netpbm/FrugalBuild 38 -sha1sums=('530458871f9d3dc763a1bf82f227eeb79098c601' \ - '15ce21b3ee9b4d4d40aa7ac6e6a02dcb7e809381') - addfile ./source/xapps/netpbm/netpbm-10.34-build.patch hunk ./source/xapps/netpbm/netpbm-10.34-build.patch 1 +diff -Naur netpbm-10.34.orig/buildtools/libopt.c netpbm-10.34/buildtools/libopt.c +--- netpbm-10.34.orig/buildtools/libopt.c 2006-09-01 10:37:09.000000000 +0200 ++++ netpbm-10.34/buildtools/libopt.c 2006-09-01 10:37:20.000000000 +0200 +@@ -502,7 +502,7 @@ + + strcpy(outputLine, ""); /* initial value */ + runtime = FALSE; /* initial value */ +- quiet = FALSE; /* initial value */ ++ quiet = TRUE; /* initial value */ + error = FALSE; /* no error yet */ + for (arg = 1; arg < argc && !error; arg++) { + if (strcmp(argv[arg], "-runtime") == 0) +diff -Naur netpbm-10.34.orig/GNUmakefile netpbm-10.34/GNUmakefile +--- netpbm-10.34.orig/GNUmakefile 2006-09-01 10:37:09.000000000 +0200 ++++ netpbm-10.34/GNUmakefile 2006-09-01 10:37:20.000000000 +0200 +@@ -87,6 +87,9 @@ + .PHONY: nonmerge + nonmerge: $(PRODUCT_SUBDIRS:%=%/all) + ++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all ++converter/all analyzer/all editor/all generator/all other/all: lib/all ++ + OMIT_CONFIG_RULE = 1 + OMIT_VERSION_H_RULE = 1 + OMIT_INTTYPES_RULE = 1 +diff -Naur netpbm-10.34.orig/lib/Makefile netpbm-10.34/lib/Makefile +--- netpbm-10.34.orig/lib/Makefile 2006-09-01 10:37:09.000000000 +0200 ++++ netpbm-10.34/lib/Makefile 2006-09-01 10:37:20.000000000 +0200 +@@ -244,7 +244,7 @@ + .PHONY: install.staticlib + install.staticlib: $(PKGDIR)/link + $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ +- $(PKGDIR)/link ++ $(PKGDIR)/lib + + # Install a shared library stub -- the ".so" file used at link time to + # prepare a program for dynamically linking a library at run time +@@ -252,9 +252,9 @@ + install.sharedlibstub: $(PKGDIR)/link + ifeq ($(NETPBMLIBTYPE),unixshared) + # install the link-time (.so) links to the runtime libraries +- cd $(PKGDIR)/link ; \ ++ cd $(PKGDIR)/lib ; \ + rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ +- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ ++ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ + libnetpbm.$(NETPBMLIBSUFFIX) + endif + ifeq ($(NETPBMLIBTYPE),dll) addfile ./source/xapps/netpbm/netpbm-10.34-rgb-paths.patch hunk ./source/xapps/netpbm/netpbm-10.34-rgb-paths.patch 1 +use paths for rgb that make more sense in Linux + +http://bugs.gentoo.org/139423 + +--- netpbm-10.34/pm_config.in.h ++++ netpbm-10.34/pm_config.in.h +@@ -67,8 +67,8 @@ + #define RGB_DB2 "PBMplus_Dir:RGB.TXT" + #define RGB_DB3 "PBMplus_Dir:RGB.TXT" + #else +-#define RGB_DB1 "/usr/lib/X11/rgb.txt" ++#define RGB_DB1 "/usr/share/X11/rgb.txt" +-#define RGB_DB2 "/usr/openwin/lib/rgb.txt" ++#define RGB_DB2 "/usr/lib/X11/rgb.txt" + #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" + #endif + } From krics at linuxforum.hu Fri Sep 1 11:13:07 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 11:13:15 2006 Subject: [Frugalware-darcs] frugalware-current: gocr-0.41-1-x86_64 Message-ID: <20060901091307.381C54E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901091142-d209c-33c2d9c7c241c88e8ba81368db229e64550ecdcc.gz; [gocr-0.41-1-x86_64 Christian Hamar alias krix **20060901091142 * Version bump * Fixed SBU * Depends on netpbm-10.34-2 (because that ships right symlink to netpbm lib) * Fixed build (damn what braindead) * Added gtk+1 as depends and now we got gtk-ocr too ] { hunk ./source/xapps-extra/gocr/FrugalBuild 1 -# Last Modified: Sun, 16 Jul 2006 20:26:31 +0200 -# Compiling Time: 0.01 SBU +# Last Modified: Fri, 01 Sep 2006 11:09:46 +0200 +# Compiling Time: 0.11 SBU hunk ./source/xapps-extra/gocr/FrugalBuild 6 -pkgver=0.40 +pkgver=0.41 hunk ./source/xapps-extra/gocr/FrugalBuild 9 -depends=('netpbm') +depends=('netpbm>=10.34-2') +makedepends=('transfig' 'gtk+') hunk ./source/xapps-extra/gocr/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') hunk ./source/xapps-extra/gocr/FrugalBuild 17 -sha1sums=('6a5097281664ca3ffd01b11756f1dd5b565e673e') +sha1sums=('d494974fb7e4b1b6e053381c21ba1a3ef2f9f3f7') + +build() { + Fcd + sed -i -e "s/configure/\.\/configure/" frontend/Makefile + Fconf + make src man frontend doc || Fdie + make DESTDIR="$Fdestdir" prefix="/usr" exec_prefix="/usr" install || Fdie + # Damn ?! + chmod -x $Fdestdir/usr/include/gocr.h || Fdie + chmod -x $Fdestdir/usr/lib/libPgm* || Fdie + chmod -x $Fdestdir/usr/man/man1/gocr* || Fdie + Fexerel frontend/gnome/src/gtk-ocr /usr/bin/gtk-ocr + Fdocrel doc/gocr.html + Fdocrel doc/unicode.txt +} } From vmiklos at frugalware.org Fri Sep 1 11:27:43 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 11:27:45 2006 Subject: [Frugalware-darcs] homepage-ng: 0.5rc2 released Message-ID: <20060901092743.863C84E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060901092711-e2957-d69b93979eaa8a2f38c500c14d0dc25f95983491.gz; [0.5rc2 released VMiklos **20060901092711] { hunk ./frugalware/xml/news.xml 14 + + 43 + Frugalware 0.5rc2 (Siwenna) released + Fri Sep 1 11:26:39 CEST 2006 + VMiklos + announce the immediate availability of Frugalware 0.5rc2, the second release candidate of the upcoming 0.5 stable release.
+ A short and incomplete list of changes since 0.5rc1:
+
    +
  • Updated GNOME to 2.16 Release Candidate (2.15.92)
    • +
  • ~300 bugfixes
    • +
  • Updated KDE and GRUB artwork
    • +
  • More than 30 new packages: ntfs-3g, avifile, gnome-sharp and much more!
    • +
+ Please refer to the Frugalware Testing ChangeLog for more information.
+ Download for i686:
+ NOTE: Don't download CDs 3-9 or the second DVD unless you don't have an internet connection
+ netinstall (21M), + cd1 (632M), + cd2 (641M), + cd3 (643M), + cd4 (640M), + cd5 (599M), + cd6 (630M), + cd7 (627M), + cd8 (417M), + cd9 (638M), + cd10 (128M), + dvd1 (4.2G) + dvd2 (1.2G) +
+ SHA1SUMS: + 
+68b77bf880dcb5a05ba66ae9b80a7831d3fcbd8c  frugalware-0.5rc2-i686-cd10.iso
+65d73a3408d3a7e4a6f28b990c60be40706f265d  frugalware-0.5rc2-i686-cd1.iso
+0581700c2139059cee22f10c6b40561af9973d8f  frugalware-0.5rc2-i686-cd2.iso
+580bc19fa7bfcc509e075f1f337953a6da60f93a  frugalware-0.5rc2-i686-cd3.iso
+d1d78560f6f4c641621ac41c4f0e5c12d5d58a9d  frugalware-0.5rc2-i686-cd4.iso
+d72bfe2ffcd935b6d02bde576d78a5076651a2b5  frugalware-0.5rc2-i686-cd5.iso
+ffb7f8186dc804e8484082be72dfd340f83a9d8b  frugalware-0.5rc2-i686-cd6.iso
+045ed869c57eadebf172d38d506e5d775b41711c  frugalware-0.5rc2-i686-cd7.iso
+99062bdaed26566b95e78773ed3c045b5fac442a  frugalware-0.5rc2-i686-cd8.iso
+82da06750a859584804191889bd5c23e86f9edc9  frugalware-0.5rc2-i686-cd9.iso
+94f7a0a0a1d2a9d209a1f85ed251a0e78c128f36  frugalware-0.5rc2-i686-dvd1.iso
+e4397526607832e83684be5c7f88598242d05e75  frugalware-0.5rc2-i686-dvd2.iso
+fae88cc8378e2982a87761c0d97fdfbf42eb321c  frugalware-0.5rc2-i686-net.iso
+
+ ]]> + + hunk ./frugalware/xml/roadmap.xml 34 - 0 + 1 } From krics at linuxforum.hu Fri Sep 1 11:31:14 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 11:31:25 2006 Subject: [Frugalware-darcs] frugalware-current: notecase-1.1.9-1-x86_64 Message-ID: <20060901093114.9990D4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901093020-d209c-337f805d2aca9bc50756354527d9a780d9cea931.gz; [notecase-1.1.9-1-x86_64 Christian Hamar alias krix **20060901093020 * Version bump * Added a patch for proper install (destdir) * Added gnome-scriptlet and use update-desktop-database and update-mime-db * Fixed SBU ] { hunk ./source/xapps-extra/notecase/FrugalBuild 1 -# Last modified: Thu, 03 Aug 2006 00:21:51 +0200 -# Compiling time: 0.09 SBU +# Last modified: Fri, 01 Sep 2006 11:27:29 +0200 +# Compiling time: 0.21 SBU hunk ./source/xapps-extra/notecase/FrugalBuild 6 -pkgver=1.1.7 +pkgver=1.1.9 hunk ./source/xapps-extra/notecase/FrugalBuild 14 -Finclude sourceforge -sha1sums=('666e2916030923e0059a14b4e86deeb5453cc321') +_F_gnome_desktop="y" +_F_gnome_mime="y" +Finclude sourceforge gnome-scriptlet +source=(${source[@]} notecase-destdir-fix.patch) +sha1sums=('98789a9c0ae529e8e5f5f0e1cf3a23ada5d7c2bc') addfile ./source/xapps-extra/notecase/notecase-destdir-fix.patch hunk ./source/xapps-extra/notecase/notecase-destdir-fix.patch 1 +diff -Naur notecase-1.1.9.orig/Makefile notecase-1.1.9/Makefile +--- notecase-1.1.9.orig/Makefile 2006-09-01 11:20:08.000000000 +0200 ++++ notecase-1.1.9/Makefile 2006-09-01 11:23:24.000000000 +0200 +@@ -245,24 +245,24 @@ + name_len=`echo "$$name_len - 3" | bc`; \ + loc=`echo $$loc | cut -c -$$name_len`; \ + msgfmt $$i -o po/messages.mo; \ +- install -D -m 644 po/messages.mo "$(INSTALL)$(DATA_DIR)/locale/$$loc/LC_MESSAGES/notecase.mo"; \ ++ install -D -m 644 po/messages.mo "$(INSTALL)$(DESTDIR)$(DATA_DIR)/locale/$$loc/LC_MESSAGES/notecase.mo"; \ + done; \ + rm -f po/messages.mo; + @echo done installing translations + + pouninstall: +- rm -vf $(DATA_DIR)/locale/*/LC_MESSAGES/notecase.mo ++ rm -vf $(DESTDIR)$(DATA_DIR)/locale/*/LC_MESSAGES/notecase.mo + @echo done uninstalling translations + + # + # install application + # + install: notecase poinstall +- install -D -m 755 $(BIN)/notecase "$(INSTALL)$(BINARY_DIR)/notecase" +- install -D -m 644 docs/help.ncd "$(INSTALL)$(DATA_DIR)/doc/notecase/help.ncd" +- install -D -m 644 docs/notecase.desktop "$(INSTALL)$(DATA_DIR)/applications/notecase.desktop" +- install -D -m 644 docs/notecase.xml "$(INSTALL)$(DATA_DIR)/mime/packages/notecase.xml" +- install -D -m 644 res/notecase.xpm "$(INSTALL)$(DATA_DIR)/icons/notecase.xpm" ++ install -D -m 755 $(BIN)/notecase "$(INSTALL)$(DESTDIR)$(BINARY_DIR)/notecase" ++ install -D -m 644 docs/help.ncd "$(INSTALL)$(DESTDIR)$(DATA_DIR)/doc/notecase/help.ncd" ++ install -D -m 644 docs/notecase.desktop "$(INSTALL)$(DESTDIR)$(DATA_DIR)/applications/notecase.desktop" ++ install -D -m 644 docs/notecase.xml "$(INSTALL)$(DESTDIR)$(DATA_DIR)/mime/packages/notecase.xml" ++ install -D -m 644 res/notecase.xpm "$(INSTALL)$(DESTDIR)$(DATA_DIR)/icons/notecase.xpm" + #TOFIX: how to prevent "fedora-" prefix? + # desktop-file-install --vendor=fedora \ + # --dir=$(datadir)/applications \ +@@ -278,9 +278,9 @@ + # + uninstall: pouninstall + rm -f "$(BINARY_DIR)/notecase" +- rm -f "$(DATA_DIR)/applications/notecase.desktop" +- rm -f "$(DATA_DIR)/icons/notecase.xpm" +- rm -rf "$(DATA_DIR)/doc/notecase" ++ rm -f "$(DESTDIR)$(DATA_DIR)/applications/notecase.desktop" ++ rm -f "$(DESTDIR)$(DATA_DIR)/icons/notecase.xpm" ++ rm -rf "$(DESTDIR)$(DATA_DIR)/doc/notecase" + @echo done uninstalling + + # +@@ -323,12 +323,6 @@ + convertsrc: + unix2dos -q -k $(SRCPATH)/*.cpp $(SRCPATH)/*.h $(GUIPATH)/*.cpp $(GUIPATH)/*.h $(GUIPATH)/gui/*.cpp $(GUIPATH)/gui/*.h + +-# +-# - update Linux mime/desktop system +-# +-updatemime: +- update-mime-database "$(DATA_DIR)/mime/" +- update-desktop-database + + # + # for debugging purposes } From krics at linuxforum.hu Fri Sep 1 12:29:25 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 12:29:33 2006 Subject: [Frugalware-darcs] frugalware-current: lbreakout2-2.6beta_7-1-x86_64 Message-ID: <20060901102925.DB5964E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901102836-d209c-8011b820128ba80d21cfc2b12f2030c5fcb7a2f1.gz; [lbreakout2-2.6beta_7-1-x86_64 Christian Hamar alias krix **20060901102836 * Version bump ] { hunk ./source/games-extra/lbreakout2/FrugalBuild 1 -# Last Modified: Sun, 28 May 2006 23:10:09 +0200 +# Last Modified: Fri, 01 Sep 2006 12:25:33 +0200 hunk ./source/games-extra/lbreakout2/FrugalBuild 6 -pkgver=2.6beta_6 +pkgver=2.6beta_7 hunk ./source/games-extra/lbreakout2/FrugalBuild 13 +_F_sourceforge_dirname="lgames" +Finclude sourceforge hunk ./source/games-extra/lbreakout2/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/lgames/$pkgname-`echo $pkgver | sed 's/_/-/'`.tar.gz) -sha1sums=('46139de3eebc042ad0e624f50ce21fc886c64780') +sha1sums=('7d1c718bdcf3146c0992538c297e8f6fa4adb603') hunk ./source/games-extra/lbreakout2/FrugalBuild 18 -build() -{ +build() { } From vmiklos at frugalware.org Fri Sep 1 13:09:39 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 13:09:46 2006 Subject: [Frugalware-darcs] frugalware-current: mysql-5.0.24-3-i686 Message-ID: <20060901110941.030CA4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901100635-e2957-610a37085e0541d4935f65b6216053d75eef3134.gz; [mysql-5.0.24-3-i686 VMiklos **20060901100635 revision bump to patchlevel 'a' ] { hunk ./source/apps/mysql/FrugalBuild 1 -# Last Modified: Fri, 25 Aug 2006 03:09:07 +0200 +# Last Modified: Fri, 01 Sep 2006 12:04:09 +0200 hunk ./source/apps/mysql/FrugalBuild 7 -pkgrel=2 -extrapkgver= +pkgrel=3 +extrapkgver=a } From krics at linuxforum.hu Fri Sep 1 13:19:06 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 13:19:19 2006 Subject: [Frugalware-darcs] frugalware-current: f-spot-0.2.0-1-x86_64 Message-ID: <20060901111906.B70D64E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901111757-d209c-ffcdcc4a3c16705bd28f8d944088222f360793b0.gz; [f-spot-0.2.0-1-x86_64 Christian Hamar alias krix **20060901111757 * Version bump * Fixed depends() * Migrated to Finclude mono && gnome-scriptlet && gnome ] { hunk ./source/gnome-extra/f-spot/FrugalBuild 1 -# Last modified: Wed, 21 Jun 2006 16:37:17 +0100 +# Last modified: Fri, 01 Sep 2006 13:12:53 +0200 hunk ./source/gnome-extra/f-spot/FrugalBuild 3 -# Maintainer: Bence Nagy +# Maintainer: Christian Hamar alias krix hunk ./source/gnome-extra/f-spot/FrugalBuild 6 -pkgver=0.1.11 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 hunk ./source/gnome-extra/f-spot/FrugalBuild 10 -depends=('intltool' 'gtk-sharp' 'lcms' 'libexif' 'libgphoto2' 'libjpeg' 'sqlite2' 'dbus-mono') +depends=('gtk2-sharp' 'lcms' 'libexif' \ + 'libgphoto2' 'libjpeg' 'sqlite3' 'dbus-mono' 'gnome-sharp') +makedepends=('gnome-screensaver' 'perl-xml') hunk ./source/gnome-extra/f-spot/FrugalBuild 15 -# install=$pkgname.install -source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.1/f-spot-$pkgver.tar.bz2) -up2date='lynx -dump "http://f-spot.org/Download" | grep "f-spot-.*.tar.bz2" | sed "s/.*f-spot-\(.*\).tar.bz2.*/\1/"' -sha1sums=('984d680a3aecf550c6c9d97f708289d377ba64b0') +_F_gnome_desktop="y" +Finclude gnome mono gnome-scriptlet +sha1sums=('5f02d84ff17a0f0df72e7ed21000cfb5845c4525') hunk ./source/gnome-extra/f-spot/FrugalBuild 20 - export MONO_SHARED_DIR=$Fdestdir/weird - mkdir -p $MONO_SHARED_DIR - + Fmonoexport hunk ./source/gnome-extra/f-spot/FrugalBuild 22 - - rm -rf $MONO_SHARED_DIR + Fmonocleanup + Fbuild_gnome_scriptlet } From vmiklos at frugalware.org Fri Sep 1 13:25:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 13:25:44 2006 Subject: [Frugalware-darcs] pacman: warning fixes on x86_64 Message-ID: <20060901112542.51C6A4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060901112511-e2957-7e1a8ae809f27d81deca858c7a152a78b6dc744d.gz; [warning fixes on x86_64 VMiklos **20060901112511] { hunk ./lib/libalpm/alpm.c 587 - case PM_PKG_SIZE: data = (void *)pkg->size; break; - case PM_PKG_USIZE: data = (void *)pkg->usize; break; - case PM_PKG_REASON: data = (void *)(int)pkg->reason; break; + case PM_PKG_SIZE: data = (void *)(long)pkg->size; break; + case PM_PKG_USIZE: data = (void *)(long)pkg->usize; break; + case PM_PKG_REASON: data = (void *)(long)pkg->reason; break; hunk ./lib/libalpm/alpm.c 601 - case PM_PKG_SCRIPLET: data = (void *)(int)pkg->scriptlet; break; + case PM_PKG_SCRIPLET: data = (void *)(long)pkg->scriptlet; break; hunk ./lib/libalpm/alpm.c 800 - case PM_SYNC_TYPE: data = (void *)(int)sync->type; break; + case PM_SYNC_TYPE: data = (void *)(long)sync->type; break; hunk ./lib/libalpm/alpm.c 833 - case PM_TRANS_TYPE: data = (void *)(int)trans->type; break; - case PM_TRANS_FLAGS: data = (void *)(int)trans->flags; break; + case PM_TRANS_TYPE: data = (void *)(long)trans->type; break; + case PM_TRANS_FLAGS: data = (void *)(long)trans->flags; break; hunk ./lib/libalpm/alpm.c 1014 - case PM_DEP_TARGET: data = (void *)(int)miss->target; break; - case PM_DEP_TYPE: data = (void *)(int)miss->type; break; - case PM_DEP_MOD: data = (void *)(int)miss->depend.mod; break; + case PM_DEP_TARGET: data = (void *)(long)miss->target; break; + case PM_DEP_TYPE: data = (void *)(long)miss->type; break; + case PM_DEP_MOD: data = (void *)(long)miss->depend.mod; break; hunk ./lib/libalpm/alpm.c 1047 - case PM_CONFLICT_TYPE: data = (void *)(int)conflict->type; break; + case PM_CONFLICT_TYPE: data = (void *)(long)conflict->type; break; hunk ./lib/libalpm/util.c 508 - EVENT(trans, PM_TRANS_EVT_SCRIPTLET_DONE, (void*)atoi(_alpm_strtrim(line + strlen(DONESTR))), NULL); + EVENT(trans, PM_TRANS_EVT_SCRIPTLET_DONE, (void*)atol(_alpm_strtrim(line + strlen(DONESTR))), NULL); hunk ./src/pacman/add.c 99 - switch((int)alpm_dep_getinfo(miss, PM_DEP_MOD)) { + switch((long)alpm_dep_getinfo(miss, PM_DEP_MOD)) { hunk ./src/pacman/add.c 119 - switch((int)alpm_conflict_getinfo(conflict, PM_CONFLICT_TYPE)) { + switch((long)alpm_conflict_getinfo(conflict, PM_CONFLICT_TYPE)) { hunk ./src/pacman/deptest.c 111 - switch((int)alpm_dep_getinfo(miss, PM_DEP_MOD)) { + switch((long)alpm_dep_getinfo(miss, PM_DEP_MOD)) { hunk ./src/pacman/package.c 67 - switch((int)alpm_pkg_getinfo(pkg, PM_PKG_REASON)) { + switch((long)alpm_pkg_getinfo(pkg, PM_PKG_REASON)) { hunk ./src/pacman/query.c 231 - && (int)alpm_pkg_getinfo(info, PM_PKG_REASON) == PM_PKG_REASON_DEPEND) { + && (long)alpm_pkg_getinfo(info, PM_PKG_REASON) == PM_PKG_REASON_DEPEND) { hunk ./src/pacman/sync.c 511 - (int)alpm_dep_getinfo(miss, PM_DEP_TYPE) == PM_DEP_TYPE_DEPEND ? _("requires") : _("is required by"), + (long)alpm_dep_getinfo(miss, PM_DEP_TYPE) == PM_DEP_TYPE_DEPEND ? _("requires") : _("is required by"), hunk ./src/pacman/sync.c 513 - switch((int)alpm_dep_getinfo(miss, PM_DEP_MOD)) { + switch((long)alpm_dep_getinfo(miss, PM_DEP_MOD)) { hunk ./src/pacman/sync.c 554 - if(!((unsigned int)alpm_trans_getinfo(PM_TRANS_FLAGS) & PM_TRANS_FLAG_PRINTURIS)) { + if(!((unsigned long)alpm_trans_getinfo(PM_TRANS_FLAGS) & PM_TRANS_FLAG_PRINTURIS)) { hunk ./src/pacman/sync.c 567 - if((int)alpm_sync_getinfo(sync, PM_SYNC_TYPE) == PM_SYNC_TYPE_REPLACE) { + if((long)alpm_sync_getinfo(sync, PM_SYNC_TYPE) == PM_SYNC_TYPE_REPLACE) { hunk ./src/pacman/sync.c 581 - totalsize += (int)alpm_pkg_getinfo(pkg, PM_PKG_SIZE); - totalusize += (int)alpm_pkg_getinfo(pkg, PM_PKG_USIZE); + totalsize += (long)alpm_pkg_getinfo(pkg, PM_PKG_SIZE); + totalusize += (long)alpm_pkg_getinfo(pkg, PM_PKG_USIZE); hunk ./src/pacman/sync.c 647 - switch((int)alpm_conflict_getinfo(conflict, PM_CONFLICT_TYPE)) { + switch((long)alpm_conflict_getinfo(conflict, PM_CONFLICT_TYPE)) { hunk ./src/pacman/trans.c 132 - if(!(int)data1) { + if(!(long)data1) { hunk ./src/pacman/util.h 30 - fprintf(stderr, "malloc failure: could not allocate %d bytes\n", b); \ + fprintf(stderr, "malloc failure: could not allocate %d bytes\n", (int)b); \ } From vmiklos at frugalware.org Fri Sep 1 14:32:52 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 14:32:56 2006 Subject: [Frugalware-darcs] pacman: parseconfig(): register databases asap Message-ID: <20060901123253.098784E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060901123246-e2957-6e77a70cc32af92bf8821659cd84c0378ac4278a.gz; [parseconfig(): register databases asap VMiklos **20060901123246] { hunk ./src/pacman/conf.c 123 + sync->db = alpm_db_register(sync->treename); + if(sync->db == NULL) { + ERR(NL, "could not register database (%s)\n", alpm_strerror(pm_errno)); + return(1); + } hunk ./src/pacman/conf.c 299 - if(!sync->db) { - sync->db = alpm_db_register(sync->treename); - if(sync->db == NULL) { - ERR(NL, "%s\n", alpm_strerror(pm_errno)); - return(1); - } - } } From crazy at frugalware.org Fri Sep 1 14:58:11 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 14:58:13 2006 Subject: [Frugalware-darcs] frugalware-current: libofx-0.8.2-1-i686 Message-ID: <20060901125811.BC23F4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901125401-f6986-fb12f5b523d1ffa234757f3e424ecdd1f45d721f.gz; [libofx-0.8.2-1-i686 crazy **20060901125401 * Version bump * added a small patch to correct libxml++ detection * fixed up depends() * some cleanup ] { addfile ./source/lib-extra/libofx/libxml-plus-plus.patch hunk ./source/lib-extra/libofx/FrugalBuild 1 -# Last Modified: Mon, 07 Aug 2006 16:52:05 +0530 +# Last Modified: Fri, 01 Sep 2006 14:51:01 +0200 hunk ./source/lib-extra/libofx/FrugalBuild 6 -pkgver=0.8.0 +pkgver=0.8.2 hunk ./source/lib-extra/libofx/FrugalBuild 10 -depends=('curl' 'opensp') +depends=('curl' 'opensp' 'libxml++' 'glib2') hunk ./source/lib-extra/libofx/FrugalBuild 13 +options=('scriptlet') hunk ./source/lib-extra/libofx/FrugalBuild 15 -sha1sums=('38c2782ed50bd3dd2e89ec3b7c4f3f3611ea44d2') - -build() { - Fcd - Fsed 'void kp::destructor' 'void destructor' lib/tree.hh - Fbuild -} +source=(${source[@]} libxml-plus-plus.patch) +sha1sums=('f6655d44f52bc30326dc940403f1b1a187256125' \ + '29fa6d94fac45ffbe7916ea5e3d3fee396cafb95') hunk ./source/lib-extra/libofx/libxml-plus-plus.patch 1 +diff -Naur libofx-0.8.2/configure libofx-0.8.2-p/configure +--- libofx-0.8.2/configure 2006-08-25 19:24:30.000000000 +0200 ++++ libofx-0.8.2-p/configure 2006-09-01 14:39:29.218144632 +0200 +@@ -20706,12 +20706,12 @@ + pkg_cv_LIBXMLPP_CFLAGS="$LIBXMLPP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml++-1.0 >= 1.0.1\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libxml++-1.0 >= 1.0.1") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6 >= 1.0.1\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libxml++-2.6 >= 1.0.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBXMLPP_CFLAGS=`$PKG_CONFIG --cflags "libxml++-1.0 >= 1.0.1" 2>/dev/null` ++ pkg_cv_LIBXMLPP_CFLAGS=`$PKG_CONFIG --cflags "libxml++-2.6 >= 1.0.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20724,12 +20724,12 @@ + pkg_cv_LIBXMLPP_LIBS="$LIBXMLPP_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml++-1.0 >= 1.0.1\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libxml++-1.0 >= 1.0.1") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6 >= 1.0.1\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libxml++-2.6 >= 1.0.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBXMLPP_LIBS=`$PKG_CONFIG --libs "libxml++-1.0 >= 1.0.1" 2>/dev/null` ++ pkg_cv_LIBXMLPP_LIBS=`$PKG_CONFIG --libs "libxml++-2.6 >= 1.0.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20748,9 +20748,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBXMLPP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml++-1.0 >= 1.0.1"` ++ LIBXMLPP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml++-2.6 >= 1.0.1"` + else +- LIBXMLPP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml++-1.0 >= 1.0.1"` ++ LIBXMLPP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml++-2.6 >= 1.0.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBXMLPP_PKG_ERRORS" >&5 +diff -Naur libofx-0.8.2/configure.in libofx-0.8.2-p/configure.in +--- libofx-0.8.2/configure.in 2006-08-25 18:50:22.000000000 +0200 ++++ libofx-0.8.2-p/configure.in 2006-09-01 14:36:51.923057120 +0200 +@@ -255,7 +255,7 @@ + AC_MSG_WARN([libcurl is not available. ofxconnect (Direct connect samples) will NOT be built.]) + fi + +-PKG_CHECK_MODULES(LIBXMLPP,libxml++-1.0 >= 1.0.1, ++PKG_CHECK_MODULES(LIBXMLPP,libxml++-2.6 >= 1.0.1, + [ + AC_DEFINE(HAVE_LIBXMLPP, 1, [Defined if libxml++ is available]) + have_libxmlpp=yes], } From vmiklos at frugalware.org Fri Sep 1 15:09:11 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 15:09:13 2006 Subject: [Frugalware-darcs] homepage-ng: typo fix in 0.5rc2 announce Message-ID: <20060901130911.4F9264E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060901130850-e2957-03558f114b0f95e03ede3279ea3339699ac127f9.gz; [typo fix in 0.5rc2 announce VMiklos **20060901130850] { hunk ./frugalware/xml/news.xml 31 - netinstall (21M), - cd1 (632M), - cd2 (641M), - cd3 (643M), - cd4 (640M), - cd5 (599M), - cd6 (630M), - cd7 (627M), - cd8 (417M), - cd9 (638M), - cd10 (128M), - dvd1 (4.2G) - dvd2 (1.2G) + netinstall (21M), + cd1 (632M), + cd2 (641M), + cd3 (643M), + cd4 (640M), + cd5 (599M), + cd6 (630M), + cd7 (627M), + cd8 (417M), + cd9 (638M), + cd10 (128M), + dvd1 (4.2G) + dvd2 (1.2G) } From alex at alex-smith.me.uk Fri Sep 1 15:15:05 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Sep 1 15:15:08 2006 Subject: [Frugalware-darcs] frugalware-current: metacity-2.15.34-2-x86_64 Message-ID: <20060901131505.984914E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901131219-46e39-4eeb557142a8220904561b895090917c62729190.gz; [metacity-2.15.34-2-x86_64 AlexExtreme **20060901131219 * Argh, I forgot Fbuild_gnome_scriptlet >< * Closes #1090 ] { hunk ./source/gnome/metacity/FrugalBuild 1 -# Last modified: Thu, 24 Aug 2006 07:20:37 +0100 +# Last modified: Fri, 01 Sep 2006 14:10:16 +0100 hunk ./source/gnome/metacity/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/gnome/metacity/FrugalBuild 30 + Fbuild_gnome_scriptlet } From vmiklos at frugalware.org Fri Sep 1 15:15:13 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 15:15:15 2006 Subject: [Frugalware-darcs] frugalware-current: pycxx-5.3.5-1-i686 Message-ID: <20060901131513.B86C74E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901131336-e2957-0d2053d42b36df79d5eb5ce936f5c119c65790da.gz; [pycxx-5.3.5-1-i686 VMiklos **20060901131336 new package a dep for pysvn, #1085 ] { adddir ./source/devel-extra/pycxx addfile ./source/devel-extra/pycxx/FrugalBuild hunk ./source/devel-extra/pycxx/FrugalBuild 1 +# Last Modified: Fri, 01 Sep 2006 15:12:45 +0200 +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=pycxx +pkgver=5.3.5 +pkgrel=1 +pkgdesc="A set of classes to help create extensions of Python in the C++ language." +_F_sourceforge_dirname="cxx" +Finclude sourceforge +url="http://cxx.sourceforge.net/" +depends=('python' 'libstdc++') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=3180|grep ']PyCXX V'|sed 's/.*V\([^ ]*\) .*/\1/;q'" +_F_cd_path="${pkgname}_${pkgver//./_}" +source=(${source/pycxx*/$_F_cd_path.tar.gz}) +sha1sums=('d7940fcd127d6603cc863b08cbae67ea3d669f59') } From crazy at frugalware.org Fri Sep 1 15:26:11 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 15:26:14 2006 Subject: [Frugalware-darcs] frugalware-current: kmymoney2-0.8.5-2-i686 Message-ID: <20060901132612.18B664E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901131943-f6986-103fb70921f7e1ffb2b331232a073b0c0deb8399.gz; [kmymoney2-0.8.5-2-i686 crazy **20060901131943 * rebuild with new libofx because this one has the right depends() ] { hunk ./source/kde-extra/kmymoney2/FrugalBuild 1 -# Last Modified: Fri, 01 Sep 2006 04:03:22 +0200 +# Last Modified: Fri, 01 Sep 2006 15:15:46 +0200 hunk ./source/kde-extra/kmymoney2/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/kde-extra/kmymoney2/FrugalBuild 9 -depends=('kdelibs>=3.5.4' 'libofx') +depends=('kdelibs>=3.5.4' 'libofx>=0.8.2') } From vmiklos at frugalware.org Fri Sep 1 15:50:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 15:50:44 2006 Subject: [Frugalware-darcs] frugalware-current: include/python.sh: initial import Message-ID: <20060901135040.CF53C4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901134808-e2957-a4b1eea5e5b38746a35c35440e0372561e3634d8.gz; [include/python.sh: initial import VMiklos **20060901134808] { addfile ./source/include/python.sh hunk ./source/include/python.sh 1 +#!/bin/sh + +# (c) 2006 Miklos Vajna +# python.sh for Frugalware +# distributed under GPL License + +# common variables for python packages + +_F_python_libdir=`python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'` +_F_python_ver=`python -c 'from distutils import sysconfig; print sysconfig.get_python_version()'` } From vmiklos at frugalware.org Fri Sep 1 15:53:15 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 15:53:16 2006 Subject: [Frugalware-darcs] frugalware-current: pysvn-1.4.2-1-i686 Message-ID: <20060901135315.412DF4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901135132-e2957-bd2639b330e6c63d39919b57bd96971e55207866.gz; [pysvn-1.4.2-1-i686 VMiklos **20060901135132 new package ] { adddir ./source/devel-extra/pysvn addfile ./source/devel-extra/pysvn/FrugalBuild hunk ./source/devel-extra/pysvn/FrugalBuild 1 +# Last Modified: Fri, 01 Sep 2006 15:47:35 +0200 +# Compiling Time: 0.10 SBU +# Maintainer: VMiklos + +pkgname=pysvn +pkgver=1.4.2 +pkgid=31570 +pkgrel=1 +pkgdesc="Python bindings for Subversion" +url="http://pysvn.tigris.org/servlets/ProjectDocumentList?folderID=1762" +depends=('subversion') +makedepends=('pycxx') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump $url|Flasttar" +source=(http://pysvn.tigris.org/files/documents/1233/$pkgid/pysvn-$pkgver.tar.gz) +Finclude python + +build() +{ + Fcd + cd Source + python setup.py configure --apr-inc-dir=/usr/include/apr --apr-lib-dir=/usr/lib || return 1 + make || return 1 + Fmkdir $_F_python_libdir/pysvn + Ffilerel pysvn/__init__.py $_F_python_libdir/pysvn/ + Fexerel pysvn/_pysvn.so $_F_python_libdir/pysvn/ +} + +sha1sums=('919572057f3cf5b677ef9f7511c4dafd1c45391c') } From crazy at frugalware.org Fri Sep 1 16:07:24 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 16:07:29 2006 Subject: [Frugalware-darcs] frugalware-current: libofx-0.8.2-1-x86_64 Message-ID: <20060901140724.883EB4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901140057-f6986-07126060e64ee8a2236c3dad76d5c01760637517.gz; [libofx-0.8.2-1-x86_64 crazy **20060901140057 * added x86_64 to archs() ] { hunk ./source/lib-extra/libofx/FrugalBuild 1 -# Last Modified: Fri, 01 Sep 2006 14:51:01 +0200 +# Last Modified: Fri, 01 Sep 2006 15:56:11 +0200 hunk ./source/lib-extra/libofx/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From alex at alex-smith.me.uk Fri Sep 1 16:10:59 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Sep 1 16:11:02 2006 Subject: [Frugalware-darcs] frugalware-current: gtkglext-1.2.0-4-x86_64 Message-ID: <20060901141059.5DC154E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901140432-46e39-60a6c6ca91ce7c69f884ce48a46fedd4fc1d3561.gz; [gtkglext-1.2.0-4-x86_64 AlexExtreme **20060901140432 * Fixed depends broken by a change which *SHOULD* have been checked for afterwards ] { hunk ./source/xlib-extra/gtkglext/FrugalBuild 1 -# Last modified: Sat, 27 May 2006 13:43:30 +0200 +# Last modified: Fri, 01 Sep 2006 15:03:42 +0100 hunk ./source/xlib-extra/gtkglext/FrugalBuild 7 -pkgrel=3 +pkgrel=4 hunk ./source/xlib-extra/gtkglext/FrugalBuild 10 -depends=('opengl' 'freeglut' 'libx11' 'gtk+2') +depends=('libgl' 'freeglut' 'libx11' 'gtk+2>=2.10.1') hunk ./source/xlib-extra/gtkglext/FrugalBuild 19 - -build() { - Fbuild --enable-gtk-doc -} +Fconfopts="$Fconfopts --enable-gtk-doc" } From crazy at frugalware.org Fri Sep 1 16:24:52 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 16:24:55 2006 Subject: [Frugalware-darcs] frugalware-current: scim-bridge-0.4.2-1-i686 Message-ID: <20060901142452.AFCAC4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901142122-f6986-a2a973dca22621986b834561c57b092a0ff634b3.gz; [scim-bridge-0.4.2-1-i686 crazy **20060901142122 * version bump ] { hunk ./source/xapps/scim-bridge/FrugalBuild 1 -# Last Modified: Sun, 27 Aug 2006 14:27:11 +0200 +# Last Modified: Fri, 01 Sep 2006 16:20:12 +0200 hunk ./source/xapps/scim-bridge/FrugalBuild 6 -pkgver=0.4.1 +pkgver=0.4.2 hunk ./source/xapps/scim-bridge/FrugalBuild 19 -sha1sums=('5cf1d738cb2c4f07fbb3b96bcbbe859be4d2267f') +sha1sums=('b0472bb7b7dec27fe2432a87a08d6e155fc2fd22') } From vmiklos at frugalware.org Fri Sep 1 16:44:10 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 16:44:13 2006 Subject: [Frugalware-darcs] setup: glibc: add librt and libpthread Message-ID: <20060901144410.D273B4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=setup;a=darcs_commitdiff;h=20060901144242-e2957-471638038f78acbb1e8cac180263fb8806e28c77.gz; [glibc: add librt and libpthread VMiklos **20060901144242 closes #1091 ] { hunk ./Makefile 231 - cp -a $(BDIR)/lib/{ld*,libc*,libm*,libdl*,libnss*,libresolv*,libutil*,libnsl*} glibc/lib/ + cp -a $(BDIR)/lib/{ld*,libc*,libm*,libdl*,libnss*,libresolv*,libutil*,libnsl*,librt*,libpthread*} glibc/lib/ } From alex at alex-smith.me.uk Fri Sep 1 16:48:03 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Sep 1 16:48:08 2006 Subject: [Frugalware-darcs] frugalware-current: neverball-1.4.0-2-x86_64 Message-ID: <20060901144803.9C3444E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901144608-46e39-03fb6b2fb38253f13bdbc07834f8c6c75859c8a3.gz; [neverball-1.4.0-2-x86_64 AlexExtreme **20060901144608 * Fixed depends * Added x86_64 to archs ] { hunk ./source/games-extra/neverball/FrugalBuild 1 -# Last Modified: Thu, 04 May 2006 17:59:17 +0200 +# Last Modified: Fri, 01 Sep 2006 15:38:55 +0100 hunk ./source/games-extra/neverball/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/games-extra/neverball/FrugalBuild 10 -depends=('sdlimage' 'sdl_ttf' 'sdl_mixer' 'opengl' 'libpng') +depends=('sdlimage' 'sdl_ttf' 'sdl_mixer' 'libgl' 'libpng') hunk ./source/games-extra/neverball/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Sep 1 16:48:10 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 16:48:12 2006 Subject: [Frugalware-darcs] frugalware-current: glibc-2.4-2-i686 Message-ID: <20060901144810.5CE194E88F5@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901144619-e2957-aba867b196e5142d818d250af730dbe460694018.gz; [glibc-2.4-2-i686 VMiklos **20060901144619 glibc-xen not needed on x86_64 ] { hunk ./source/base/glibc/FrugalBuild 27 -if [ "$CARCH" != "ppc" ]; then +if [ "$CARCH" == "i686" ]; then hunk ./source/base/glibc/FrugalBuild 62 - if [ "$CARCH" != "ppc" ]; then + if [ "$CARCH" == "i686" ]; then } From krics at linuxforum.hu Fri Sep 1 17:00:54 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Sep 1 17:00:56 2006 Subject: [Frugalware-darcs] pacman: package-counter / progressbar for removing packages PART I Message-ID: <20060901150054.847A64E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060901150030-d209c-db68a303b7304c63133f1bc69e2fdf51bdfe77df.gz; [package-counter / progressbar for removing packages PART I Christian Hamar alias krix **20060901150030 * Implemented package-counting in remove part (works) * Implementing progressbar at remove part (in progress) ] { hunk ./lib/libalpm/alpm.h 297 - PM_TRANS_PROGRESS_UPGRADE_START + PM_TRANS_PROGRESS_UPGRADE_START, + PM_TRANS_PROGRESS_REMOVE_START hunk ./lib/libalpm/remove.c 152 - char line[PATH_MAX+1]; + char line[PATH_MAX+1], *what; hunk ./lib/libalpm/remove.c 158 + int position = 0; hunk ./lib/libalpm/remove.c 169 + if((what = (char *)malloc(strlen(info->name)+1)) == NULL) { + RET_ERR(PM_ERR_MEMORY, -1); + } + STRNCPY(what, info->name, strlen(info->name)+1); hunk ./lib/libalpm/remove.c 187 + double percent; hunk ./lib/libalpm/remove.c 191 + + if (position != 0) { + percent = position / _alpm_list_count(info->files); + } hunk ./lib/libalpm/remove.c 253 + /* Need at here because we count only real unlinked files ? */ + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, what, (double)(percent * 100), _alpm_list_count(trans->packages), (_alpm_list_count(trans->packages) - _alpm_list_count(targ) +1)); + position++; hunk ./lib/libalpm/remove.c 328 + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, what, 100, _alpm_list_count(trans->packages), (_alpm_list_count(trans->packages) - _alpm_list_count(targ) +1)); + FREE(what); hunk ./src/pacman/remove.c 80 - if(alpm_trans_init(PM_TRANS_TYPE_REMOVE, config->flags, cb_trans_evt, cb_trans_conv, NULL) == -1) { + if(alpm_trans_init(PM_TRANS_TYPE_REMOVE, config->flags, cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) { hunk ./src/pacman/trans.c 94 + if(config->noprogressbar) { hunk ./src/pacman/trans.c 96 + } hunk ./src/pacman/trans.c 99 - MSG(CL, _("done.\n")); + if(config->noprogressbar) { + MSG(CL, _("done.\n")); + } else { + MSG(NL, ""); + } hunk ./src/pacman/trans.c 272 - char *addstr, *upgstr, *ptr; + char *addstr, *upgstr, *removestr, *ptr; hunk ./src/pacman/trans.c 275 + removestr = strdup(_("removing")); hunk ./src/pacman/trans.c 297 + case PM_TRANS_PROGRESS_REMOVE_START: + ptr = removestr; + break; hunk ./src/pacman/trans.c 325 + FREE(removestr); } From vmiklos at frugalware.org Fri Sep 1 17:10:30 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 17:10:32 2006 Subject: [Frugalware-darcs] frugalware-current: kernel-xen0-2.6.16-4-i686 Message-ID: <20060901151030.D6FC24E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901150911-e2957-4a95d05708f30250341d5e33c4b29bb1b3a85236.gz; [kernel-xen0-2.6.16-4-i686 VMiklos **20060901150911 README.Frugalware: added a note about glibc-xen ] { hunk ./source/base-extra/kernel-xen0/README.Frugalware 22 +NOTE: on i686, you need the glibc-xen package instead of the normal glibc! + } From alex at alex-smith.me.uk Fri Sep 1 17:35:12 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Sep 1 17:35:15 2006 Subject: [Frugalware-darcs] frugalware-current: guarddog-2.4.0-2-x86_64 Message-ID: <20060901153512.CDE174E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901153250-46e39-36c689f30c7b2464581f20a706fce9c91ca7c45a.gz; [guarddog-2.4.0-2-x86_64 AlexExtreme **20060901153250 * s/opengl/libgl/ in depends ] { hunk ./source/kde-extra/guarddog/FrugalBuild 1 -# Last Modified: Wed, 12 Apr 2006 10:06:01 +0200 +# Last Modified: Fri, 01 Sep 2006 16:32:05 +0100 hunk ./source/kde-extra/guarddog/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/kde-extra/guarddog/FrugalBuild 10 -depends=('libxi' 'opengl' 'expat' 'libstdc++' 'libdrm' 'libxxf86vm' 'libxmu' 'qt' 'kdelibs') +depends=('libxi' 'libgl' 'expat' 'libstdc++' 'libdrm' 'libxxf86vm' 'libxmu' 'qt' 'kdelibs') hunk ./source/kde-extra/guarddog/FrugalBuild 28 +# optimization OK + } From crazy at frugalware.org Fri Sep 1 18:18:54 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 18:18:56 2006 Subject: [Frugalware-darcs] frugalware-current: ppracer-0.3.1-3-i686 Message-ID: <20060901161854.7BBA24E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901161554-f6986-d9456c1bc5c71d4b97638e34955dfd332ad9e3c7.gz; [ppracer-0.3.1-3-i686 crazy **20060901161554 * fix depends() and a extra qualification error * closes #1093 ] { hunk ./source/games-extra/ppracer/FrugalBuild 1 -# Last modified: Sun, 12 Mar 2006 21:00:49 +0100 +# Last modified: Fri, 01 Sep 2006 18:14:57 +0200 hunk ./source/games-extra/ppracer/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/games-extra/ppracer/FrugalBuild 10 -depends=('mesa' 'opengl' 'sdl_mixer' 'freetype2' 'tcl' 'libpng') +depends=('mesa' 'libgl' 'sdl_mixer' 'freetype2' 'tcl' 'libpng') hunk ./source/games-extra/ppracer/FrugalBuild 13 -source=(http://download.berlios.de/ppracer/ppracer-$pkgver.tar.bz2) +source=(http://download.berlios.de/ppracer/ppracer-$pkgver.tar.bz2 fix-extra-qualification.patch) hunk ./source/games-extra/ppracer/FrugalBuild 15 -sha1sums=('173f1af73856bd768d3cca5c34b1264035820afe') +sha1sums=('173f1af73856bd768d3cca5c34b1264035820afe' \ + '3b45b2765ad5625610957e08cfdfcae4ce210506') hunk ./source/games-extra/ppracer/FrugalBuild 20 +# optimization OK + } From crazy at frugalware.org Fri Sep 1 18:42:25 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 18:42:29 2006 Subject: [Frugalware-darcs] frugalware-current: ppracer-0.3.1-3-i686 Message-ID: <20060901164225.761D64E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901163732-f6986-dfebd48199ab06c813a456ac895fba0b6454af45.gz; [ppracer-0.3.1-3-i686 crazy **20060901163732 * brr forgot the patch ] { addfile ./source/games-extra/ppracer/fix-extra-qualification.patch hunk ./source/games-extra/ppracer/fix-extra-qualification.patch 1 +diff -Naur ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h ppracer-0.3.1-p/src/ppgltk/FT/FTTextureGlyph.h +--- ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h 2005-02-18 11:16:04.000000000 +0100 ++++ ppracer-0.3.1-p/src/ppgltk/FT/FTTextureGlyph.h 2006-09-01 18:09:32.817106352 +0200 +@@ -52,7 +52,7 @@ + * Reset the currently active texture to zero to get into a known state before + * drawing a string. This is to get round possible threading issues. + */ +- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;} ++ static void ResetActiveTexture(){ activeTextureID = 0;} + + private: + /** } From vmiklos at frugalware.org Fri Sep 1 18:45:29 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 18:45:31 2006 Subject: [Frugalware-darcs] pacman: _alpm_remove_commit(): casting fix Message-ID: <20060901164529.A9A8A4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060901164455-e2957-21826ce0f058fa6f9401dc629bef083fffb2b839.gz; [_alpm_remove_commit(): casting fix VMiklos **20060901164455 typo fix in the progressbar code, till now it didn't work at all NOTE: it is still slow as hell: removing kernel-source now increased from 0m18.685s to 1m6.502s ] { hunk ./lib/libalpm/remove.c 193 - percent = position / _alpm_list_count(info->files); + percent = (double)position / _alpm_list_count(info->files); } From vmiklos at frugalware.org Fri Sep 1 19:07:29 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 19:07:31 2006 Subject: [Frugalware-darcs] pacman: _alpm_remove_commit(): some code optimization Message-ID: <20060901170729.EF4864E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060901170642-e2957-c7e75bef9b86fa5045067511e45e41bc6b7b787b.gz; [_alpm_remove_commit(): some code optimization VMiklos **20060901170642 now the new code is almost as fast as the original one was ] { hunk ./lib/libalpm/remove.c 182 + int filenum = _alpm_list_count(info->files); hunk ./lib/libalpm/remove.c 194 - percent = (double)position / _alpm_list_count(info->files); + percent = (double)position / filenum; } From vmiklos at frugalware.org Fri Sep 1 19:28:37 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 19:28:40 2006 Subject: [Frugalware-darcs] frugalware-current: vim-7.0-2-i686 Message-ID: <20060901172837.DF5524E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901172720-e2957-3c3539b561b6858f198f0375e5712933ecb6494e.gz; [vim-7.0-2-i686 VMiklos **20060901172720 rebuilt with --enable-multibyte ] { hunk ./source/base/vim/FrugalBuild 1 -# Last Modified: Mon, 08 May 2006 20:06:31 +0200 +# Last Modified: Fri, 01 Sep 2006 19:14:10 +0200 hunk ./source/base/vim/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/base/vim/FrugalBuild 27 - --enable-gui=no + --enable-gui=no --enable-multibyte } From alex at alex-smith.me.uk Fri Sep 1 19:31:50 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Sep 1 19:31:52 2006 Subject: [Frugalware-darcs] frugalware-current: knoda-0.8.1-2-x86_64 Message-ID: <20060901173151.0A95F4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901173007-46e39-8cd22ff9e2e9c4918b37bc61745b474aec88bd4a.gz; [knoda-0.8.1-2-x86_64 AlexExtreme **20060901173007 * s/opengl/libgl/ in depends ] { hunk ./source/kde-extra/knoda/FrugalBuild 1 -# Last Modified: Tue, 11 Jul 2006 20:38:06 +0200 +# Last Modified: Fri, 01 Sep 2006 17:34:14 +0100 hunk ./source/kde-extra/knoda/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/kde-extra/knoda/FrugalBuild 16 -depends=('file' 'libxi' 'opengl' 'libstdc++' 'libdrm' 'libxxf86vm' 'libxmu' \ +depends=('file' 'libxi' 'libgl' 'libstdc++' 'libdrm' 'libxxf86vm' 'libxmu' \ } From vmiklos at frugalware.org Fri Sep 1 19:51:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 19:51:46 2006 Subject: [Frugalware-darcs] frugalware-current: gvim-7.0-3-i686 Message-ID: <20060901175142.89F664E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901174843-e2957-22c25583d9dc045002b374f4d2fd84c2efd67c5f.gz; [gvim-7.0-3-i686 VMiklos **20060901174843 rebuilt with --enable-multibyte ] { hunk ./source/xapps/gvim/FrugalBuild 1 -# Last Modified: Fri, 02 Jun 2006 15:58:10 +0100 +# Last Modified: Fri, 01 Sep 2006 19:45:19 +0200 hunk ./source/xapps/gvim/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/xapps/gvim/FrugalBuild 24 - Fmake --with-x --enable-gui=gtk2 + Fmake --with-x --enable-gui=gtk2 --enable-multibyte } From alex at alex-smith.me.uk Fri Sep 1 19:53:42 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Sep 1 19:53:45 2006 Subject: [Frugalware-darcs] frugalware-current: krename-3.0.12-2-x86_64 Message-ID: <20060901175342.946474E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901175141-46e39-6740fa050c4d0586389038c682784d1c99591ced.gz; [krename-3.0.12-2-x86_64 AlexExtreme **20060901175141 * s/opengl/libgl/ in depends (why on earth does this need libgl anyway??) ] { hunk ./source/kde-extra/krename/FrugalBuild 1 -# Last modified: Mon, 21 Aug 2006 11:43:41 +0200 +# Last modified: Fri, 01 Sep 2006 18:50:43 +0100 hunk ./source/kde-extra/krename/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/kde-extra/krename/FrugalBuild 11 -depends=('libxi' 'opengl' 'libstdc++' 'libxmu' 'kdelibs') +depends=('libxi' 'libgl' 'libstdc++' 'libxmu' 'kdelibs') } From alex at alex-smith.me.uk Fri Sep 1 20:01:41 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Sep 1 20:01:42 2006 Subject: [Frugalware-darcs] frugalware-current: lib3ds-1.2.0-2-x86_64 Message-ID: <20060901180141.BC77F4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901180010-46e39-ab21ecbeae1b3643a53fc48bb253aebe2f476601.gz; [lib3ds-1.2.0-2-x86_64 AlexExtreme **20060901180010 * s/opengl/libgl/ in depends ] { hunk ./source/lib-extra/lib3ds/FrugalBuild 1 -# Last Modified: Sun, 04 Jun 2006 21:37:08 +0200 +# Last Modified: Fri, 01 Sep 2006 19:00:03 +0100 hunk ./source/lib-extra/lib3ds/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/lib-extra/lib3ds/FrugalBuild 9 -depends=('freeglut' 'opengl') +depends=('freeglut' 'libgl') } From crazy at frugalware.org Fri Sep 1 20:06:35 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 20:06:37 2006 Subject: [Frugalware-darcs] frugalware-current: mono-1.1.17.1-1-i686 Message-ID: <20060901180636.1C6644E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901180401-f6986-4fb7189d30196ff974a3af92f85eb84ab6549b4d.gz; [mono-1.1.17.1-1-i686 crazy **20060901180401 * Version bump ] { hunk ./source/devel/mono/FrugalBuild 1 -# Last modified: Tue, 29 Aug 2006 03:32:33 +0200 +# Last modified: Fri, 01 Sep 2006 20:00:13 +0200 hunk ./source/devel/mono/FrugalBuild 6 -pkgver=1.1.17 +pkgver=1.1.17.1 hunk ./source/devel/mono/FrugalBuild 17 -sha1sums=('57beaf44bdeb748e81f60e5191f76f9f6ac606bb' \ +sha1sums=('970487ecb21e9b90255e0c7a420479f1cbd31d72' \ hunk ./source/devel/mono/FrugalBuild 20 - hunk ./source/devel/mono/mono.install 5 - if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then + if [ -x /usr/sbin/chkconfig ]; then hunk ./source/devel/mono/mono.install 16 - if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then + if [ -x /usr/sbin/chkconfig ]; then } From alex at alex-smith.me.uk Fri Sep 1 20:26:05 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Sep 1 20:26:08 2006 Subject: [Frugalware-darcs] frugalware-current: mesa-6.5-2-x86_64 Message-ID: <20060901182605.9B68C4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901182250-46e39-9694548072ded56b5ab16919760d872bf69e46ca.gz; [mesa-6.5-2-x86_64 AlexExtreme **20060901182250 * Changed opengl depend in main package to libgl * libgl no longer provides opengl ] { hunk ./source/x11/mesa/FrugalBuild 1 -# Last Modified: Tue, 23 May 2006 16:26:45 +0200 +# Last Modified: Fri, 01 Sep 2006 19:15:19 +0100 hunk ./source/x11/mesa/FrugalBuild 9 -pkgrel=1 +pkgrel=2 hunk ./source/x11/mesa/FrugalBuild 12 -# opengl: provided by mesa_gl, fglrx and nvidia packages -depends=('expat' 'libx11' 'libxext' 'libxxf86vm' 'libxi' 'libxmu' 'libice' 'libdrm' 'opengl') +# libgl: provided by libgl, fglrx and nvidia packages +depends=('expat' 'libx11' 'libxext' 'libxxf86vm' 'libxi' 'libxmu' 'libice' 'libdrm' 'libgl') hunk ./source/x11/mesa/FrugalBuild 29 -subprovides=('opengl') } From crazy at frugalware.org Fri Sep 1 21:31:53 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 21:31:56 2006 Subject: [Frugalware-darcs] crazy: gambas2-1.9.41-1-i686 Message-ID: <20060901193153.8BC414E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=crazy;a=darcs_commitdiff;h=20060901192809-f6986-456ae3a1990686b348ef9080bb204fe1fc1c8fb5.gz; [gambas2-1.9.41-1-i686 crazy **20060901192809 * removed all comments about the broken stuff * added 'make .... bindir=$Fdestdir/usr/bin' ( I've poked upstream about and wait for a answer now ) * removed nofakeroot option and hacks ] { hunk ./source-testing/gambas2/FrugalBuild 21 -options=('scriptlet' 'nodocs' 'nofakeroot') ## brr I try copy the stuff to /usr/bin befor make install :S +options=('scriptlet' 'nodocs') hunk ./source-testing/gambas2/FrugalBuild 47 +## FIXME: *depends() , split all components .. hunk ./source-testing/gambas2/FrugalBuild 53 - Fmessage "WARNING: this package is ONLY to 70% done not all *-gb-* are split now and *depends need some work as well." - ./reconf || Fdie - ## --prefix=$Fdestdir/usr/bin - Fconf -C --disable-corba \ + Fconf -C \ + --disable-corba \ hunk ./source-testing/gambas2/FrugalBuild 65 - Fmessage "DEBUG: Running make..." - make CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing -Wno-deprecated" || Fdie + Fmessage "Running make..." + make CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing -Wno-deprecated" bindir=$Fdestdir/usr/bin || Fdie hunk ./source-testing/gambas2/FrugalBuild 68 - ## make install only WORK if: - ## 1) you already have gambas2* installed - ## 2) you add --prefix=$Fdestdir/usr/bin ( but this can't really work once the package is installed in /usr/bin or ? ) - ## 3) you build NORMAL ( which we don't want | can for packages) - ## 4) you build a broken package then add that broken runtime|devel package as - ## makedepends() to the new one which is IMHO weird - ## so "make DESTDIR= | prefix= install " is BROKEN - ## The problem is IMHO this -DGABMAS_PATH=/usr/bin flag got add in some 1.9.3* ( can remember now and to lazy to search :D ) - ## Is is OK for a program is just build ( make ; make install ) BUT this one *IS* needed on 'make install' - ## to compile the other stuff so *won't work* because its PATH is /usr/bin/* not whatever the prefix | DESTDIR is - ## and whatever your try to 'symlink| fake runtime symlink to $DESTDIR *won't* work' because the program PATH is /usr/bin - ## and at this POINT isn't there so all you get is broken stuff :/ - ## well 'go and ping upstream :-)' - ## THIS HACK does NOT work ( maybe I need symlink to /usr/bin ? but this is *really crazy* ) hunk ./source-testing/gambas2/FrugalBuild 70 - Fmessage "DEBUG: Installing to $Fdestdir..." + Fmessage "Installing to $Fdestdir..." hunk ./source-testing/gambas2/FrugalBuild 122 - ## gbr2 need be runtime ? *ML } From crazy at frugalware.org Fri Sep 1 21:45:51 2006 From: crazy at frugalware.org (crazy) Date: Fri Sep 1 21:45:57 2006 Subject: [Frugalware-darcs] frugalware-current: fltk2-r5385-1-i686 Message-ID: <20060901194552.02B5F4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901194250-f6986-03c40749663c97a5e68de0d538985a319cf92a63.gz; [fltk2-r5385-1-i686 crazy **20060901194250 * Version bump ] { hunk ./source/xlib/fltk2/FrugalBuild 1 -# Last modified: Tue, 08 Aug 2006 23:03:34 +0200 +# Last modified: Fri, 01 Sep 2006 21:42:13 +0200 hunk ./source/xlib/fltk2/FrugalBuild 6 -pkgver=r5274 +pkgver=r5385 hunk ./source/xlib/fltk2/FrugalBuild 19 -sha1sums=('0984d04ad545d9f60ac1775ce2f5243eb8f9c61a' \ +sha1sums=('e15dc40c65f03d4dcf709201da5d9100114dfb4a' \ hunk ./source/xlib/fltk2/FrugalBuild 23 + } From vmiklos at frugalware.org Fri Sep 1 21:55:07 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Sep 1 21:55:09 2006 Subject: [Frugalware-darcs] frugalware-current: simgear-0.3.10-2-i686 Message-ID: <20060901195507.548244F04E3@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901195054-e2957-8d88b8ee738f46db7d585b5fdaa1310245cf5502.gz; [simgear-0.3.10-2-i686 VMiklos **20060901195054 rebuilt with freealut ] { hunk ./source/xlib-extra/simgear/FrugalBuild 1 -# Last Modified: Thu, 06 Apr 2006 23:34:00 +0200 +# Last Modified: Fri, 01 Sep 2006 21:49:31 +0200 hunk ./source/xlib-extra/simgear/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xlib-extra/simgear/FrugalBuild 11 -makedepends=('openal' 'plib' 'mesa') +makedepends=('openal' 'freealut' 'plib' 'mesa') hunk ./source/xlib-extra/simgear/FrugalBuild 28 +# optimization OK + } From vmiklos at frugalware.org Sat Sep 2 15:18:14 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 15:18:17 2006 Subject: [Frugalware-darcs] frugalware-current: flightgear-0.9.10-2-i686 Message-ID: <20060902131814.EE9544E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901224018-e2957-8dd58b7b031178d3d3e998d1a1411ba59ec46804.gz; [flightgear-0.9.10-2-i686 VMiklos **20060901224018 rebuilt with freealut ] { hunk ./source/games-extra/flightgear/FrugalBuild 1 -# Last Modified: Sun, 09 Apr 2006 14:41:07 +0200 +# Last Modified: Sat, 02 Sep 2006 00:24:23 +0200 hunk ./source/games-extra/flightgear/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/games-extra/flightgear/FrugalBuild 10 -depends=('zlib' 'libx11' 'libxt' 'openal' 'freeglut' 'fgfs-base' 'plib') +depends=('libgl' 'zlib' 'freealut' 'freeglut' 'fgfs-base' 'plib') hunk ./source/games-extra/flightgear/FrugalBuild 25 -# optimalization ok +# optimization ok } From krics at linuxforum.hu Sat Sep 2 15:50:01 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 15:50:08 2006 Subject: [Frugalware-darcs] frugalware-current: libgcrypt-1.2.3-1-x86_64 Message-ID: <20060902135001.E0A964E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902134930-d209c-3d9852b9fec13697217b96e466827184c9f2f1b5.gz; [libgcrypt-1.2.3-1-x86_64 Christian Hamar alias krix **20060902134930 * Version bump ] { hunk ./source/lib/libgcrypt/FrugalBuild 1 -# Last Modified: Thu, 06 Oct 2005 17:22:18 +0200 +# Last Modified: Sat, 02 Sep 2006 15:47:04 +0200 hunk ./source/lib/libgcrypt/FrugalBuild 7 -pkgver=1.2.2 +pkgver=1.2.3 hunk ./source/lib/libgcrypt/FrugalBuild 16 -sha1sums=('fc61709a9719a239cf8ebbf19b84f99622655dda') +sha1sums=('a9efab77c764a57ac13e11cf89396f945d0da85d') } From vmiklos at frugalware.org Sat Sep 2 15:53:13 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 15:53:15 2006 Subject: [Frugalware-darcs] pacman: libalpm: fix copyright notices in header files Message-ID: <20060902135313.D351D4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060902011544-e2957-9650bdb25cabd70ddc8ea5079ca33e050b2b926a.gz; [libalpm: fix copyright notices in header files VMiklos **20060902011544] { hunk ./lib/libalpm/add.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/alpm.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/backup.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/cache.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/conflict.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/db.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/deps.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/error.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/group.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/list.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/log.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/package.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by David Kimpe + * Copyright (c) 2005, 2006 by Christian Hamar + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/provide.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/remove.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/server.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/sync.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/trans.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/util.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2006 by David Kimpe + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/versioncmp.h 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./scripts/copyright.py 90 -for i in ["scripts"]: +for i in ["lib/libalpm"]: hunk ./scripts/copyright.py 93 - print "==> %s/%s:" % (root, file) - gencopy("%s/%s" % (root, file)) + if file[-2:] == ".h": + print "==> %s/%s:" % (root, file) + gencopy("%s/%s" % (root, file)) } From vmiklos at frugalware.org Sat Sep 2 15:53:14 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 15:53:17 2006 Subject: [Frugalware-darcs] pacman: scripts: fix copyright notices in source files Message-ID: <20060902135314.40C554E88E2@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060902001605-e2957-03b631ea3474a53a8008c72c921d8cb09786df26.gz; [scripts: fix copyright notices in source files VMiklos **20060902001605] { hunk ./scripts/copyright.py 3 +""" +copyright.py + +Copyright (c) 2006 by Miklos Vajna + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +USA. +""" + hunk ./scripts/copyright.py 90 -for i in ["lib/libalpm", "scripts", "src"]: +for i in ["scripts"]: hunk ./scripts/copyright.py 93 - if file[-2:] == ".c": - print "==> %s/%s:" % (root, file) - gencopy("%s/%s" % (root, file)) + print "==> %s/%s:" % (root, file) + gencopy("%s/%s" % (root, file)) hunk ./scripts/gensync 5 -# Copyright (c) 2002-2006 by Judd Vinet -# Copyright (c) 2005-2006 by Miklos Vajna +# Copyright (c) 2005 by Aurelien Foret +# Copyright (c) 2005 by Judd Vinet +# Copyright (c) 2005 by Christian Hamar +# Copyright (c) 2005, 2006 by Miklos Vajna hunk ./scripts/makepkg 5 -# Copyright (c) 2002-2006 by Judd Vinet -# Copyright (c) 2005-2006 by Miklos Vajna +# Copyright (c) 2005 by Aurelien Foret +# Copyright (c) 2005 by Judd Vinet +# Copyright (c) 2005 by Christian Hamar +# Copyright (c) 2006 by Alex Smith +# Copyright (c) 2006 by Andras Voroskoi +# Copyright (c) 2005, 2006 by Miklos Vajna hunk ./scripts/makeworld 5 -# Copyright (c) 2002-2006 by Judd Vinet +# Copyright (c) 2005 by Judd Vinet +# Copyright (c) 2006 by Alex Smith +# Copyright (c) 2005, 2006 by Miklos Vajna hunk ./scripts/pacman-optimize 5 -# Copyright (c) 2002-2006 by Judd Vinet +# Copyright (c) 2005 by Judd Vinet +# Copyright (c) 2006 by Miklos Vajna hunk ./scripts/updatesync 5 -# Copyright (c) 2004 by Jason Chu -# Derived from gensync (c) 2002-2006 Judd Vinet +# Copyright (c) 2005 by Aurelien Foret +# Copyright (c) 2005 by Judd Vinet +# Copyright (c) 2005 by Christian Hamar +# Copyright (c) 2005, 2006 by Miklos Vajna } From vmiklos at frugalware.org Sat Sep 2 15:53:14 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 15:53:18 2006 Subject: [Frugalware-darcs] pacman: libalpm: fix copyright notices in source files Message-ID: <20060902135314.D508E4E88E2@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060902000611-e2957-cc577621d125d21b7e92aef7737e210b10076a74.gz; [libalpm: fix copyright notices in source files VMiklos **20060902000611 TODO: header files ] { hunk ./lib/libalpm/add.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2006 by David Kimpe + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/alpm.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/backup.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/be_files.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2006 by Christian Hamar + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/cache.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/conflict.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2006 by David Kimpe + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/db.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2006 by David Kimpe + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/deps.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/error.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/group.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/handle.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/list.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/log.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/package.c 3 - * - * Copyright (c) 2002-2006 by Judd Vinet + * + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005, 2006 by Christian Hamar + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/provide.c 3 - * - * Copyright (c) 2002-2006 by Judd Vinet + * + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/remove.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2006 by David Kimpe + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/server.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2006 by Miklos Vajna hunk ./lib/libalpm/sync.c 4 - * Copyright (c) 2002-2006 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/trans.c 3 - * - * Copyright (c) 2002-2006 by Judd Vinet + * + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/util.c 3 - * - * Copyright (c) 2002-2006 by Judd Vinet + * + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005 by Christian Hamar + * Copyright (c) 2006 by David Kimpe + * Copyright (c) 2005, 2006 by Miklos Vajna hunk ./lib/libalpm/versioncmp.c 3 - * - * Copyright (c) 2002-2006 by Judd Vinet + * + * Copyright (c) 2005 by Judd Vinet + * Copyright (c) 2005 by Aurelien Foret + * Copyright (c) 2005, 2006 by Miklos Vajna } From vmiklos at frugalware.org Sat Sep 2 15:53:16 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 15:53:20 2006 Subject: [Frugalware-darcs] pacman: _alpm_downloadfiles_forreal(): move a printf() to the frontend Message-ID: <20060902135317.162DF4E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060902005029-e2957-b1109c7db2eb8f7283a9baa1a4904cf8fb26348d.gz; [_alpm_downloadfiles_forreal(): move a printf() to the frontend VMiklos **20060902005029] { hunk ./lib/libalpm/server.c 475 - printf("\n"); - fflush(stdout); hunk ./src/pacman/download.c 59 + static int lastpct=0; hunk ./src/pacman/download.c 139 + if(lastpct != 100 && pct == 100) { + printf("\n"); + } hunk ./src/pacman/download.c 143 + lastpct = pct; } From vmiklos at frugalware.org Sat Sep 2 15:53:19 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 15:53:22 2006 Subject: [Frugalware-darcs] pacman: scripts/copyright.py: initial import Message-ID: <20060902135319.35DE84E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060902000931-e2957-47a235aeda3b822f3a8f144ed050c1a25bf0e5eb.gz; [scripts/copyright.py: initial import VMiklos **20060902000931] { addfile ./scripts/copyright.py hunk ./scripts/copyright.py 1 +#!/usr/bin/env python + +import os, sys + +class author: + def __init__(self): + self.name = "" + self.years = [] + +class authors: + def __init__(self): + self.authors = [] + # aliases list generated by DARCS_DONT_ESCAPE_ANYTHING="1" dr chan|grep '^[A-Z]'|sed 's/.* //'|sort -u + self.aliases = { + "alex_extreme ":"Alex Smith ", + "aurelien":"Aurelien Foret ", + "BMH1980 ":"Marcus Habermehl ", + "Christian Hamar alias krix ":"Christian Hamar ", + "DNAku ":"David Kimpe ", + "judd":"Judd Vinet ", + "VMiklos ":"Miklos Vajna ", + "voroskoi ":"Andras Voroskoi " + } + def add(self, name, year): + if name == "anonymous": + # lol @ cvs + return + found = False + for i in self.authors: + if i.name == name: + found = True + if year not in i.years: + i.years.append(year) + if not found: + i = author() + i.name = name + i.years.append(year) + self.authors.append(i) + def dump(self): + self.authors.reverse() + for i in self.authors: + sys.stdout.write("Copyright (c) ") + i.years.reverse() + for j in i.years: + if j != i.years[-1]: + sys.stdout.write("%s, " % j) + else: + sys.stdout.write("%s" % j) + sys.stdout.write(" by ") + if i.name in self.aliases.keys(): + i.name = self.aliases[i.name] + sys.stdout.write("%s\n" % i.name) + +def gencopy(fn): + names = authors() + socket = os.popen("darcs chan %s" % fn, "r") + # skip the first 2 lines + for i in range(2): + socket.readline() + while True: + line = socket.readline() + if not line: + break + if line[:1].isupper(): + names.add(line.split(" ")[-1].strip(), line.split(" ")[-2].split(" ")[-1]) + socket.close() + names.dump() + +for i in ["lib/libalpm", "scripts", "src"]: + for root, dirs, files in os.walk(i): + for file in files: + if file[-2:] == ".c": + print "==> %s/%s:" % (root, file) + gencopy("%s/%s" % (root, file)) } From vmiklos at frugalware.org Sat Sep 2 16:01:20 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 16:01:26 2006 Subject: [Frugalware-darcs] pacman: doc/FrugalBuild: fix title Message-ID: <20060902140121.900F44E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060902140057-e2957-67150dc43379b62302b50f488f74b64c13559d8f.gz; [doc/FrugalBuild: fix title VMiklos **20060902140057 closes #1095 ] { hunk ./doc/FrugalBuild.8 1 -.TH makepkg 8 "June 13, 2006" "Frugalware Developer Manual" "" +.TH FrugalBuild 8 "June 13, 2006" "Frugalware Developer Manual" "" } From krics at linuxforum.hu Sat Sep 2 16:08:00 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 16:08:03 2006 Subject: [Frugalware-darcs] frugalware-current: libksba-1.0.0-1-x86_64 Message-ID: <20060902140800.C1BB84E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902140722-d209c-d082127ff7b4111f3b41ab0ad8c0e66a40a778b3.gz; [libksba-1.0.0-1-x86_64 Christian Hamar alias krix **20060902140722 * Version bump * Fixed source URI ] { hunk ./source/lib/libksba/FrugalBuild 1 -# Last Modified: Thu, 03 Aug 2006 23:41:35 +0200 +# Last Modified: Sat, 02 Sep 2006 15:58:09 +0200 hunk ./source/lib/libksba/FrugalBuild 6 -pkgver=0.9.16 +pkgver=1.0.0 hunk ./source/lib/libksba/FrugalBuild 16 -source=(ftp://gd.tuwien.ac.at/privacy/gnupg/alpha/libksba/$pkgname-$pkgver.tar.bz2) -sha1sums=('ab24c72d943b3aa7d52d36d35b64399dee3c0c24') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('aefe3f5c7f8d1faedc9497df09123c90a789ffe1') } From alex at alex-smith.me.uk Sat Sep 2 16:10:22 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sat Sep 2 16:10:24 2006 Subject: [Frugalware-darcs] frugalware-current: bbconf-1.10-2-x86_64 Message-ID: <20060902141022.F23774E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902150854-46e39-81e08f6dafbe142ca6988ff9328803f65af6f0e8.gz; [bbconf-1.10-2-x86_64 AlexExtreme **20060902150854 * Changed maintainer to me * Fixed opengl depend ] { hunk ./source/xapps-extra/bbconf/FrugalBuild 1 -# Last Modified: Thu, 06 Apr 2006 13:40:30 +0200 +# Last Modified: Sat, 02 Sep 2006 15:48:23 +0100 hunk ./source/xapps-extra/bbconf/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: AlexExtreme hunk ./source/xapps-extra/bbconf/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xapps-extra/bbconf/FrugalBuild 9 -license="GPL2" hunk ./source/xapps-extra/bbconf/FrugalBuild 15 -depends=('libxi' 'opengl' 'expat' 'libdrm' 'libxxf86vm' 'qt' 'libxmu') +depends=('libxi' 'libgl' 'expat' 'libdrm' 'libxxf86vm' 'qt' 'libxmu') hunk ./source/xapps-extra/bbconf/FrugalBuild 33 -# vim: ft=sh - -# optimalization OK - } From alex at alex-smith.me.uk Sat Sep 2 16:23:25 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sat Sep 2 16:23:27 2006 Subject: [Frugalware-darcs] frugalware-current: boombox-0.3.1-2-x86_64 Message-ID: <20060902142325.655E24E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902152208-46e39-999c17d064971de5e4e196870754772a9f2714d0.gz; [boombox-0.3.1-2-x86_64 AlexExtreme **20060902152208 * Fixed opengl depend ] { hunk ./source/xapps-extra/boombox/FrugalBuild 1 -# Last Modified: Mon, 10 Jul 2006 20:11:34 +0200 +# Last Modified: Sat, 02 Sep 2006 16:20:59 +0100 hunk ./source/xapps-extra/boombox/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xapps-extra/boombox/FrugalBuild 10 -depends=('libxi' 'opengl' 'qt' 'taglib' 'libxmu' 'xine-lib' 'sqlite3') +depends=('libxi' 'libgl' 'qt' 'taglib' 'libxmu' 'xine-lib' 'sqlite3') } From alex at alex-smith.me.uk Sat Sep 2 16:32:16 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sat Sep 2 16:32:17 2006 Subject: [Frugalware-darcs] frugalware-current: dosbox-0.65-2-x86_64 Message-ID: <20060902143216.29D324E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902153053-46e39-5014538399a94badacc08001912d76a74d7fbfa0.gz; [dosbox-0.65-2-x86_64 AlexExtreme **20060902153053 * Fixed opengl depend ] { hunk ./source/xapps-extra/dosbox/FrugalBuild 1 -# Last Modified: Tue, 02 May 2006 21:35:11 +0200 +# Last Modified: Sat, 02 Sep 2006 16:28:59 +0100 hunk ./source/xapps-extra/dosbox/FrugalBuild 4 -# Contributor: Laszlo Dvornik hunk ./source/xapps-extra/dosbox/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xapps-extra/dosbox/FrugalBuild 10 -depends=('sdl_net' 'opengl' 'sdl_sound' 'libdrm' 'libxxf86vm' 'libpng') +depends=('sdl_net' 'libgl' 'sdl_sound' 'libdrm' 'libxxf86vm' 'libpng') } From vmiklos at frugalware.org Sat Sep 2 16:42:38 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 16:42:41 2006 Subject: [Frugalware-darcs] frugalware-current: torcs-1.2.4-4-i686 Message-ID: <20060902144238.4C0554E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902144044-e2957-04c062870e478e77fe483f86212e50e82fd994a7.gz; [torcs-1.2.4-4-i686 VMiklos **20060902144044 rebuilt with freealut and gcc-4.1 ] { hunk ./source/games-extra/torcs/FrugalBuild 1 -# Last modified: Fri, 17 Mar 2006 01:02:44 +0100 +# Last modified: Sat, 02 Sep 2006 16:21:46 +0200 hunk ./source/games-extra/torcs/FrugalBuild 8 -pkgrel=3 +pkgrel=4 hunk ./source/games-extra/torcs/FrugalBuild 10 -depends=('mesa' 'plib' 'libpng' 'freeglut' 'libxrandr' 'openal') +depends=('mesa' 'plib' 'libpng' 'freeglut' 'libxrandr' 'openal' 'freealut') hunk ./source/games-extra/torcs/FrugalBuild 16 -source=(${source[@]} $pkgname-$pkgver-xorg7.diff) +source=(${source[@]} $pkgname-$pkgver-{xorg7,gcc41}.diff) hunk ./source/games-extra/torcs/FrugalBuild 18 - '9a5fbf1767913efd4cd828afa661b2fe689ebf74') + '9a5fbf1767913efd4cd828afa661b2fe689ebf74' \ + 'd79f06f290f4e09dc16b162f8798e90f6a1d3c09') hunk ./source/games-extra/torcs/FrugalBuild 30 -# optimalization ok +# optimization OK addfile ./source/games-extra/torcs/torcs-1.2.4-gcc41.diff hunk ./source/games-extra/torcs/torcs-1.2.4-gcc41.diff 1 +--- torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h.orig 2006-09-02 15:49:18.000000000 +0200 ++++ torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h 2006-09-02 15:49:32.000000000 +0200 +@@ -78,7 +78,7 @@ + + void update(tSituation *s, float Fps); + +- void cGrScreen::camDraw(tSituation *s); ++ void camDraw(tSituation *s); + + void updateCurrent(tSituation *s); + } From krics at linuxforum.hu Sat Sep 2 16:51:16 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 16:51:19 2006 Subject: [Frugalware-darcs] frugalware-current: libbonoboui-2.15.1-1-x86_64 Message-ID: <20060902145116.420954E88E2@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902145106-d209c-48a11596415f35d44ec290bcab9de488e9daa4ba.gz; [libbonoboui-2.15.1-1-x86_64 Christian Hamar alias krix **20060902145106 * Version bump ] { hunk ./source/gnome/libbonoboui/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 10:55:57 +0100 +# Last modified: Sat, 02 Sep 2006 16:31:23 +0200 hunk ./source/gnome/libbonoboui/FrugalBuild 6 -pkgver=2.15.0 -pkgrel=2 +pkgver=2.15.1 +pkgrel=1 hunk ./source/gnome/libbonoboui/FrugalBuild 16 -sha1sums=('cc744821f6ffdb9b3b61f143872369a4c63a269c') - -build() { - Fbuild --enable-gtk-doc -} - +sha1sums=('95379c906dc09a40e48ff159dacac5f4f1fd0ceb') +Fconfopts="$Fconfopts --enable-gtk-doc" } From alex at alex-smith.me.uk Sat Sep 2 16:54:38 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sat Sep 2 16:54:39 2006 Subject: [Frugalware-darcs] frugalware-current: qjackctl-0.2.20-3-x86_64 Message-ID: <20060902145438.6DBB14E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902155302-46e39-f84c504d03ab26c05b48d635f48e753d1b8c6d93.gz; [qjackctl-0.2.20-3-x86_64 AlexExtreme **20060902155302 * Fixed opengl depend ] { hunk ./source/xapps-extra/qjackctl/FrugalBuild 1 -# Last Modified: Sun, 12 Mar 2006 21:07:35 +0100 +# Last Modified: Sat, 02 Sep 2006 16:45:57 +0100 hunk ./source/xapps-extra/qjackctl/FrugalBuild 8 -pkgrel=2 +pkgrel=3 hunk ./source/xapps-extra/qjackctl/FrugalBuild 10 -depends=('libxi' 'opengl' 'libstdc++' 'libdrm' 'libxxf86vm' 'jack' 'qt' 'libxmu') +depends=('libxi' 'libgl' 'libstdc++' 'libdrm' 'libxxf86vm' 'jack' 'qt' 'libxmu') hunk ./source/xapps-extra/qjackctl/FrugalBuild 13 +options=('scriptlet') hunk ./source/xapps-extra/qjackctl/FrugalBuild 19 +# optimization OK + } From alex at alex-smith.me.uk Sat Sep 2 17:27:59 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sat Sep 2 17:28:03 2006 Subject: [Frugalware-darcs] frugalware-current: swfdec-0.3.6-2-x86_64 Message-ID: <20060902152800.B82B64E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902162547-46e39-e6564e925f3686aaecd01e0449ac775171fbb5dd.gz; [swfdec-0.3.6-2-x86_64 AlexExtreme **20060902162547 * Added x86_64 to archs() ] { hunk ./source/xlib/swfdec/FrugalBuild 1 -# Last Modified: Mon, 08 May 2006 14:31:01 +0200 +# Last Modified: Sat, 02 Sep 2006 17:24:16 +0100 hunk ./source/xlib/swfdec/FrugalBuild 8 -pkgdesc="Swfdec is a library for rendering Flashź animations and games" +pkgdesc="Swfdec is a library for rendering Flash animations and games" hunk ./source/xlib/swfdec/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Sep 2 17:28:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 17:28:35 2006 Subject: [Frugalware-darcs] frugalware-current: sysklogd-1.4.1-7-i686 Message-ID: <20060902152834.26A544E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902152630-e2957-32ee414f95c2fc5a6875c3a6bb6b896602fd960d.gz; [sysklogd-1.4.1-7-i686 VMiklos **20060902152630 post_remove -> pre_remove closes #989 also fixed up for the new kernel-headers fixed building in chroot ] { hunk ./source/base/sysklogd/FrugalBuild 1 -# Last modified: Sat, 04 Mar 2006 04:56:43 +0100 +# Last modified: Sat, 02 Sep 2006 17:22:18 +0200 hunk ./source/base/sysklogd/FrugalBuild 8 -pkgrel=6 +pkgrel=7 hunk ./source/base/sysklogd/FrugalBuild 12 -depends=('logrotate' 'netkit-base') +rodepends=('logrotate' 'netkit-base') hunk ./source/base/sysklogd/FrugalBuild 19 + $pkgname-$pkgver-linux26_fixup.diff \ hunk ./source/base/sysklogd/FrugalBuild 25 + 'c6f56262726b5b5e6c433774758275e419cdf4e0' \ addfile ./source/base/sysklogd/sysklogd-1.4.1-linux26_fixup.diff hunk ./source/base/sysklogd/sysklogd-1.4.1-linux26_fixup.diff 1 +These headers are no longer provided by make headers_install. +--- sysklogd-1.4.1/module.h.orig 2006-09-02 17:15:40.000000000 +0200 ++++ sysklogd-1.4.1/module.h 2006-09-02 17:15:44.000000000 +0200 +@@ -28,8 +28,6 @@ + * recent content from Linux 2.4/2.6. + */ + +-#include +- + #define MODULE_NAME_LEN 60 + + struct kernel_sym +--- sysklogd-1.4.1/ksym_mod.c.orig 2006-09-02 17:16:05.000000000 +0200 ++++ sysklogd-1.4.1/ksym_mod.c 2006-09-02 17:16:16.000000000 +0200 +@@ -99,7 +99,6 @@ + #include + #include + #else /* __GLIBC__ */ +-#include + extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); + extern int get_kernel_syms __P ((struct kernel_sym *__table)); + #endif /* __GLIBC__ */ hunk ./source/base/sysklogd/sysklogd.install 1 -post_install() { +post_install() +{ hunk ./source/base/sysklogd/sysklogd.install 6 -post_remove() { +pre_remove() +{ hunk ./source/base/sysklogd/sysklogd.install 15 -# vim: ft=sh - } From alex at alex-smith.me.uk Sat Sep 2 17:46:51 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sat Sep 2 17:46:54 2006 Subject: [Frugalware-darcs] frugalware-current: gst-plugins-bad-0.10.3-3-x86_64 Message-ID: <20060902154651.D9E694E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902164440-46e39-a8a60b914f37d7bc7936c3e433fc53ff91d46e7e.gz; [gst-plugins-bad-0.10.3-3-x86_64 AlexExtreme **20060902164440 * Added x86_64 to archs * Fixed opengl depend ] { hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 1 -# Last modified: Sun, 07 May 2006 22:57:55 +0200 +# Last modified: Sat, 02 Sep 2006 17:44:00 +0100 hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 11 -makedepends=('opengl' 'soundtouch' 'libdrm' 'libxxf86vm' 'directfb' 'gstreamer' 'xvidcore' 'wavpack' 'libmpcdec' \ +makedepends=('libgl' 'soundtouch' 'libdrm' 'libxxf86vm' 'directfb' 'gstreamer' 'xvidcore' 'wavpack' 'libmpcdec' \ hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 15 -archs=('i686') +archs=('i686' 'x86_64') hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 32 - "xvidcore gstreamer" "opengl libxxf86vm libdrm gst-plugins-base" "wavpack gstreamer" \ + "xvidcore gstreamer" "libgl libxxf86vm libdrm gst-plugins-base" "wavpack gstreamer" \ hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 36 -subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') } From krics at linuxforum.hu Sat Sep 2 17:51:17 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 17:51:20 2006 Subject: [Frugalware-darcs] frugalware-current: nautilus-actions-1.4-1-x86_64 Message-ID: <20060902155117.B2D164E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902155104-d209c-6b35b0407b6715827e7af55316350acd6d76f981.gz; [nautilus-actions-1.4-1-x86_64 Christian Hamar alias krix **20060902155104 * Version bump * Added Finclude gnome-scriptlet for update-desktop-database ] { hunk ./source/gnome-extra/nautilus-actions/FrugalBuild 1 -# Last modified: Wed, 26 Apr 2006 17:36:05 +0530 -# Compiling time: 0.16 SBU +# Last modified: Sat, 02 Sep 2006 17:46:26 +0200 +# Compiling time: 0.20 SBU hunk ./source/gnome-extra/nautilus-actions/FrugalBuild 6 -pkgver=1.0 +pkgver=1.4 hunk ./source/gnome-extra/nautilus-actions/FrugalBuild 10 -depends=('glade' 'nautilus') +depends=('libglade' 'nautilus') hunk ./source/gnome-extra/nautilus-actions/FrugalBuild 14 +_F_gnome_desktop="y" +Finclude gnome-scriptlet hunk ./source/gnome-extra/nautilus-actions/FrugalBuild 18 -sha1sums=('a2a77218ddd9e9c467e791c0dc511b8a7f4a3345') - -build() { - Fcd - Fmake --sysconfdir=/etc --disable-schemas-install --disable-scrollkeeper - Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 DESTDIR=$Fdestdir install -} +sha1sums=('556c48b99180c9dc1e29ec98aed212f8caea5849') +Fconfopts="$Fconfopts --disable-schemas-install" } From krics at linuxforum.hu Sat Sep 2 19:44:02 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 19:44:09 2006 Subject: [Frugalware-darcs] frugalware-current: normalize-0.7.7-1-x86_64 Message-ID: <20060902174402.88ED14E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902174318-d209c-c2c0f1e54d4d22fda3a06b388ea0af9274afbaa6.gz; [normalize-0.7.7-1-x86_64 Christian Hamar alias krix **20060902174318 * Version bump * Fixed up2date and source URI (moved to new webpage) * Fixed SBU * Added audiofile as depends() ] { hunk ./source/multimedia/normalize/FrugalBuild 1 -# Last Modified: Sat, 29 Oct 2005 20:35:19 +0200 -# Compiling Time: 0.06 SBU +# Last Modified: Sat, 02 Sep 2006 19:42:27 +0200 +# Compiling Time: 0.09 SBU hunk ./source/multimedia/normalize/FrugalBuild 6 -pkgver=0.7.6 -pkgrel=2 +pkgver=0.7.7 +pkgrel=1 hunk ./source/multimedia/normalize/FrugalBuild 9 -url="http://www.cs.columbia.edu/~cvaill/normalize/" -depends=('libmad') +url="http://normalize.nongnu.org/" +depends=('libmad' 'audiofile') hunk ./source/multimedia/normalize/FrugalBuild 13 -up2date="lynx -dump http://www1.cs.columbia.edu/~cvaill/normalize/|grep latest|sed 's/.*(\(.*\)).*/\1/'" -source=(http://www1.cs.columbia.edu/~cvaill/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('db42d155bc75ae64a222888de96ea966ccf484a7') +up2date="lynx -dump http://savannah.nongnu.org/download/normalize/ | Flasttar" +source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('1d84a9e1cd50b24ebb99428452604dd1fb78be9d') hunk ./source/multimedia/normalize/FrugalBuild 17 -# optimalization OK - -# vim: ft=sh +# optimization OK } From krics at linuxforum.hu Sat Sep 2 19:50:33 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 19:50:36 2006 Subject: [Frugalware-darcs] frugalware-current: gmp-4.2.1 Message-ID: <20060902175034.035C84E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902175053-d209c-940916c95158c2ab2ddb4755814e618572aba69f.gz; [gmp-4.2.1 Christian Hamar alias krix **20060902175053 * Fixed up2date ] { hunk ./source/lib/gmp/FrugalBuild 14 -up2date="lynx -dump $url |grep tar.bz2 |sed -ne 's/.*p-\(.*\).t.*/\1/;1p'" +up2date="lynx -dump 'http://ftp.gnu.org/pub/gnu/$pkgname/?M=A' | Flasttar" } From vmiklos at frugalware.org Sat Sep 2 19:51:17 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Sep 2 19:51:19 2006 Subject: [Frugalware-darcs] frugalware-current: mingw-binutils-2.17.50_20060824_1-1-i686 Message-ID: <20060902175118.1FFB74E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902174915-e2957-810c643bdb56a7c126ae3142d9ef29f6934a592a.gz; [mingw-binutils-2.17.50_20060824_1-1-i686 VMiklos **20060902174915 version bump ] { hunk ./source/devel-extra/mingw-binutils/FrugalBuild 1 -# Last Modified: Mon, 21 Aug 2006 19:12:54 +0200 +# Last Modified: Sat, 02 Sep 2006 17:59:09 +0200 hunk ./source/devel-extra/mingw-binutils/FrugalBuild 6 -pkgver=2.17.50_20060716_1 +pkgver=2.17.50_20060824_1 hunk ./source/devel-extra/mingw-binutils/FrugalBuild 8 -pkgrel=2 +pkgrel=1 hunk ./source/devel-extra/mingw-binutils/FrugalBuild 29 -sha1sums=('bf61a76621cd9e516c255dc61c0247ea71345e6f') +sha1sums=('cd00a310b74c613f0e2b3a8172e5ad9b0137f963') } From desco at frugalware.org Sat Sep 2 20:23:26 2006 From: desco at frugalware.org (Miklos Nemeth) Date: Sat Sep 2 20:23:29 2006 Subject: [Frugalware-darcs] gfpm: code beautify Message-ID: <20060902182326.C2F7C4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=gfpm;a=darcs_commitdiff;h=20060902182231-3083d-ef0e6f3e425bddb8cc77c7e9aa0dae555d006fd4.gz; [code beautify Miklos Nemeth **20060902182231] { hunk ./src/gfpm.c 5 - * Copyright 2006 Frugalware Developer Team - * Authors Christian Hamar (krix) & Miklos Nemeth (desco) + * Copyright 2006 Frugalware Developer Team + * Authors Christian Hamar (krix) & Miklos Nemeth (desco) hunk ./src/gfpm.c 8 - + hunk ./src/gfpm.c 32 -int main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ hunk ./src/gfpm.c 68 -void exit_cleanup() { +void exit_cleanup() +{ hunk ./src/widgets.c 5 - * Copyright 2006 Frugalware Developer Team - * Authors Christian Hamar (krix) & Miklos Nemeth (desco) + * Copyright 2006 Frugalware Developer Team + * Authors Christian Hamar (krix) & Miklos Nemeth (desco) hunk ./src/widgets.c 8 - + hunk ./src/widgets.c 31 -void gfpm_create_combobox_repos(void) { +void gfpm_create_combobox_repos(void) +{ hunk ./src/widgets.c 42 - "text", 0, NULL); + "text", 0, NULL); hunk ./src/widgets.c 48 - 0, "frugalware-current", -1); + 0, "frugalware-current", -1); hunk ./src/widgets.c 51 - 0, "local", -1); + 0, "local", -1); hunk ./src/widgets.c 61 -void gfpm_create_group_treeview(void) { +void gfpm_create_group_treeview(void) +{ hunk ./src/widgets.c 71 - -1, - "Groups", renderer, "text", 0, - NULL); + -1, + "Groups", renderer, "text", 0, + NULL); hunk ./src/widgets.c 79 - + hunk ./src/widgets.c 84 -void gfpm_create_pkgs_treeview(void) { +void gfpm_create_pkgs_treeview(void) +{ hunk ./src/widgets.c 94 - -1, - "Package Name", renderer, "text", 0, - NULL); + -1, + "Package Name", renderer, "text", 0, + NULL); hunk ./src/widgets.c 100 - -1, - "Version", renderer, "text", 1, - NULL); + -1, + "Version", renderer, "text", 1, + NULL); hunk ./src/widgets.c 106 - -1, - "Description", renderer, "text", 2, - NULL); + -1, + "Description", renderer, "text", 2, + NULL); hunk ./src/widgets.c 114 - + hunk ./src/widgets.c 119 -void gfpm_create_info_treeview(void) { +void gfpm_create_info_treeview(void) +{ hunk ./src/widgets.c 128 - -1, - "Info", renderer, "text", 0, - NULL); + -1, + "Info", renderer, "text", 0, + NULL); hunk ./src/widgets.c 136 - -1, - "Value", renderer, "text", 1, - NULL); + -1, + "Value", renderer, "text", 1, + NULL); hunk ./src/widgets.c 143 -// selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pkgs_treeview)); -// g_signal_connect(selection, "changed", G_CALLBACK(_pkgs_treeview_select), NULL); - + // selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pkgs_treeview)); + // g_signal_connect(selection, "changed", G_CALLBACK(_pkgs_treeview_select), NULL); + hunk ./src/widgets.c 150 -int _group_treeview_select() { +int _group_treeview_select() +{ hunk ./src/widgets.c 160 - if (gtk_tree_selection_get_selected(s, &model, &iter)) { - gtk_tree_model_get(model, &iter, 0, &groupname, -1); - _update_pkgs_treeview(groupname); - return(0); - } else { - return(1); + if (gtk_tree_selection_get_selected(s, &model, &iter)) + { + gtk_tree_model_get(model, &iter, 0, &groupname, -1); + _update_pkgs_treeview(groupname); + return(0); + } + else + { + return(1); hunk ./src/widgets.c 173 -int _combobox_repos_select() { +int _combobox_repos_select() +{ hunk ./src/widgets.c 189 -int _pkgs_treeview_select() { +int _pkgs_treeview_select() +{ hunk ./src/widgets.c 199 - if (gtk_tree_selection_get_selected(s, &model, &iter)) { - gtk_tree_model_get(model, &iter, 0, &pkgname, -1); - _load_files_textview(pkgname); - _load_info_treeview(pkgname); - return(0); - } else { - return(1); + if (gtk_tree_selection_get_selected(s, &model, &iter)) + { + gtk_tree_model_get(model, &iter, 0, &pkgname, -1); + _load_files_textview(pkgname); + _load_info_treeview(pkgname); + return(0); + } + else + { + return(1); hunk ./src/widgets.c 213 -void _update_pkgs_treeview(char *gn) { +void _update_pkgs_treeview(char *gn) +{ hunk ./src/widgets.c 227 - for (i = pkgnames; i; i = alpm_list_next(i)) { - pkg = alpm_db_readpkg(local, alpm_list_getdata(i)); + for (i = pkgnames; i; i = alpm_list_next(i)) + { + pkg = alpm_db_readpkg(local, alpm_list_getdata(i)); hunk ./src/widgets.c 231 - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, (char *)alpm_list_getdata(i), - 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION), - 2, (char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), - -1); + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 0, (char *)alpm_list_getdata(i), + 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION), + 2, (char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), + -1); hunk ./src/widgets.c 241 -void _load_groups_treeview(char *repo) { +void _load_groups_treeview(char *repo) +{ hunk ./src/widgets.c 249 - if(local != NULL) { - alpm_db_unregister(local); - local = alpm_db_register(repo); - asprintf(&repository, "%s", repo); - } else { - local = alpm_db_register(repo); - asprintf(&repository, "%s", repo); + if(local != NULL) + { + alpm_db_unregister(local); + local = alpm_db_register(repo); + asprintf(&repository, "%s", repo); + } + else + { + local = alpm_db_register(repo); + asprintf(&repository, "%s", repo); hunk ./src/widgets.c 270 - gtk_main_iteration(); + gtk_main_iteration(); hunk ./src/widgets.c 272 - for (i = alpm_db_getgrpcache(local); i; i = alpm_list_next(i)) { - asprintf(&tmp, "Loading groups ... [%s]", (char *)alpm_list_getdata(i)); + for (i = alpm_db_getgrpcache(local); i; i = alpm_list_next(i)) + { + asprintf(&tmp, "Loading groups ... [%s]", (char *)alpm_list_getdata(i)); hunk ./src/widgets.c 276 - while(gtk_events_pending()) - gtk_main_iteration(); - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, (char *)alpm_list_getdata(i), - -1); + while(gtk_events_pending()) + gtk_main_iteration(); + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 0, (char *)alpm_list_getdata(i), + -1); hunk ./src/widgets.c 288 -void _load_files_textview(char *pkgname) { +void _load_files_textview(char *pkgname) +{ hunk ./src/widgets.c 297 - r = 1; /* in 'local' repo */ + r = 1; /* in 'local' repo */ hunk ./src/widgets.c 299 - r = 0; /* in 'remote' repo */ + r = 0; /* in 'remote' repo */ hunk ./src/widgets.c 306 - if (r != 1) { - gtk_text_buffer_insert(buffer, &iter, "We are in a remote repository. No file lists here. Only in local DB.\n", -1); + if (r != 1) + { + gtk_text_buffer_insert(buffer, &iter, "We are in a remote repository. No file lists here. Only in local DB.\n", -1); hunk ./src/widgets.c 311 - if (r != 0) { - pkg = alpm_db_readpkg(local, pkgname); + if (r != 0) + { + pkg = alpm_db_readpkg(local, pkgname); hunk ./src/widgets.c 315 - for (i = alpm_pkg_getinfo(pkg, PM_PKG_FILES); i; i = alpm_list_next(i)) { - gtk_text_buffer_insert(buffer, &iter, " /", -1); - gtk_text_buffer_insert(buffer, &iter, (char *)alpm_list_getdata(i), -1); - gtk_text_buffer_insert(buffer, &iter, "\n", -1); - } + for (i = alpm_pkg_getinfo(pkg, PM_PKG_FILES); i; i = alpm_list_next(i)) + { + gtk_text_buffer_insert(buffer, &iter, " /", -1); + gtk_text_buffer_insert(buffer, &iter, (char *)alpm_list_getdata(i), -1); + gtk_text_buffer_insert(buffer, &iter, "\n", -1); + } hunk ./src/widgets.c 326 -void _load_info_treeview(char *pkgname) { +void _load_info_treeview(char *pkgname) +{ hunk ./src/widgets.c 337 - r = 1; /* in 'local' repo */ + r = 1; /* in 'local' repo */ hunk ./src/widgets.c 339 - r = 0; /* in 'remote' repo */ + r = 0; /* in 'remote' repo */ hunk ./src/widgets.c 348 - 0, "Name:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_NAME), -1); + 0, "Name:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_NAME), -1); hunk ./src/widgets.c 352 - 0, "Version:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION), -1); + 0, "Version:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION), -1); hunk ./src/widgets.c 354 - if (r != 0) { - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, "Packager:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_PACKAGER), -1); + if (r != 0) + { + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 0, "Packager:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_PACKAGER), -1); hunk ./src/widgets.c 361 - if (r != 0) { - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, "URL:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_URL), -1); + if (r != 0) + { + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 0, "URL:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_URL), -1); hunk ./src/widgets.c 368 - if (r != 1) { - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - asprintf(&tmp, "%ld", (long)alpm_pkg_getinfo(pkg, PM_PKG_SIZE)); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, "Size (Compressed):", 1, (char *)tmp, -1); - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - asprintf(&tmp, "%ld", (long)alpm_pkg_getinfo(pkg, PM_PKG_USIZE)); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, "Size (Uncompressed):", 1, (char *)tmp, -1); + if (r != 1) + { + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + asprintf(&tmp, "%ld", (long)alpm_pkg_getinfo(pkg, PM_PKG_SIZE)); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 0, "Size (Compressed):", 1, (char *)tmp, -1); + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + asprintf(&tmp, "%ld", (long)alpm_pkg_getinfo(pkg, PM_PKG_USIZE)); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 0, "Size (Uncompressed):", 1, (char *)tmp, -1); hunk ./src/widgets.c 380 - if (r != 1) { - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, "SHA1SUM:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_SHA1SUM), -1); + if (r != 1) + { + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 0, "SHA1SUM:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_SHA1SUM), -1); hunk ./src/widgets.c 389 - for (i = y; i; i = alpm_list_next(i)) { - foo = g_string_append(foo, (char *)alpm_list_getdata(i)); - foo = g_string_append(foo, " "); + for (i = y; i; i = alpm_list_next(i)) + { + foo = g_string_append(foo, (char *)alpm_list_getdata(i)); + foo = g_string_append(foo, " "); hunk ./src/widgets.c 396 - 0, "Depends:", 1, (char *)foo->str, -1); + 0, "Depends:", 1, (char *)foo->str, -1); hunk ./src/widgets.c 400 - for (i = y; i; i = alpm_list_next(i)) { - foo = g_string_append(foo, (char *)alpm_list_getdata(i)); - foo = g_string_append(foo, " "); + for (i = y; i; i = alpm_list_next(i)) + { + foo = g_string_append(foo, (char *)alpm_list_getdata(i)); + foo = g_string_append(foo, " "); hunk ./src/widgets.c 407 - 0, "Provides:", 1, (char *)foo->str, -1); + 0, "Provides:", 1, (char *)foo->str, -1); hunk ./src/widgets.c 411 - for (i = y; i; i = alpm_list_next(i)) { - foo = g_string_append(foo, (char *)alpm_list_getdata(i)); - foo = g_string_append(foo, " "); + for (i = y; i; i = alpm_list_next(i)) + { + foo = g_string_append(foo, (char *)alpm_list_getdata(i)); + foo = g_string_append(foo, " "); hunk ./src/widgets.c 418 - 0, "Conflicts:", 1, (char *)foo->str, -1); + 0, "Conflicts:", 1, (char *)foo->str, -1); hunk ./src/widgets.c 420 - if (r != 0) { - y = alpm_pkg_getinfo(pkg, PM_PKG_REQUIREDBY); - foo = g_string_new(""); - for (i = y; i; i = alpm_list_next(i)) { - foo = g_string_append(foo, (char *)alpm_list_getdata(i)); - foo = g_string_append(foo, " "); - } - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, "Required by:", 1, (char *)foo->str, -1); + if (r != 0) + { + y = alpm_pkg_getinfo(pkg, PM_PKG_REQUIREDBY); + foo = g_string_new(""); + for (i = y; i; i = alpm_list_next(i)) + { + foo = g_string_append(foo, (char *)alpm_list_getdata(i)); + foo = g_string_append(foo, " "); + } + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 0, "Required by:", 1, (char *)foo->str, -1); hunk ./src/widgets.c 436 - 0, "Description:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), -1); + 0, "Description:", 1, (char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), -1); hunk ./src/widgets.c 441 -void _clear_treeviews() { +void _clear_treeviews() +{ } From krics at linuxforum.hu Sat Sep 2 21:06:55 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 21:06:57 2006 Subject: [Frugalware-darcs] gfpm: glade.xml: Added frames for group_treeview Message-ID: <20060902190655.37E294E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=gfpm;a=darcs_commitdiff;h=20060902190722-d209c-1225a0810fa22e1803180687acda431879f8387b.gz; [glade.xml: Added frames for group_treeview Christian Hamar alias krix **20060902190722 * Added frames around to grouptreeview * Removed header for treeview (frame ships a header now) ] { hunk ./glade/gfpm.glade 5 - Date: Wed Aug 30 11:45:13 2006 + Date: Sat Sep 2 21:05:59 2006 hunk ./glade/gfpm.glade 85 - + hunk ./glade/gfpm.glade 87 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + 0,000000 + GTK_SHADOW_IN hunk ./glade/gfpm.glade 90 - + hunk ./glade/gfpm.glade 92 - True + 5 + 5 + 5 + 5 + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + False + + + + + + + + + True + <b>Groups</b> + True hunk ./glade/gfpm.glade 118 + + label_item + } From krics at linuxforum.hu Sat Sep 2 21:21:26 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 21:21:28 2006 Subject: [Frugalware-darcs] gfpm: glade.xml: Part 2 of frames :) Message-ID: <20060902192126.A46934E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=gfpm;a=darcs_commitdiff;h=20060902192207-d209c-a69b528df77e75b31e33492c37390631ede8307e.gz; [glade.xml: Part 2 of frames :) Christian Hamar alias krix **20060902192207 * Added frames for pkgstreeview * Added frames for infobox part ] { hunk ./glade/gfpm.glade 5 - Date: Sat Sep 2 21:05:59 2006 + Date: Sat Sep 2 21:21:39 2006 hunk ./glade/gfpm.glade 132 - + hunk ./glade/gfpm.glade 134 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + 0,100000 + GTK_SHADOW_IN hunk ./glade/gfpm.glade 137 - + hunk ./glade/gfpm.glade 139 - True - - - - - False - - - - - True - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + 5 + 5 + 5 + 5 hunk ./glade/gfpm.glade 144 - + hunk ./glade/gfpm.glade 146 - False - True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + + hunk ./glade/gfpm.glade 157 - - False - hunk ./glade/gfpm.glade 159 - + hunk ./glade/gfpm.glade 161 - Info + <b>Packages</b> + True hunk ./glade/gfpm.glade 165 - tab - False - False + label_item hunk ./glade/gfpm.glade 168 + + + False + + + + + True + 0,100000 + GTK_SHADOW_IN hunk ./glade/gfpm.glade 179 - + hunk ./glade/gfpm.glade 181 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + 5 + 5 + 5 + 5 hunk ./glade/gfpm.glade 186 - + hunk ./glade/gfpm.glade 188 - False + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + False + True + + + + + False + + + + + True + Detials + + + tab + False + False + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + False + False + + + + + 1 + False + + + + + True + Files + + + tab + 1 + False + False + + hunk ./glade/gfpm.glade 249 - - 1 - False - hunk ./glade/gfpm.glade 251 - + hunk ./glade/gfpm.glade 253 - Files + <b>Informations</b> + True hunk ./glade/gfpm.glade 257 - tab - 1 - False - False + label_item } From krics at linuxforum.hu Sat Sep 2 21:25:35 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Sep 2 21:25:36 2006 Subject: [Frugalware-darcs] gfpm: glade.xml: added spacing to 5 into mainwindow Message-ID: <20060902192535.8C08D4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=gfpm;a=darcs_commitdiff;h=20060902192622-d209c-d3c8b2bf7552e2ee2857810d7763541d9c7958da.gz; [glade.xml: added spacing to 5 into mainwindow Christian Hamar alias krix **20060902192622 * Make spaces (5px) * Revert it if dont like :) ] { hunk ./glade/gfpm.glade 5 - Date: Sat Sep 2 21:21:39 2006 + Date: Sat Sep 2 21:25:46 2006 hunk ./glade/gfpm.glade 12 + 5 } From alex at alex-smith.me.uk Sat Sep 2 22:15:09 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sat Sep 2 22:15:12 2006 Subject: [Frugalware-darcs] frugalware-current: net6-1.3.1-1-x86_64 Message-ID: <20060902201509.7149B4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902211319-46e39-2a028c8d0b4196c89fd4fd00f452c4c1661b5ca5.gz; [net6-1.3.1-1-x86_64 AlexExtreme **20060902211319 * New package ] { adddir ./source/lib-extra/net6 addfile ./source/lib-extra/net6/FrugalBuild hunk ./source/lib-extra/net6/FrugalBuild 1 +# Last Modified: Sat, 02 Sep 2006 22:12:30 +0100 +# Compiling Time: 0.20 SBU +# Maintainer: AlexExtreme + +pkgname=net6 +pkgver=1.3.1 +pkgrel=1 +pkgdesc="net6 is a library which eases the development of network-based applications" +url="http://releases.0x539.de/net6/" +depends=('libsigc++2' 'gnutls') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | sed '/latest/d' | sed '/stable/d' | Flasttar" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('d8b2068bd8983e7f698d40bc4680d3e7655f8d1d') + +# optimization OK } From janny at frugalware.org Sat Sep 2 22:40:20 2006 From: janny at frugalware.org (Janny) Date: Sat Sep 2 22:40:22 2006 Subject: [Frugalware-darcs] frugalware-current: firestarter-1.0.3-6-i686 Message-ID: <20060902204020.4CCDF4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902161535-ee5de-74dda4b0601a39be61539d38365b1a3a7bc404b8.gz; [firestarter-1.0.3-6-i686 Janny **20060902161535 correction in .install closes #1087 (alex, to agree?) ] { hunk ./source/gnome-extra/firestarter/FrugalBuild 1 -# Last modified: Fri, 21 Oct 2005 17:21:07 +0200 +# Last modified: Sat, 02 Sep 2006 18:05:14 +0200 hunk ./source/gnome-extra/firestarter/FrugalBuild 7 -pkgrel=5 +pkgrel=6 hunk ./source/gnome-extra/firestarter/FrugalBuild 71 +# optimization OK + hunk ./source/gnome-extra/firestarter/firestarter.install 15 + echo -n "update rc.d..." + /usr/sbin/chkconfig --del rc.firewall + /usr/sbin/chkconfig --add rc.firestarter + echo "done" hunk ./source/gnome-extra/firestarter/firestarter.install 37 + echo -n "update rc.d..." + /usr/sbin/chkconfig --del rc.firestarter + /usr/sbin/chkconfig --add rc.firewall + echo "done" hunk ./source/gnome-extra/firestarter/firestarter.install 50 -pre_install() -{ - echo -n "update rc.d..." - /usr/sbin/chkconfig --del rc.firewall - /usr/sbin/chkconfig --add rc.firestarter - echo "done" -} - -pre_remove() -{ - echo -n "update rc.d..." - /usr/sbin/chkconfig --del rc.firestarter - /usr/sbin/chkconfig --add rc.firewall - echo "done" -} - hunk ./source/gnome-extra/firestarter/firestarter.install 55 -# vim: ft=sh - } From janny at frugalware.org Sat Sep 2 23:00:15 2006 From: janny at frugalware.org (Janny) Date: Sat Sep 2 23:00:18 2006 Subject: [Frugalware-darcs] frugalware-current: gdhcpd-0.3.1-1-i686 Message-ID: <20060902210015.A8DDF4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902205837-ee5de-5688d8004609ef0a2f10644ed3fe749c87802846.gz; [gdhcpd-0.3.1-1-i686 Janny **20060902205837 version bump ] { hunk ./source/xapps-extra/gdhcpd/FrugalBuild 1 -# Last modified: Sat, 26 Aug 2006 10:15:39 +0200 +# Last modified: Sat, 02 Sep 2006 22:57:36 +0200 hunk ./source/xapps-extra/gdhcpd/FrugalBuild 6 -pkgver=0.3.0 +pkgver=0.3.1 hunk ./source/xapps-extra/gdhcpd/FrugalBuild 16 -sha1sums=('d820a9df5a9be9a8b51018ac9163858c0dfd5809' \ +sha1sums=('2f79132020a7c6425d04611e2a5accda3484116a' \ } From desco at frugalware.org Sun Sep 3 00:43:40 2006 From: desco at frugalware.org (Miklos Nemeth) Date: Sun Sep 3 00:43:45 2006 Subject: [Frugalware-darcs] frugalware-current: guiloader-2.8.0-1-i686 Message-ID: <20060902224341.3CECF4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902224131-3083d-a0c53bfd82238bcf7e557b02fb02eaed628caa1d.gz; [guiloader-2.8.0-1-i686 Miklos Nemeth **20060902224131 new package ] { adddir ./source/devel-extra/guiloader addfile ./source/devel-extra/guiloader/FrugalBuild hunk ./source/devel-extra/guiloader/FrugalBuild 1 +# Last Modified: Sun, 03 Sep 2006 00:38:43 +0200 +# Compiling Time: 0.05 SBU +# Maintainer: Miklos Németh + +pkgname=guiloader +pkgver=2.8.0 +pkgrel=1 +pkgdesc="GUILoader for Gideon Designer" +url="gideon.sourceforge.net" +depends=('gtk+2') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump http://gideon.sourceforge.net/cgi-bin/wiki/Download | grep 'GuiLoader ' | sed 's/.*guiloader-\([0-9.]*\).tar.*/\1/'" +source=(http://heanet.dl.sourceforge.net/sourceforge/gideon/$pkgname-$pkgver.tar.bz2) +sha1sums=('e2f1d7bb579857671be0769e63ba0a1852ea3e46') + +# optimization OK } From desco at frugalware.org Sun Sep 3 01:03:42 2006 From: desco at frugalware.org (Miklos Nemeth) Date: Sun Sep 3 01:03:45 2006 Subject: [Frugalware-darcs] frugalware-current: guiloader-cpp-2.8.0-1-i686 Message-ID: <20060902230342.E5DF04E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902230119-3083d-cbc6d0db250217ac2e4cdfd82cd7d9e7452d0ab9.gz; [guiloader-cpp-2.8.0-1-i686 Miklos Nemeth **20060902230119 new package ] { adddir ./source/devel-extra/guiloader-cpp addfile ./source/devel-extra/guiloader-cpp/FrugalBuild hunk ./source/devel-extra/guiloader-cpp/FrugalBuild 1 +# Last Modified: Sun, 03 Sep 2006 01:00:11 +0200 +# Compiling Time: 0.16 SBU +# Maintainer: Miklos Nemeth + +pkgname=guiloader-cpp +pkgver=2.8.0 +pkgrel=1 +pkgdesc="GUILoader for Gideon Designer" +url="gideon.sourceforge.net" +depends=('guiloader' 'gtkmm') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump http://gideon.sourceforge.net/cgi-bin/wiki/Download | grep 'GuiLoader\/C\+\+' | sed 's/.*guiloader-c++-\([0-9.]*\).tar.*/\1/'" +source=(http://heanet.dl.sourceforge.net/sourceforge/gideon/guiloader-c++-$pkgver.tar.bz2) +sha1sums=('406e5442f9e0a67da5bd4315cae0654f638d6180') + +build() +{ + cd guiloader-c++-$pkgver + Fbuild +} + +# optimization OK } From desco at frugalware.org Sun Sep 3 01:27:54 2006 From: desco at frugalware.org (Miklos Nemeth) Date: Sun Sep 3 01:27:59 2006 Subject: [Frugalware-darcs] frugalware-current: gideon-2.8.0-1-i686 Message-ID: <20060902232754.4F8D64E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060902232547-3083d-b42070d85ba005f5fafc2216d3617fac850d77f6.gz; [gideon-2.8.0-1-i686 Miklos Nemeth **20060902232547 new package ] { adddir ./source/xapps-extra/gideon addfile ./source/xapps-extra/gideon/FrugalBuild hunk ./source/xapps-extra/gideon/FrugalBuild 1 +# Last Modified: Sun, 03 Sep 2006 01:19:39 +0200 +# Compiling Time: 0.71 SBU +# Maintainer: Miklos Nemeth + +pkgname=gideon +pkgver=2.8.0 +pkgrel=1 +pkgdesc="Modern GUI Designer for GTK+" +url="gideon.sourceforge.net" +depends=('guiloader-cpp' 'gnome-vfs') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump http://gideon.sourceforge.net/cgi-bin/wiki/Download | grep 'Gideon Designer' | sed 's/.*gideon-\([0-9.]*\).tar.*/\1/'" +source=(http://heanet.dl.sourceforge.net/sourceforge/gideon/gideon-$pkgver.tar.bz2) +sha1sums=('7149b8dac15011a7aa97f0afddd112d2650fafe8') + +# optimization OK } From vmiklos at frugalware.org Sun Sep 3 01:47:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 01:47:45 2006 Subject: [Frugalware-darcs] setup: po/pl.po: initial import Message-ID: <20060902234743.0565D4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=setup;a=darcs_commitdiff;h=20060902234639-e2957-ac5a7c74b499c728463b972212fe2a1eeb0a53ef.gz; [po/pl.po: initial import VMiklos **20060902234639 from Piotr Maliński closes #1096 ] { hunk ./po/Makefile 1 -LANGS=id hu de nl pt fr +LANGS=id hu de nl pl pt fr addfile ./po/pl.po hunk ./po/pl.po 1 +# Piotr Maliński , 2006. +# + + +msgid "" +msgstr "" +"Project-Id-Version: pl\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../src/plugins/configsource.c:57 ../src/plugins/configsource.c:89 +#: ../src/plugins/configsource.c:94 ../src/plugins/dolangsh.c:52 +#: ../src/plugins/formatdisk.c:233 ../src/plugins/formatdisk.c:376 +#: ../src/plugins/layout.c:115 ../src/plugins/loadsource.c:76 +#: ../src/plugins/select.c:321 ../src/util.c:306 +msgid "Could not open output file for writing" +msgstr "Nie mogê otworzyæ pliku do zapisu" + +#: ../src/plugins/configsource.c:124 +msgid "Selecting a mirror" +msgstr "Wybór serwera lustrzanego" + +#: ../src/plugins/configsource.c:130 +msgid "Please select a mirror" +msgstr "Wybierz serwer" + +#: ../src/plugins/configsource.c:130 +msgid "" +"You may now specify the mirror closest to you in order to download the " +"packages faster. In most cases the default value will be fine." +msgstr "" +"Możesz wybraæ najbliższy serwer w celu " +"szybszego pobrania pakietów." + +#: ../src/plugins/configsource.c:153 ../src/plugins/hotplug.c:53 +#: ../src/plugins/select.c:359 ../src/plugins/select.c:366 +#: ../src/plugins/select.c:394 +msgid "Please wait" +msgstr "Proszê czekaæ" + +#: ../src/plugins/configsource.c:153 +msgid "Configuring the network interface..." +msgstr "Konfigurujê interfejsy sieciowe..." + +#: ../src/plugins/formatdisk.c:144 +msgid "Setting up swap space" +msgstr "Ustawiam SWAP" + +#: ../src/plugins/formatdisk.c:147 +msgid "Setting up swap partitions" +msgstr "Ustawiam partycje SWAP" + +#: ../src/plugins/formatdisk.c:148 +msgid "Please select which swap partitions you want Frugalware to use:" +msgstr "Wybierz partycje swap z których Frugalware ma korzystaæ:" + +#: ../src/plugins/formatdisk.c:159 ../src/plugins/formatdisk.c:181 +msgid "Quick format with no bad block checking" +msgstr "Szybkie formatowanie bez sprawdzania uszkodzonych bloków" + +#: ../src/plugins/formatdisk.c:160 ../src/plugins/formatdisk.c:182 +msgid "Slow format that checks for bad blocks" +msgstr "Powolne formatowanie sprawdzaj±ce uszkodzone bloki" + +#: ../src/plugins/formatdisk.c:163 ../src/plugins/formatdisk.c:186 +#: ../src/plugins/formatdisk.c:210 +msgid "Formatting partitions" +msgstr "Formatujê partycje" + +#: ../src/plugins/formatdisk.c:166 ../src/plugins/formatdisk.c:189 +#, c-format +msgid "Format %s" +msgstr "Formatuj %s" + +#: ../src/plugins/formatdisk.c:167 ../src/plugins/formatdisk.c:190 +#, c-format +msgid "" +"If %s has not been formatted, you should format it.\n" +"NOTE: This will erase all data on %s. Would you like to format this " +"partition?" +msgstr "" +"Jeżeli %s nie zostało sformatowane to powiniene¶ zrobiæ to teraz.\n" +"NOTE: Formatowanie skasuje wszystkie dane z %s. \nSformatowaæ " +"t± partycjê?" + +#: ../src/plugins/formatdisk.c:183 +msgid "Do not format, just mount the partition" +msgstr "NIE formatuj, tylko zamontuj" + +#: ../src/plugins/formatdisk.c:204 +msgid "Standard Linux ext2fs filesystem" +msgstr "System plików EXT2" + +#: ../src/plugins/formatdisk.c:205 +msgid "Journalising version of the ext2fs filesystem" +msgstr "System plików EXT3" + +#: ../src/plugins/formatdisk.c:206 +msgid "Hans Reiser's journalising filesystem" +msgstr "ReiserFS" + +#: ../src/plugins/formatdisk.c:207 +msgid "SGI's journalising filesystem" +msgstr "System plików XFS" + +#: ../src/plugins/formatdisk.c:214 +#, c-format +msgid "Selecting filesystem for %s" +msgstr "Wybór systemu plików dla %s" + +#: ../src/plugins/formatdisk.c:215 +#, c-format +msgid "Please select the type of filesystem to use for %s." +msgstr "Proszê wybraæ system plików dla %s." + +#: ../src/plugins/formatdisk.c:255 ../src/plugins/formatdisk.c:262 +msgid "Formatting swap partition" +msgstr "Formatujê partycjê SWAP" + +#: ../src/plugins/formatdisk.c:256 +#, c-format +msgid "Formatting %s as a swap partition" +msgstr "Formatujê %s jako partycjê swap" + +#: ../src/plugins/formatdisk.c:263 +#, c-format +msgid "Formatting %s as a swap partition and checking for bad blocks" +msgstr "Formatujê %s jako partycjê swap i sprawdzam na obecno¶æ uszkodzonych bloków" + +#: ../src/plugins/formatdisk.c:284 +msgid "Setting up the root partition" +msgstr "Ustawienia głównej partycji" + +#: ../src/plugins/formatdisk.c:286 +msgid "Select the Linux installation partition" +msgstr "Wybierz główn± partycjê systemu" + +#: ../src/plugins/formatdisk.c:287 +msgid "" +"Please select a partition from the following list to use for your root (/) " +"partition. The following ones are available:" +msgstr "" +"Proszê wybraæ partycjê główn± (/) dla Frugalware. " +"Dostêpne s±:" + +#: ../src/plugins/formatdisk.c:299 +msgid "Formatting" +msgstr "Formatujê" + +#: ../src/plugins/formatdisk.c:300 +#, c-format +msgid "Creating %s filesystem on %s and checking for bad blocks" +msgstr "Tworzê system plików %s na %s i sprawdzam na obecno¶æ uszkodzonych bloków" + +#: ../src/plugins/formatdisk.c:301 +#, c-format +msgid "Creating %s filesystem on %s" +msgstr "Tworzê system plików %s na %s" + +#: ../src/plugins/formatdisk.c:396 +#, c-format +msgid "Select mount point for %s" +msgstr "Wybierz punkt montowania dla %s" + +#: ../src/plugins/formatdisk.c:416 ../src/plugins/formatdisk.c:550 +msgid "(in use)" +msgstr "(w użyciu)" + +#: ../src/plugins/formatdisk.c:424 +#, c-format +msgid "%s on %s/\t%s" +msgstr "%s na %s/\t%s" + +#. non-root partitions +#: ../src/plugins/formatdisk.c:523 +msgid "Selecting other partitions" +msgstr "Wybieram inne partycje" + +#: ../src/plugins/formatdisk.c:530 ../src/plugins/partdisk.c:171 +msgid "Continue" +msgstr "Kontynuuj" + +#: ../src/plugins/formatdisk.c:534 +msgid "Select other Linux partitions for /etc/fstab" +msgstr "Wybierz inne partycje dla /etc/fstab" + +#: ../src/plugins/formatdisk.c:535 +msgid "" +"You may use your other partitions to distribute your Linux system across " +"more than one partition. Currently, you have only mounted your / partition. " +"You might want to mount directories such as /boot, /home or /usr/local on " +"separate partitions. You should not try to mount /usr, /etc, /sbin, or /bin " +"on their own partitions since they contain utilities needed to bring the " +"system up and mount partitions. Also, do not reuse a partition that you've " +"already entered before. Please select one of the partitions listed below, or " +"if you're done, hit Continue." +msgstr "" +"Możesz skonfigurowaæ inne partycje i ich punkty montowania. Obecnie " +"zamontowana jest tylko partycja główna. Możesz zamontowaæ inne partycje np. " +"jako /boot czy /home. Nie powiniene¶ montowaæ partycji pod /usr /etc /sbin czy /bin. " +"Nie powiniene¶ także montowaæ już wykorzystanych partycji. Gdy skończysz kliknij Kontynuuj." + +#: ../src/plugins/greet.c:53 +#, c-format +msgid "Welcome to %s" +msgstr "Witaj w %s" + +#: ../src/plugins/greet.c:55 +msgid "Welcome" +msgstr "Witaj" + +#: ../src/plugins/greet.c:58 +msgid "" +"Welcome among the users of Frugalware!\n" +"\n" +"The aim of creating Frugalware was to help you to do your work faster and " +"simpler. We hope that you will like our product.\n" +"\n" +"The Frugalware Developer Team" +msgstr "" +"Witaj po¶ród użytkowników Frugalware!\n" +"\n" +"Celem Frugalware jest ułatwienie twojej pracy. " +"Mamy nadziejê że polubisz nasz produkt.\n" +"\n" +"Zespół Frugalware!" + +#: ../src/plugins/hotplug.c:50 +msgid "Detecting hardware" +msgstr "Wykrywam sprzêt" + +#: ../src/plugins/hotplug.c:53 +msgid "Scanning for SCSI and PCI cards" +msgstr "Poszukujê kart PCI i SCSI" + +#: ../src/plugins/layout.c:93 +msgid "Configuring the keyboard" +msgstr "Konfiguracja klawiatury" + +#: ../src/plugins/layout.c:96 +msgid "Keyboard map selection" +msgstr "Wybór mapy klawiatury" + +#: ../src/plugins/layout.c:97 +msgid "" +"You may select one of the following keyboard maps. If you do not select a " +"keyboard map, 'qwerty/us.map.gz' (the US keyboard map) is the default. Use " +"the UP/DOWN arrow keys and PageUp/PageDown to scroll through the whole list " +"of choices." +msgstr "" +"Musisz wybraæ mapê klawiatury. Jeżeli nie wybierzesz żadnej użyta zostanie " +"qwerty/us.map.gz. Polskie mapy zawieraj± *pl* w nazwie. Użyj strzałek oraz PageUp/PageDown " +"do przewiniêcia listy" + +#: ../src/plugins/loadsource.c:109 +msgid "Selecting source media" +msgstr "Wybór medium instalacyjnego" + +#: ../src/plugins/loadsource.c:112 +msgid "Scanning" +msgstr "Wyszukujê" + +#: ../src/plugins/loadsource.c:112 +msgid "Scanning for a CD/DVD drive containing a Frugalware install disc..." +msgstr "Szukam CD/DVD instalacyjnego..." + +#: ../src/plugins/loadsource.c:122 +msgid "CD/DVD drive found" +msgstr "Znaleziono CD/DVD" + +#: ../src/plugins/loadsource.c:122 +#, c-format +msgid "A Frugalware install disc was found in device /dev/%s." +msgstr "Znaleziono płytê instalacyjn± w urz±dzeniu /dev/%s." + +#: ../src/plugins/partdisk.c:108 +msgid "User friendly (curses based) version of fdisk" +msgstr "Quasigraficzna (curses) wersja fdisk" + +#: ../src/plugins/partdisk.c:109 +msgid "The traditional partitioning program for Linux" +msgstr "Standardowy program partycjonuj±cy" + +#: ../src/plugins/partdisk.c:110 +msgid "A partition manipulation program" +msgstr "Program do partycjonowania" + +#: ../src/plugins/partdisk.c:113 ../src/plugins/partdisk.c:157 +msgid "Creating partitions" +msgstr "Tworzê partycje" + +#: ../src/plugins/partdisk.c:116 +msgid "Select partitioning program" +msgstr "Wybierz program partycjonuj±cy" + +#: ../src/plugins/partdisk.c:117 +msgid "Select the program you want to use for partitioning:" +msgstr "Wybierz program za pomoc± którego stworzysz partycje:" + +#: ../src/plugins/partdisk.c:128 +msgid "Want to create RAID?" +msgstr "Chcesz stworzyæ RAID?" + +#: ../src/plugins/partdisk.c:129 +msgid "Do you want to create software raid partitions during partitioning?" +msgstr "Czy chcesz utworzyæ partycje software raid?" + +#: ../src/plugins/partdisk.c:151 +msgid "Disk drive not found" +msgstr "Nie znaleziono dysku" + +#: ../src/plugins/partdisk.c:151 +msgid "" +"Sorry, no hard disk drives were found in this computer. Press ENTER to " +"reboot." +msgstr "" +"Nie znaleziono dysków twardych. Wci¶nij ENTER by zrestartowaæ." + +#: ../src/plugins/partdisk.c:166 +msgid "Create RAID" +msgstr "Stwórz RAID" + +#: ../src/plugins/partdisk.c:174 +msgid "Select a hard disk to partition" +msgstr "Wybierz dysk do partycjonowania" + +#: ../src/plugins/partdisk.c:175 +msgid "" +"Please select a hard disk to partition. The following ones are available:" +msgstr "" +"Wybierz dysk do partycjonowania. Dostêpne:" + +#: ../src/plugins/restart.c:55 ../src/util.c:123 +msgid "Setup complete" +msgstr "Konfiguracja zakończona" + +#: ../src/plugins/restart.c:55 +#, c-format +msgid "" +"System installation and configuration is successfully completed. We hope " +"that you will enjoy %s. Please remove the media from your drive and press " +"ENTER to reboot." +msgstr "" +"Instalacja i konfiguracja systemu zakończona pomy¶lnie. Mamy nadziejê " +"że spodoba ci siê %s. Wysuń płytê instalacyjn± i wci¶nij ENTER by zrestartowaæ system." + +#: ../src/plugins/select.c:246 +msgid "Selecting categories" +msgstr "Wybór kategorii" + +#: ../src/plugins/select.c:247 +msgid "Please select which categories to install:" +msgstr "Wybierz kategorie pakietów do instalacji" + +#: ../src/plugins/select.c:264 ../src/plugins/select.c:356 +msgid "Selecting packages" +msgstr "Wybór pakietów" + +#: ../src/plugins/select.c:277 +msgid "Use expert menus?" +msgstr "Użyæ szczegółowego menu?" + +#: ../src/plugins/select.c:278 +msgid "" +"If you like, you may select your packages from expert menus. Where the " +"normal menu shows a choice like 'C compiler system', the expert menus show " +"you 'C libs', 'C compiler', 'C include files', etc - each individual " +"package. Obviously, you should know what you're doing if you use the expert " +"menus since it's possible to skip packages that are crucial to the " +"functioning of your system. Choose 'no' for using normal menus that select " +"groups of packages, or choose 'yes' for using expert menus with a switch for " +"each package." +msgstr "" +"Szczegółowe menu pozwol± na wybranie poszczególnych pakietów. Widok " +"standardowy pokaże jedynie grupy pakietów. Widok szczegółowy nie powinien byæ " +"stosowany przez osoby niedo¶wiadczone. Użyæ szczegółowego menu?" + +#: ../src/plugins/select.c:359 +msgid "Searching for categories..." +msgstr "Szukam kategorii..." + +#: ../src/plugins/select.c:366 +msgid "Searching for packages..." +msgstr "Szukam pakietów..." + +#: ../src/plugins/select.c:394 +msgid "Searching for missing dependencies..." +msgstr "Szukam brakuj±cych zależno¶ci..." + +#: ../src/plugins/install.c:60 +#, c-format +msgid "" +"Errors occured while installing selected packages.\n" +"Press ENTER to continue..." +msgstr "" +"Pojawił siê bł±d podczasz instalacji.\n" +"Wci¶nij ENTER by kontynuowaæ..." + +#: ../src/plugins/install.c:80 +msgid "Insert next disc" +msgstr "Włóż kolejn± płytê instalacyjn±" + +#: ../src/plugins/install.c:81 +msgid "" +"Please insert the next Frugalware install disc and press ENTER to continue " +"installing packages. If you don't have more disk, choose NO, and then you " +"can finish up the installation. Have you inserted the next disk?" +msgstr "" +"Proszê włożyæ do napêdu kolejn± płytê instalacyjn± i wcisn±æ ENTER by kontynuowaæ. " +"Jeżeli nie masz kolejnych płyt wybierz NO by pominaæ instalacjê dalszych pakietów " +"i zakończyæ instalacjê. Włożyłe¶ kolejn± płytê?" + +#: ../src/plugins/postconf.c:74 +msgid "No root password detected" +msgstr "Brak hasła roota" + +#: ../src/plugins/postconf.c:75 +msgid "" +"There is currently no password set on the system administrator account " +"(root). It is recommended that you set one now so that it is active the " +"first time the machine is rebooted. This is especially important if your " +"machine is on an internet connected LAN. Would you like to set a root " +"password?" +msgstr "" +"Konto administratora systemu (root) nie ma ustawionego hasła. " +"Zaleca siê (bardzo) ustawienie hasła dla tego użytkownika. Ustawiæ hasło " +"dla użytkownika root?" + +#: ../src/plugins/postconf.c:111 +msgid "No normal user account detected" +msgstr "Brak konta zwykłego użytkownika" + +#: ../src/plugins/postconf.c:112 +msgid "" +"There is currently no non-root user account configured. It is strongly " +"recommended to create one. Would you like to create a normal user account " +"now?" +msgstr "Brak konta zwykłego użytkownika. Zaleca siê stworzenie jednego takiego konta do " +"codziennej pracy. Stworzyæ konto ?" + +#: ../src/plugins/postconf.c:140 +msgid "Post-install configuration" +msgstr "Konfiguracja poinstalacyjna" + +#: ../src/plugins/postconf.c:152 +msgid "Configuring kernel modules" +msgstr "Konfigurujê moduły kernela" + +#: ../src/plugins/postconf.c:153 +msgid "Updating module dependencies..." +msgstr "Aktualizujê zależno¶ci modułów..." + +#: ../src/util.c:50 +msgid "Setup" +msgstr "Setup" + +#: ../src/util.c:63 +msgid "Could not open file for reading" +msgstr "Nie mogê otworzyæ pliku do odczytu" + +#: ../src/util.c:123 +msgid "Ejecting installation media..." +msgstr "Wysuwam media instalacyjne" + +#: ../src/util.c:163 +msgid "Installation error" +msgstr "Bł±d instalacji" + +#: ../src/util.c:164 +msgid "" +"Errors occured while installing selected packages. It is recommended to " +"abort the installation, however you may want to ignore this problem. Do you " +"want to leave the installer?" +msgstr "" +"Wyst±pił bł±d przy instalacji pakietów. Zaleca siê przerwanie instalacji, " +"chociaż możesz j± kontynuowaæ. Zakończyæ instalacjê ? " + +#: ../src/util.c:180 +msgid "Exit from the installer" +msgstr "Zamknij instalator" + +#: ../src/util.c:181 +msgid "Are you sure you want to exit from the installer?" +msgstr "Czy jeste¶ pewien że chcesz zakończyæ instalacjê ?" } From vmiklos at frugalware.org Sun Sep 3 03:32:26 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 03:32:29 2006 Subject: [Frugalware-darcs] pacman: move the holdpkg feature to libalpm Message-ID: <20060903013226.9B3604E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903011037-e2957-e57748dba9d65fe7d8f28c4db04a7af0e2a1d8ab.gz; [move the holdpkg feature to libalpm VMiklos **20060903011037] { hunk ./lib/libalpm/alpm.h 114 - PM_OPT_DLETA_S + PM_OPT_DLETA_S, + /* End of download */ + PM_OPT_HOLDPKG hunk ./lib/libalpm/alpm.h 296 - PM_TRANS_CONV_LOCAL_UPTODATE = 0x20 + PM_TRANS_CONV_LOCAL_UPTODATE = 0x20, + PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40 hunk ./lib/libalpm/alpm.h 452 - PM_ERR_RETRIEVE + PM_ERR_RETRIEVE, + PM_ERR_PKG_HOLD hunk ./lib/libalpm/error.c 123 + case PM_ERR_PKG_HOLD: + return _("not confirmed"); hunk ./lib/libalpm/handle.c 125 + FREELIST(handle->holdpkg); hunk ./lib/libalpm/handle.c 200 + case PM_OPT_HOLDPKG: + if((char *)data && strlen((char *)data) != 0) { + handle->holdpkg = _alpm_list_add(handle->holdpkg, strdup((char *)data)); + _alpm_log(PM_LOG_FLOW2, _("'%s' added to PM_OPT_HOLDPKG"), (char *)data); + } else { + FREELIST(handle->holdpkg); + _alpm_log(PM_LOG_FLOW2, _("PM_OPT_HOLDPKG flushed")); + } + break; hunk ./lib/libalpm/handle.c 324 + case PM_OPT_HOLDPKG: *data = (long)handle->holdpkg; break; hunk ./lib/libalpm/handle.h 50 + PMList *holdpkg; /* List of strings */ hunk ./lib/libalpm/remove.c 79 + + if(_alpm_list_is_strin(info->name, handle->holdpkg)) { + int resp = 0; + QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, info, NULL, NULL, &resp); + if(!resp) { + RET_ERR(PM_ERR_PKG_HOLD, -1); + } + } hunk ./src/pacman/conf.c 63 - FREELIST(config->holdpkg); hunk ./src/pacman/conf.c 230 - config->holdpkg = list_add(config->holdpkg, strdup(p)); + if(alpm_set_option(PM_OPT_HOLDPKG, (long)p) == -1) { + ERR(NL, _("failed to set option HOLDPKG (%s)\n"), alpm_strerror(pm_errno)); + return(1); + } hunk ./src/pacman/conf.c 238 - config->holdpkg = list_add(config->holdpkg, strdup(p)); + if(alpm_set_option(PM_OPT_HOLDPKG, (long)p) == -1) { + ERR(NL, _("failed to set option HOLDPKG (%s)\n"), alpm_strerror(pm_errno)); + return(1); + } hunk ./src/pacman/conf.h 62 - list_t *holdpkg; hunk ./src/pacman/remove.c 91 - /* check if the package is in the HoldPkg list. If so, ask - * confirmation first */ - if(list_is_strin(i->data, config->holdpkg)) { - if(!yesno(_(":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "), i->data)) { - return(1); - } - } hunk ./src/pacman/trans.c 181 + break; + case PM_TRANS_CONV_REMOVE_HOLDPKG: + if(config->noask) { + if(config->ask & PM_TRANS_CONV_REMOVE_HOLDPKG) { + *response = 1; + } else { + *response = 0; + } + } else { + snprintf(str, LOG_STR_LEN, _(":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "), + (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME)); + *response = yesno(str); + } } From vmiklos at frugalware.org Sun Sep 3 03:49:01 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 03:49:04 2006 Subject: [Frugalware-darcs] pacman: pacman: log_progress(): prevent a nice "2 lines for each file" duplication Message-ID: <20060903014901.CEC464E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903014654-e2957-7074ecc237a23fa701028909f5b3a622dab1645c.gz; [pacman: log_progress(): prevent a nice "2 lines for each file" duplication VMiklos **20060903014654] { hunk ./src/pacman/download.c 72 - if(config->noprogressbar) { + if(config->noprogressbar || (lastpct==100)) { } From vmiklos at frugalware.org Sun Sep 3 04:43:27 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 04:43:37 2006 Subject: [Frugalware-darcs] pacman: move the config parser to libalpm Message-ID: <20060903024327.6BE6B4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903022724-e2957-af19ce922fd6f364345c5a20cacd831cd74c3463.gz; [move the config parser to libalpm VMiklos **20060903022724 parseconfig() -> alpm_parse_config() ] { hunk ./lib/libalpm/alpm.c 61 +#define min(X, Y) ((X) < (Y) ? (X) : (Y)) + hunk ./lib/libalpm/alpm.c 1200 + +/** Parses a configuration file. + * @param file path to the config file. + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ +int alpm_parse_config(char *file, alpm_cb_db_register callback) +{ + FILE *fp = NULL; + char line[PATH_MAX+1]; + char *ptr = NULL; + char *key = NULL; + int linenum = 0; + char section[256] = ""; + PM_DB *db = NULL; + + fp = fopen(file, "r"); + if(fp == NULL) { + return(0); + } + + while(fgets(line, PATH_MAX, fp)) { + linenum++; + _alpm_strtrim(line); + if(strlen(line) == 0 || line[0] == '#') { + continue; + } + if(line[0] == '[' && line[strlen(line)-1] == ']') { + /* new config section */ + ptr = line; + ptr++; + strncpy(section, ptr, min(255, strlen(ptr)-1)); + section[min(255, strlen(ptr)-1)] = '\0'; + _alpm_log(PM_LOG_DEBUG, _("config: new section '%s'\n"), section); + if(!strlen(section)) { + RET_ERR(PM_ERR_CONF_BAD_SECTION, -1); + } + if(!strcmp(section, "local")) { + RET_ERR(PM_ERR_CONF_LOCAL, -1); + } + if(strcmp(section, "options")) { + PMList *i; + int found = 0; + for(i = handle->dbs_sync; i && !found; i = i->next) { + pmdb_t *db = i->data; + if(!strcmp(db->treename, section)) { + found = 1; + } + } + if(!found) { + db = alpm_db_register(section); + if(db == NULL) { + /* pm_errno is set by alpm_db_register */ + return(-1); + } + /* start a new sync record */ + callback(section, db); + } + } + } else { + /* directive */ + ptr = line; + key = strsep(&ptr, "="); + if(key == NULL) { + RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); + } + _alpm_strtrim(key); + key = _alpm_strtoupper(key); + if(!strlen(section) && strcmp(key, "INCLUDE")) { + RET_ERR(PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, -1); + } + if(ptr == NULL) { + if(!strcmp(key, "NOPASSIVEFTP")) { + alpm_set_option(PM_OPT_NOPASSIVEFTP, (long)1); + } else if(!strcmp(key, "USESYSLOG")) { + alpm_set_option(PM_OPT_USESYSLOG, (long)1); + _alpm_log(PM_LOG_DEBUG, _("config: usesyslog\n")); + } else if(!strcmp(key, "ILOVECANDY")) { + alpm_set_option(PM_OPT_CHOMP, (long)1); + } else { + RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); + } + } else { + _alpm_strtrim(ptr); + if(!strcmp(key, "INCLUDE")) { + char conf[PATH_MAX]; + strncpy(conf, ptr, PATH_MAX); + _alpm_log(PM_LOG_DEBUG, _("config: including %s\n"), conf); + alpm_parse_config(conf, callback); + } else if(!strcmp(section, "options")) { + if(!strcmp(key, "NOUPGRADE")) { + char *p = ptr; + char *q; + while((q = strchr(p, ' '))) { + *q = '\0'; + if(alpm_set_option(PM_OPT_NOUPGRADE, (long)p) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: noupgrade: %s\n"), p); + p = q; + p++; + } + if(alpm_set_option(PM_OPT_NOUPGRADE, (long)p) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: noupgrade: %s\n"), p); + } else if(!strcmp(key, "NOEXTRACT")) { + char *p = ptr; + char *q; + while((q = strchr(p, ' '))) { + *q = '\0'; + if(alpm_set_option(PM_OPT_NOEXTRACT, (long)p) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: noextract: %s\n"), p); + p = q; + p++; + } + if(alpm_set_option(PM_OPT_NOEXTRACT, (long)p) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: noextract: %s\n"), p); + } else if(!strcmp(key, "IGNOREPKG")) { + char *p = ptr; + char *q; + while((q = strchr(p, ' '))) { + *q = '\0'; + if(alpm_set_option(PM_OPT_IGNOREPKG, (long)p) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: ignorepkg: %s\n"), p); + p = q; + p++; + } + if(alpm_set_option(PM_OPT_IGNOREPKG, (long)p) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: ignorepkg: %s\n"), p); + } else if(!strcmp(key, "HOLDPKG")) { + char *p = ptr; + char *q; + while((q = strchr(p, ' '))) { + *q = '\0'; + if(alpm_set_option(PM_OPT_HOLDPKG, (long)p) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: holdpkg: %s\n"), p); + p = q; + p++; + } + if(alpm_set_option(PM_OPT_HOLDPKG, (long)p) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: holdpkg: %s\n"), p); + } else if(!strcmp(key, "DBPATH")) { + /* shave off the leading slash, if there is one */ + if(*ptr == '/') { + ptr++; + } + if(alpm_set_option(PM_OPT_DBPATH, (long)ptr) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: dbpath: %s\n"), ptr); + } else if(!strcmp(key, "CACHEDIR")) { + /* shave off the leading slash, if there is one */ + if(*ptr == '/') { + ptr++; + } + if(alpm_set_option(PM_OPT_CACHEDIR, (long)ptr) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: cachedir: %s\n"), ptr); + } else if (!strcmp(key, "LOGFILE")) { + if(alpm_set_option(PM_OPT_LOGFILE, (long)ptr) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + _alpm_log(PM_LOG_DEBUG, _("config: log file: %s\n"), ptr); + } else if (!strcmp(key, "XFERCOMMAND")) { + if(alpm_set_option(PM_OPT_XFERCOMMAND, (long)ptr) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + } else if (!strcmp(key, "UPGRADEDELAY")) { + /* The config value is in days, we use seconds */ + _alpm_log(PM_LOG_DEBUG, _("config: UpgradeDelay: %i\n"), (60*60*24) * atol(ptr)); + if(alpm_set_option(PM_OPT_UPGRADEDELAY, (60*60*24) * atol(ptr)) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + } else if (!strcmp(key, "PROXYSERVER")) { + if(alpm_set_option(PM_OPT_PROXYHOST, (long)ptr) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + } else if (!strcmp(key, "PROXYPORT")) { + if(alpm_set_option(PM_OPT_PROXYPORT, (long)atoi(ptr)) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + } else { + RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); + } + } else { + if(!strcmp(key, "SERVER")) { + /* add to the list */ + _alpm_log(PM_LOG_DEBUG, _("config: %s: server: %s\n"), section, ptr); + if(alpm_db_setserver(db, strdup(ptr)) == -1) { + /* pm_errno is set by alpm_set_option */ + return(-1); + } + } else { + RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); + } + } + line[0] = '\0'; + } + } + } + fclose(fp); + + return(0); +} + hunk ./lib/libalpm/alpm.h 133 +/* Database registration callback */ +typedef void (*alpm_cb_db_register)(char *, PM_DB *); + hunk ./lib/libalpm/alpm.h 204 +int alpm_parse_config(char *file, alpm_cb_db_register callback); hunk ./lib/libalpm/alpm.h 458 - PM_ERR_PKG_HOLD + PM_ERR_PKG_HOLD, + /* Configuration file */ + PM_ERR_CONF_BAD_SECTION, + PM_ERR_CONF_LOCAL, + PM_ERR_CONF_BAD_SYNTAX, + PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION hunk ./lib/libalpm/error.c 125 + /* Config */ + case PM_ERR_CONF_BAD_SECTION: + return _("bad section name"); + case PM_ERR_CONF_LOCAL: + return _("'local' is reserved and cannot be used as a package tree"); + case PM_ERR_CONF_BAD_SYNTAX: + return _("syntax error"); + case PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION: + return _("all directives must belong to a section"); hunk ./lib/libalpm/util.c 620 + hunk ./src/pacman/conf.c 37 -#define min(X, Y) ((X) < (Y) ? (X) : (Y)) - hunk ./src/pacman/conf.c 73 - -int parseconfig(char *file) -{ - FILE *fp = NULL; - char line[PATH_MAX+1]; - char *ptr = NULL; - char *key = NULL; - int linenum = 0; - char section[256] = ""; - PM_DB *db = NULL; - - fp = fopen(file, "r"); - if(fp == NULL) { - return(0); - } - - while(fgets(line, PATH_MAX, fp)) { - linenum++; - strtrim(line); - if(strlen(line) == 0 || line[0] == '#') { - continue; - } - if(line[0] == '[' && line[strlen(line)-1] == ']') { - /* new config section */ - ptr = line; - ptr++; - strncpy(section, ptr, min(255, strlen(ptr)-1)); - section[min(255, strlen(ptr)-1)] = '\0'; - vprint(_("config: new section '%s'\n"), section); - if(!strlen(section)) { - ERR(NL, _("config: line %d: bad section name\n"), linenum); - return(1); - } - if(!strcmp(section, "local")) { - ERR(NL, _("config: line %d: '%s' is reserved and cannot be used as a package tree\n"), - linenum, section); - return(1); - } - if(strcmp(section, "options")) { - list_t *i; - int found = 0; - for(i = pmc_syncs; i && !found; i = i->next) { - sync_t *sync = i->data; - if(!strcmp(sync->treename, section)) { - found = 1; - } - } - if(!found) { - db = alpm_db_register(section); - if(db == NULL) { - ERR(NL, "could not register database (%s)\n", alpm_strerror(pm_errno)); - return(1); - } - /* start a new sync record */ - cb_db_register(section, db); - } - } - } else { - /* directive */ - ptr = line; - key = strsep(&ptr, "="); - if(key == NULL) { - ERR(NL, _("config: line %d: syntax error\n"), linenum); - return(1); - } - strtrim(key); - key = strtoupper(key); - if(!strlen(section) && strcmp(key, "INCLUDE")) { - ERR(NL, _("config: line %d: all directives must belong to a section\n"), linenum); - return(1); - } - if(ptr == NULL) { - if(!strcmp(key, "NOPASSIVEFTP")) { - if(alpm_set_option(PM_OPT_NOPASSIVEFTP, (long)1) == -1) { - ERR(NL, _("config: line %d: failed to set option NOPASSIVEFTP (%s)\n"), - linenum, alpm_strerror(pm_errno)); - return(1); - } - } else if(!strcmp(key, "USESYSLOG")) { - if(alpm_set_option(PM_OPT_USESYSLOG, (long)1) == -1) { - ERR(NL, _("failed to set option USESYSLOG (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: usesyslog\n")); - } else if(!strcmp(key, "ILOVECANDY")) { - if(alpm_set_option(PM_OPT_CHOMP, (long)1) == -1) { - ERR(NL, _("config: line %d: failed to set option CHOMP (%s)\n"), - linenum, alpm_strerror(pm_errno)); - return(1); - } - } else { - ERR(NL, _("config: line %d: syntax error\n"), linenum); - return(1); - } - } else { - strtrim(ptr); - if(!strcmp(key, "INCLUDE")) { - char conf[PATH_MAX]; - strncpy(conf, ptr, PATH_MAX); - vprint(_("config: including %s\n"), conf); - parseconfig(conf); - } else if(!strcmp(section, "options")) { - if(!strcmp(key, "NOUPGRADE")) { - char *p = ptr; - char *q; - while((q = strchr(p, ' '))) { - *q = '\0'; - if(alpm_set_option(PM_OPT_NOUPGRADE, (long)p) == -1) { - ERR(NL, _("failed to set option NOUPGRADE (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: noupgrade: %s\n"), p); - p = q; - p++; - } - if(alpm_set_option(PM_OPT_NOUPGRADE, (long)p) == -1) { - ERR(NL, _("failed to set option NOUPGRADE (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: noupgrade: %s\n"), p); - } else if(!strcmp(key, "NOEXTRACT")) { - char *p = ptr; - char *q; - while((q = strchr(p, ' '))) { - *q = '\0'; - if(alpm_set_option(PM_OPT_NOEXTRACT, (long)p) == -1) { - ERR(NL, _("failed to set option NOEXTRACT (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: noextract: %s\n"), p); - p = q; - p++; - } - if(alpm_set_option(PM_OPT_NOEXTRACT, (long)p) == -1) { - ERR(NL, _("failed to set option NOEXTRACT (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: noextract: %s\n"), p); - } else if(!strcmp(key, "IGNOREPKG")) { - char *p = ptr; - char *q; - while((q = strchr(p, ' '))) { - *q = '\0'; - if(alpm_set_option(PM_OPT_IGNOREPKG, (long)p) == -1) { - ERR(NL, _("failed to set option IGNOREPKG (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: ignorepkg: %s\n"), p); - p = q; - p++; - } - if(alpm_set_option(PM_OPT_IGNOREPKG, (long)p) == -1) { - ERR(NL, _("failed to set option IGNOREPKG (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: ignorepkg: %s\n"), p); - } else if(!strcmp(key, "HOLDPKG")) { - char *p = ptr; - char *q; - while((q = strchr(p, ' '))) { - *q = '\0'; - if(alpm_set_option(PM_OPT_HOLDPKG, (long)p) == -1) { - ERR(NL, _("failed to set option HOLDPKG (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: holdpkg: %s\n"), p); - p = q; - p++; - } - if(alpm_set_option(PM_OPT_HOLDPKG, (long)p) == -1) { - ERR(NL, _("failed to set option HOLDPKG (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: holdpkg: %s\n"), p); - } else if(!strcmp(key, "DBPATH")) { - /* shave off the leading slash, if there is one */ - if(*ptr == '/') { - ptr++; - } - if(alpm_set_option(PM_OPT_DBPATH, (long)ptr) == -1) { - ERR(NL, _("failed to set option DBPATH (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: dbpath: %s\n"), ptr); - } else if(!strcmp(key, "CACHEDIR")) { - /* shave off the leading slash, if there is one */ - if(*ptr == '/') { - ptr++; - } - if(alpm_set_option(PM_OPT_CACHEDIR, (long)ptr) == -1) { - ERR(NL, _("failed to set option CACHEDIR (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: cachedir: %s\n"), ptr); - } else if (!strcmp(key, "LOGFILE")) { - if(alpm_set_option(PM_OPT_LOGFILE, (long)ptr) == -1) { - ERR(NL, _("failed to set option LOGFILE (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - vprint(_("config: log file: %s\n"), ptr); - } else if (!strcmp(key, "XFERCOMMAND")) { - if(alpm_set_option(PM_OPT_XFERCOMMAND, (long)ptr) == -1) { - ERR(NL, _("config: line %d: failed to set option XFERCOMMAND (%s)\n"), - linenum, alpm_strerror(pm_errno)); - return(1); - } - } else if (!strcmp(key, "UPGRADEDELAY")) { - /* The config value is in days, we use seconds */ - vprint(_("config: UpgradeDelay: %i\n"), (60*60*24) * atol(ptr)); - if(alpm_set_option(PM_OPT_UPGRADEDELAY, (60*60*24) * atol(ptr)) == -1) { - ERR(NL, _("failed to set option UPGRADEDELAY (%s)\n"), alpm_strerror(pm_errno)); - return(1); - } - /* Warn when the delay is rather high (two months for now) */ - if (atol(ptr) > 60) - MSG(NL, _("Warning: UpgradeDelay is very high.\n" - "If a package is updated often it will never be upgraded.\n" - "Manually update such packages or use a lower value " - "to avoid this problem.\n")); - } else if (!strcmp(key, "PROXYSERVER")) { - if(alpm_set_option(PM_OPT_PROXYHOST, (long)ptr) == -1) { - ERR(NL, _("config: line %d: failed to set option PROXYHOST (%s)\n"), - linenum, alpm_strerror(pm_errno)); - return(1); - } - } else if (!strcmp(key, "PROXYPORT")) { - if(alpm_set_option(PM_OPT_PROXYPORT, (long)atoi(ptr)) == -1) { - ERR(NL, _("config: line %d: failed to set option PROXYPORT (%s)\n"), - linenum, alpm_strerror(pm_errno)); - return(1); - } - } else { - ERR(NL, _("config: line %d: syntax error\n"), linenum); - return(1); - } - } else { - if(!strcmp(key, "SERVER")) { - /* add to the list */ - vprint(_("config: %s: server: %s\n"), section, ptr); - if(alpm_db_setserver(db, strdup(ptr)) == -1) { - ERR(NL, "%s\n", alpm_strerror(pm_errno)); - return(1); - } - } else { - ERR(NL, _("config: line %d: syntax error\n"), linenum); - return(1); - } - } - line[0] = '\0'; - } - } - } - fclose(fp); - - return(0); -} hunk ./src/pacman/conf.h 66 -int parseconfig(char *file); +void cb_db_register(char *section, PM_DB *db); hunk ./src/pacman/pacman.c 517 - if(parseconfig(config->configfile) == -1) { + if(alpm_parse_config(config->configfile, cb_db_register) == -1) { + ERR(NL, _("failed to parse config (%s)\n"), alpm_strerror(pm_errno)); } From vmiklos at frugalware.org Sun Sep 3 04:43:27 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 04:43:38 2006 Subject: [Frugalware-darcs] pacman: move config->chomp to PM_OPT_CHOMP Message-ID: <20060903024327.EC3CA4E88F9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903014802-e2957-4b4a8bf1b0c0b0910f4f8b15e67afe188bf5963b.gz; [move config->chomp to PM_OPT_CHOMP VMiklos **20060903014802 since all the frontends can have their own eye-candy features ] { hunk ./lib/libalpm/alpm.h 116 - PM_OPT_HOLDPKG + PM_OPT_HOLDPKG, + PM_OPT_CHOMP hunk ./lib/libalpm/handle.c 302 + case PM_OPT_CHOMP: + handle->chomp = (unsigned short)data; + _alpm_log(PM_LOG_FLOW2, _("PM_OPT_CHOMP set to '%d'"), handle->chomp); + break; hunk ./lib/libalpm/handle.c 347 + case PM_OPT_CHOMP: *data = handle->chomp; break; hunk ./lib/libalpm/handle.h 58 + unsigned short chomp; /* if eye-candy features should be enabled or not */ hunk ./src/pacman/conf.c 164 - config->chomp = 1; + if(alpm_set_option(PM_OPT_CHOMP, (long)1) == -1) { + ERR(NL, _("config: line %d: failed to set option CHOMP (%s)\n"), + linenum, alpm_strerror(pm_errno)); + return(1); + } hunk ./src/pacman/conf.h 60 - /* configuration file option */ - unsigned short chomp; hunk ./src/pacman/download.c 66 + int chomp; hunk ./src/pacman/download.c 77 + alpm_get_option(PM_OPT_CHOMP, (long *)&chomp); + hunk ./src/pacman/download.c 110 - if(config->chomp) { + if(chomp) { } From vmiklos at frugalware.org Sun Sep 3 04:43:29 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 04:43:39 2006 Subject: [Frugalware-darcs] pacman: parseconfig(): no longer touch the config struct Message-ID: <20060903024329.9F29E4E8BD0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903015037-e2957-ce2a090749cff8272ce615ed7aa0a2e92d425ef5.gz; [parseconfig(): no longer touch the config struct VMiklos **20060903015037 this is obviously to allow moving this function to libalpm ] { hunk ./src/pacman/conf.c 76 -int parseconfig(char *file, config_t *config) +int parseconfig(char *file) hunk ./src/pacman/conf.c 86 - if(config == NULL) { - return(-1); - } - hunk ./src/pacman/conf.c 175 - parseconfig(conf, config); + parseconfig(conf); hunk ./src/pacman/conf.h 66 -int parseconfig(char *file, config_t *config); +int parseconfig(char *file); hunk ./src/pacman/pacman.c 517 - if(parseconfig(config->configfile, config) == -1) { + if(parseconfig(config->configfile) == -1) { } From vmiklos at frugalware.org Sun Sep 3 04:43:30 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 04:43:39 2006 Subject: [Frugalware-darcs] pacman: pacman: new function: cb_db_register() Message-ID: <20060903024330.222924E8C2B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903002203-e2957-07fed5f3aa05610d6b855682f592959652545af1.gz; [pacman: new function: cb_db_register() VMiklos **20060903002203 this will allow us to move parseconfig() to libalpm later ] { hunk ./src/pacman/conf.c 68 +void cb_db_register(char *section, PM_DB *db) +{ + sync_t *sync; + + MALLOC(sync, sizeof(sync_t)); + sync->treename = strdup(section); + sync->db = db; + pmc_syncs = list_add(pmc_syncs, sync); +} + hunk ./src/pacman/conf.c 86 - sync_t *sync = NULL; + PM_DB *db = NULL; hunk ./src/pacman/conf.c 123 - sync = (sync_t *)i->data; + sync_t *sync = i->data; hunk ./src/pacman/conf.c 129 - /* start a new sync record */ - MALLOC(sync, sizeof(sync_t)); - sync->treename = strdup(section); - sync->db = alpm_db_register(sync->treename); - if(sync->db == NULL) { + db = alpm_db_register(section); + if(db == NULL) { hunk ./src/pacman/conf.c 134 - pmc_syncs = list_add(pmc_syncs, sync); + /* start a new sync record */ + cb_db_register(section, db); hunk ./src/pacman/conf.c 312 - if(alpm_db_setserver(sync->db, strdup(ptr)) == -1) { + if(alpm_db_setserver(db, strdup(ptr)) == -1) { } From vmiklos at frugalware.org Sun Sep 3 04:43:28 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 04:43:40 2006 Subject: [Frugalware-darcs] pacman: pacman: in parseconfig() don't touch config->dbpath/cachedir, use alpm_set_option() directly Message-ID: <20060903024329.0212B4E8B4E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903013128-e2957-2899b917c36e84fa34e2e2e9f66e5f2bf16e0963.gz; [pacman: in parseconfig() don't touch config->dbpath/cachedir, use alpm_set_option() directly VMiklos **20060903013128] { hunk ./src/pacman/conf.c 59 - FREE(config->dbpath); - FREE(config->cachedir); hunk ./src/pacman/conf.c 254 - FREE(config->dbpath); - config->dbpath = strdup(ptr); + if(alpm_set_option(PM_OPT_DBPATH, (long)ptr) == -1) { + ERR(NL, _("failed to set option DBPATH (%s)\n"), alpm_strerror(pm_errno)); + return(1); + } hunk ./src/pacman/conf.c 264 - FREE(config->cachedir); - config->cachedir = strdup(ptr); + if(alpm_set_option(PM_OPT_CACHEDIR, (long)ptr) == -1) { + ERR(NL, _("failed to set option CACHEDIR (%s)\n"), alpm_strerror(pm_errno)); + return(1); + } hunk ./src/pacman/pacman.c 570 - if(config->dbpath == NULL) { - config->dbpath = strdup(PM_DBPATH); - } else { - /* dbpath has been set by parseargs or parseconfig */ - if(alpm_set_option(PM_OPT_DBPATH, (long)config->dbpath) == -1) { - ERR(NL, _("failed to set option DBPATH (%s)\n"), alpm_strerror(pm_errno)); - cleanup(1); - } - } - if(alpm_set_option(PM_OPT_CACHEDIR, (long)config->cachedir) == -1) { - ERR(NL, _("failed to set option CACHEDIR (%s)\n"), alpm_strerror(pm_errno)); - cleanup(1); - } + FREE(config->dbpath); + alpm_get_option(PM_OPT_DBPATH, (long *)&config->dbpath); + FREE(config->cachedir); + alpm_get_option(PM_OPT_CACHEDIR, (long *)&config->cachedir); } From vmiklos at frugalware.org Sun Sep 3 05:13:36 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 05:13:42 2006 Subject: [Frugalware-darcs] pacman: _alpm_remove_commit(): clean up this unnecessary 'what' variable Message-ID: <20060903031336.9CDCB4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903030321-e2957-4ab52160f3b06876b909ee7b0219a7c11ada900e.gz; [_alpm_remove_commit(): clean up this unnecessary 'what' variable VMiklos **20060903030321] { hunk ./lib/libalpm/remove.c 164 - char line[PATH_MAX+1], *what; + char line[PATH_MAX+1]; hunk ./lib/libalpm/remove.c 181 - if((what = (char *)malloc(strlen(info->name)+1)) == NULL) { - RET_ERR(PM_ERR_MEMORY, -1); - } - STRNCPY(what, info->name, strlen(info->name)+1); hunk ./lib/libalpm/remove.c 263 - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, what, (double)(percent * 100), _alpm_list_count(trans->packages), (_alpm_list_count(trans->packages) - _alpm_list_count(targ) +1)); + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (double)(percent * 100), _alpm_list_count(trans->packages), (_alpm_list_count(trans->packages) - _alpm_list_count(targ) +1)); hunk ./lib/libalpm/remove.c 337 - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, what, 100, _alpm_list_count(trans->packages), (_alpm_list_count(trans->packages) - _alpm_list_count(targ) +1)); - FREE(what); + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 100, _alpm_list_count(trans->packages), (_alpm_list_count(trans->packages) - _alpm_list_count(targ) +1)); } From alex at alex-smith.me.uk Sun Sep 3 08:58:47 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 08:58:51 2006 Subject: [Frugalware-darcs] frugalware-current: libsexy-0.1.9-1-x86_64 Message-ID: <20060903065847.F35034E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903075739-46e39-2653704f53cb5da107ba5ee72ccba82e0b56b7bb.gz; [libsexy-0.1.9-1-x86_64 AlexExtreme **20060903075739 * Version bump ] { hunk ./source/gnome/libsexy/FrugalBuild 1 -# Last modified: Thu, 08 Jun 2006 19:37:34 +0100 +# Last modified: Sun, 03 Sep 2006 08:57:10 +0100 hunk ./source/gnome/libsexy/FrugalBuild 6 -pkgver=0.1.8 -pkgrel=2 +pkgver=0.1.9 +pkgrel=1 hunk ./source/gnome/libsexy/FrugalBuild 17 -sha1sums=('3b068533e959ebdc3c47bff49ab9d6c953298cc2') - -build() { - if [ "$CARCH" != "x86_64" ]; then - Fbuild --enable-gtk-doc - else - Fbuild - fi -} +sha1sums=('f499e98a178b8d932805f190200c60c05e3b6333') +Fconfopts="$Fconfopts --enable-gtk-doc" } From alex at alex-smith.me.uk Sun Sep 3 09:20:21 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 09:20:26 2006 Subject: [Frugalware-darcs] frugalware-current: beagle-0.2.9-1-x86_64 Message-ID: <20060903072022.C5B1A4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903081842-46e39-134ef54e95b39625a2370fef0085da02ecb01c7f.gz; [beagle-0.2.9-1-x86_64 AlexExtreme **20060903081842 * Version bump ] { hunk ./source/gnome-extra/beagle/FrugalBuild 1 -# Last modified: Wed, 30 Aug 2006 20:57:11 +0100 +# Last modified: Sun, 03 Sep 2006 09:15:05 +0100 hunk ./source/gnome-extra/beagle/FrugalBuild 6 -pkgver=0.2.8 -pkgrel=4 +pkgver=0.2.9 +pkgrel=1 hunk ./source/gnome-extra/beagle/FrugalBuild 10 -depends=('gecko-sharp' 'gmime>=2.1.19' 'libexif' 'sqlite3' 'scrnsaverproto' 'libxscrnsaver' 'perl-xml' \ +depends=('gecko-sharp' 'gmime>=2.1.19' 'libexif' 'sqlite3' 'libxscrnsaver' 'perl-xml' \ hunk ./source/gnome-extra/beagle/FrugalBuild 12 -makedepends=('intltool' 'pygtk' 'zip' 'epiphany-extensions' 'unzip' 'evolution-sharp' 'python' 'thunderbird') +makedepends=('intltool' 'pygtk' 'zip' 'epiphany-extensions' 'unzip' 'evolution-sharp' 'python' 'thunderbird' 'scrnsaverproto') hunk ./source/gnome-extra/beagle/FrugalBuild 16 -Finclude gnome -source=(${source[@]} $pkgname-$pkgver-use-epiphany-2-15.patch beagled.desktop) -sha1sums=('1439865b0655e78ba6507e99bad70f2af0301f67' \ +Finclude gnome mono +source=(${source[@]} $pkgname-0.2.8-use-epiphany-2-15.patch beagled.desktop) +sha1sums=('c37c21f17b4e598fa5466d6e80b18f252354e8a3' \ hunk ./source/gnome-extra/beagle/FrugalBuild 32 - # Die Mono crap - export MONO_SHARED_DIR=$Fsrcdir/weird - mkdir -p $MONO_SHARED_DIR + Fmonoexport hunk ./source/gnome-extra/beagle/FrugalBuild 74 - rm -rf $MONO_SHARED_DIR + Fmonocleanup } From alex at alex-smith.me.uk Sun Sep 3 09:42:50 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 09:42:55 2006 Subject: [Frugalware-darcs] frugalware-current: obby-0.4.1-1-x86_64 Message-ID: <20060903074250.27CBF4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903084114-46e39-996c0b561a3ba9ba6bfff41dc75e9b1016667a94.gz; [obby-0.4.1-1-x86_64 AlexExtreme **20060903084114 * New package ] { adddir ./source/lib-extra/obby addfile ./source/lib-extra/obby/FrugalBuild hunk ./source/lib-extra/obby/FrugalBuild 1 +# Last Modified: Sun, 03 Sep 2006 09:39:56 +0100 +# Compiling Time: 0.49 SBU +# Maintainer: AlexExtreme + +pkgname=obby +pkgver=0.4.1 +pkgrel=1 +pkgdesc="libobby is a library which provides synced document buffers." +url="http://releases.0x539.de/obby/" +depends=('libsigc++2' 'avahi-compat' 'net6') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | sed '/latest/d' | sed '/stable/d' | Flasttar" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('57c716542ab7d7385acf4cfad244f9c7510b84d6') +Fconfopts="$Fconfopts --with-zeroconf --enable-ipv6" + +# optimization OK } From alex at alex-smith.me.uk Sun Sep 3 10:16:48 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 10:16:50 2006 Subject: [Frugalware-darcs] frugalware-current: gobby-0.4.1-1-x86_64 Message-ID: <20060903081648.C46CF4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903091502-46e39-7b583dec3390965153e7ebbfebce86ed69327c9f.gz; [gobby-0.4.1-1-x86_64 AlexExtreme **20060903091502 * New package ] { adddir ./source/gnome-extra/gobby addfile ./source/gnome-extra/gobby/FrugalBuild hunk ./source/gnome-extra/gobby/FrugalBuild 1 +# Last Modified: Sun, 03 Sep 2006 10:12:23 +0100 +# Compiling Time: 0.49 SBU +# Maintainer: AlexExtreme + +pkgname=gobby +pkgver=0.4.1 +pkgrel=1 +pkgdesc="Gobby is a collaborative text editor" +url="http://releases.0x539.de/gobby/" +depends=('obby' 'libgnomeprint>=2.12.1-2' 'gtkmm>=2.10.1' 'gtksourceview' 'libxml++' 'gnome-vfs>=2.15.92') +groups=('gnome-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | sed '/latest/d' | sed '/stable/d' | Flasttar" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('2d4d9746231de413fcb05a09fd1427400acc6121') +_F_gnome_desktop=y +Finclude gnome-scriptlet +Fconfopts="$Fconfopts --with-gnome" + +# optimization OK } From alex at alex-smith.me.uk Sun Sep 3 11:05:50 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 11:05:52 2006 Subject: [Frugalware-darcs] frugalware-current: gdm-2.15.10-2-x86_64 Message-ID: <20060903090550.63D174E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903100431-46e39-aea6f06c1f8e1eb6b9540fb22fee70c3ea5b2f8b.gz; [gdm-2.15.10-2-x86_64 AlexExtreme **20060903100431 * New GDM theme. It's really great :) ] { hunk ./source/gnome/gdm/FrugalBuild 1 -# Last modified: Fri, 25 Aug 2006 10:27:58 +0100 +# Last modified: Sun, 03 Sep 2006 11:02:38 +0100 hunk ./source/gnome/gdm/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/gnome/gdm/FrugalBuild 19 - http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.5.tar.bz2) + http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.5-2.tar.bz2) hunk ./source/gnome/gdm/FrugalBuild 23 - 'a1d7b2f6c15025e81e449502a4f274c35fa7b230') + 'c6047145ca87f6c82e7a1f04b7112086eec53754') } From crazy at frugalware.org Sun Sep 3 11:39:27 2006 From: crazy at frugalware.org (crazy) Date: Sun Sep 3 11:39:29 2006 Subject: [Frugalware-darcs] frugalware-current: xmlrpc-c-1.06.04-1-i686 Message-ID: <20060903093927.2A92E4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060901224527-f6986-e77f171e9980f5a915ecbf57fe93617a27ee6b8b.gz; [xmlrpc-c-1.06.04-1-i686 crazy **20060901224527 * new package * added already an x86_64 patch :-) goto: -> helicon :D ] { adddir ./source/network-extra/xmlrpc-c addfile ./source/network-extra/xmlrpc-c/FrugalBuild addfile ./source/network-extra/xmlrpc-c/no-O3s-thx.patch addfile ./source/network-extra/xmlrpc-c/use-fPIC-x86_64.patch hunk ./source/network-extra/xmlrpc-c/FrugalBuild 1 +# Last Modified: Sat, 02 Sep 2006 00:42:28 +0200 +# Compiling Time: 0.31 SBU +# Maintainer: crazy + +pkgname=xmlrpc-c +pkgver=1.06.04 +pkgrel=1 +pkgdesc="This library provides a modular implementation of XML-RPC for C and C++." +url="http://xmlrpc-c.sourceforge.net/" +depends=('curl' 'libstdc++' 'libxml2') +groups=('network-extra') +archs=('i686') +up2date="lynx -dump 'http://prdownloads.sourceforge.net/xmlrpc-c/?sort_by=date'|grep '.tgz'|sort -r|head -n 1|sed -e 's|.*/||g' -e 's/.*-c-\(.*\).t.*/\1/'" +source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz no-O3s-thx.patch use-fPIC-x86_64.patch) +sha1sums=('48de38928bcacd9548963edca93bbf0c3ea49b7e' \ + '74fa3a548767ed47010100a636b7159158dd5102' \ + '6e0ddecbd3dd2e8d415a240ab0a9d00df59d22eb') + +build() +{ + Fcd + Fpatchall + Fconf \ + --enable-libxml2-backend \ + --disable-wininet-client \ + --disable-libwww-client + make CFLAGS_PERSONAL="${CFLAGS}" || Fdie + Fmakeinstall +} + +# optimization OK hunk ./source/network-extra/xmlrpc-c/no-O3s-thx.patch 1 +diff -Naur xmlrpc-c-1.06.04/Makefile.common xmlrpc-c-1.06.04-p/Makefile.common +--- xmlrpc-c-1.06.04/Makefile.common 2006-08-30 04:59:05.000000000 +0200 ++++ xmlrpc-c-1.06.04-p/Makefile.common 2006-09-02 00:24:52.178643032 +0200 +@@ -32,7 +32,7 @@ + CXXFLAGS_COMMON = -DNDEBUG + + ifeq ($(C_COMPILER_GNU),yes) +- CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3 ++ CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g + endif + + ifeq ($(CXX_COMPILER_GNU),yes) hunk ./source/network-extra/xmlrpc-c/use-fPIC-x86_64.patch 1 +diff -u xmlrpc-c-1.06.04/src/cpp/Makefile xmlrpc-c-1.06.04-p/src/cpp/Makefile +--- xmlrpc-c-1.06.04/src/cpp/Makefile 2006-06-19 16:16:46.000000000 +0200 ++++ xmlrpc-c-1.06.04-p/src/cpp/Makefile 2006-09-02 00:30:10.422262648 +0200 +@@ -136,7 +136,7 @@ + # RULES TO COMPILE OBJECT MODULES FOR LIBRARIES + #----------------------------------------------------------------------------- + +-CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) ++CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) -fPIC + + XmlRpcCpp.o:%.o:%.cpp + $(CXX) -c $(BASIC_INCLUDES) $(CXXFLAGS) $< +Gemeinsame Unterverzeichnisse: xmlrpc-c-1.06.04/src/cpp/test und xmlrpc-c-1.06.04-p/src/cpp/test. } From alex at alex-smith.me.uk Sun Sep 3 11:44:16 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 11:44:18 2006 Subject: [Frugalware-darcs] frugalware-current: sexy-python-0.1.9-1-x86_64 Message-ID: <20060903094416.7EA454E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903104259-46e39-7ed640ec82afe2ccf26e60ad0e813a33c2f0922d.gz; [sexy-python-0.1.9-1-x86_64 AlexExtreme **20060903104259 * New package ] { adddir ./source/gnome/sexy-python addfile ./source/gnome/sexy-python/FrugalBuild hunk ./source/gnome/sexy-python/FrugalBuild 1 +# Last modified: Sun, 03 Sep 2006 11:41:30 +0100 +# Compiling time: 0.09 SBU +# Maintainer: AlexExtreme + +pkgname=sexy-python +pkgver=0.1.9 +pkgrel=1 +pkgdesc="Python bindings for libsexy" +url="http://www.chipx86.com/wiki/Libsexy" +depends=('libsexy>=0.1.9' 'pygtk>=2.9.6-3') +groups=('gnome') +archs=('i686' 'x86_64') +source=(http://releases.chipx86.com/libsexy/$pkgname/$pkgname-$pkgver.tar.gz) +up2date="lynx -dump http://releases.chipx86.com/libsexy/sexy-python | Flasttar" +options=('scriptlet') +sha1sums=('9fe24366512258cd6254f42e51dbb71f9f6bb6cb') + +# optimization OK } From vmiklos at frugalware.org Sun Sep 3 13:14:18 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 13:14:20 2006 Subject: [Frugalware-darcs] frugalwareutils: added Polish translations Message-ID: <20060903111418.86C284E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalwareutils;a=darcs_commitdiff;h=20060903111053-e2957-216c014b5dac1582a83bfc35e17f2ec0dd3393c6.gz; [added Polish translations VMiklos **20060903111053 from Piotr Maliński closes #1098 ] { addfile ./grubconfig/po/pl.po addfile ./libfwdialog/po/pl.po addfile ./libfwnetconfig/po/pl.po addfile ./libfwxconfig/po/pl.po addfile ./libfwxwmconfig/po/pl.po addfile ./mouseconfig/po/pl.po addfile ./netconfig/po/pl.po addfile ./raidconfig/po/pl.po addfile ./setup/po/pl.po addfile ./timeconfig/po/pl.po addfile ./xconfig/po/pl.po addfile ./xwmconfig/po/pl.po hunk ./grubconfig/po/Makefile 19 -LANGS=hu +LANGS=hu pl hunk ./grubconfig/po/pl.po 1 +# Hungarian translations for grubconfig package. +# Copyright (C) 2006 THE grubconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the grubconfig package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: grubconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../grubconfig.c:39 ../grubconfig.c:56 +msgid "MBR" +msgstr "MBR" + +#: ../grubconfig.c:39 +msgid "Install to Master Boot Record" +msgstr "Zainstaluj w głównym rekordzie rozruchomym" + +#: ../grubconfig.c:40 ../grubconfig.c:58 +msgid "Floppy" +msgstr "Dyskietka" + +#: ../grubconfig.c:40 +msgid "Install to a formatted floppy in /dev/fd0" +msgstr "Zainstaluj na sformatowan± dyskietkê w /dev/fd0" + +#. see see http://lists.gnu.org/archive/html/bug-grub/2003-11/msg00085.html +#: ../grubconfig.c:42 ../grubconfig.c:60 +msgid "Root" +msgstr "Root" + +#: ../grubconfig.c:42 +msgid "Install to superblock (do NOT use with XFS)" +msgstr "Instaluj do superbloku (NIE stosowaæ z XFS)" + +#: ../grubconfig.c:43 ../grubconfig.c:62 +msgid "Skip" +msgstr "Pomiń" + +#: ../grubconfig.c:43 +msgid "Skip the installation of GRUB." +msgstr "Pomiń instalacjê GRUBa" + +#: ../grubconfig.c:48 +msgid "Installing GRUB bootloader" +msgstr "Instalujê GRUBa" + +#: ../grubconfig.c:49 +msgid "" +"GRUB can be installed to a variety of places:\n" +"\n" +"\t1. The Master Boot Record of your first hard drive.\n" +"\t2. A formatted floppy disk.\n" +"\t3. The superblock of your root Linux partition.\n" +"\n" +"Option 3 require setting the partition bootable with (c)fdisk\n" +"Hint: Choose option 3 if you already have a boot manager installed.\n" +"Which option would you like?" +msgstr "" +"GRUB może byæ zainstalowany na kilka sposobów:\n" +"\n" +"\t1. MBR dysku.\n" +"\t2. Dyskietka.\n" +"\t3. Superblok głównej partycji systemu.\n" +"\n" +"Opcja 3 wymaga ustawienia partycji bootowalnej za pomoc± np. (c)fdisk\n" +"Zazywczaj stosuje siê opcjê nr 1.\n" +"Wybierz sposób instalacji GRUBa" + +#: ../grubconfig.c:77 +msgid "GRUB bootloader" +msgstr "GRUB bootloader" + +#: ../grubconfig.c:83 +msgid "Please wait" +msgstr "Proszê czekaæ" + +#: ../grubconfig.c:83 +msgid "Attemping to install the GRUB bootloader..." +msgstr "Próbujê zainstalowaæ GRUBa..." hunk ./libfwdialog/po/Makefile 19 -LANGS=fr hu +LANGS=fr hu pl hunk ./libfwdialog/po/pl.po 1 +# Hungarian translations for libfwdialog package. +# Copyright (C) 2006 THE libfwdialog'S COPYRIGHT HOLDER +# This file is distributed under the same license as the libfwdialog package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: libfwdialog\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../libfwdialog.c:48 +msgid "Setup" +msgstr "Konfiguracja" + +#: ../libfwdialog.c:57 +msgid "Exit" +msgstr "WyjdŒ" + +#: ../libfwdialog.c:57 +msgid "Are you sure you want to exit?" +msgstr "Na pewno chcesz wyj¶æ?" hunk ./libfwnetconfig/po/Makefile 19 -LANGS=fr hu +LANGS=fr hu pl hunk ./libfwnetconfig/po/pl.po 1 +# Hungarian translations for libfwnetconfig package. +# Copyright (C) 2006 THE libfwnetconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the libfwnetconfig package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: libfwnetconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../libfwnetconfig.c:81 +#, c-format +msgid "%s: No such profile!\n" +msgstr "%s: Brak takiego profilu!\n" + +#: ../libfwnetconfig.c:101 +#, c-format +msgid "profile: line %d: bad interface name\n" +msgstr "profil: wiersz %d. zła nazwa interfejsu\n" + +#: ../libfwnetconfig.c:132 +#, c-format +msgid "profile: line %d: syntax error\n" +msgstr "profil: wiersz %d. bł±d składniowy\n" + +#: ../libfwnetconfig.c:139 +#, c-format +msgid "profile: line %d: all directives must belong to a section\n" +msgstr "profil: wiersz %d. wszystkie dyrektywy musz± należeń do sekcji\n" hunk ./libfwxconfig/po/Makefile 19 -LANGS=fr hu +LANGS=fr hu pl hunk ./libfwxconfig/po/pl.po 1 +# Hungarian translations for xconfig-helper package. +# Copyright (C) 2006 THE xconfig-helper'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xconfig-helper package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: xconfig-helper\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../xconfig-helper.c:42 +#, c-format +msgid "" +"xmessage -buttons OK:1 -center -timeout 1 \"If you see this message, click " +"OK within 10 seconds. Elapsed time: %d second(s).\"" +msgstr "" +"xmessage -buttons OK:1 -center -timeout 1 \"Jeżeli zobaczysz t± wiadomo¶æ, kliknij OK w " +"przeci±gu 10 sekund. Czas: %d (sekund).\"" hunk ./libfwxwmconfig/po/Makefile 19 -LANGS=hu +LANGS=hu pl hunk ./libfwxwmconfig/po/pl.po 1 +# Hungarian translations for libfwxwmconfig package. +# Copyright (C) 2006 THE libfwxwmconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the libfwxwmconfig package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: libfwxwmconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../libfwxwmconfig.c:128 +msgid "K Desktop Environment" +msgstr "Šrodowisko KDE" + +#: ../libfwxwmconfig.c:130 +msgid "A lightweight desktop environment." +msgstr "Lekkie ¶rodowisko graficzne." + +#: ../libfwxwmconfig.c:132 +msgid "--- No description, please report! ---" +msgstr "--- Brak opisu, proszê to zgłosiæ! ---" hunk ./mouseconfig/po/Makefile 19 -LANGS=fr hu +LANGS=fr hu pl hunk ./mouseconfig/po/pl.po 1 +# Hungarian translations for mouseconfig package. +# Copyright (C) 2006 THE mouseconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the mouseconfig package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: mouseconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../mouseconfig.c:41 +msgid "PS/2 port mouse (most desktops and laptops)" +msgstr "Mysza na porcie PS/2 (wiêkszo¶æ laptopów i komputerów)" + +#: ../mouseconfig.c:42 +msgid "Microsoft PS/2 Intellimouse" +msgstr "Microsoft PS/2 Intellimouse" + +#: ../mouseconfig.c:43 +msgid "2 button Microsoft compatible serial mouse" +msgstr "2 przyciskowa mysza szeregowa (zgodna z Microsoft)" + +#: ../mouseconfig.c:44 +msgid "3 button Microsoft compatible serial mouse" +msgstr "3 przyciskowa mysza szeregowa (zgodna z Microsoft)" + +#: ../mouseconfig.c:45 +msgid "Logitech serial MouseMan and similar devices" +msgstr "Szeregowy MouseMan Logitechu i podobne urz±dzenia" + +#: ../mouseconfig.c:46 +msgid "MouseSystems serial (most 3 button serial mice)" +msgstr "Szeregowa mysz MouseSystems (wiêkszo¶æ 3 przyciskowych)" + +#: ../mouseconfig.c:47 +msgid "Plug and Play (serial mice that do not work with ms)" +msgstr "Plug and Play (szeregowe mysze nie działaj±ce z ms)" + +#: ../mouseconfig.c:48 +msgid "USB connected mouse" +msgstr "Mysza na USB" + +#: ../mouseconfig.c:49 +msgid "Microsoft serial Intellimouse" +msgstr "Microsoft Intellimouse" + +#: ../mouseconfig.c:50 +msgid "Genius Netmouse on PS/2 port" +msgstr "Genius Netmouse na porcie PS/2" + +#: ../mouseconfig.c:51 +msgid "Some serial Logitech devices" +msgstr "Urz±dzenia szeregowe Logitechu" + +#: ../mouseconfig.c:52 +msgid "Make serial Logitech behave like msc" +msgstr "Ustaw urz±dzenia Logitechu jako myszy" + +#: ../mouseconfig.c:53 +msgid "ATI XL busmouse (mouse card)" +msgstr "ATI XL busmouse (mouse card)" + +#: ../mouseconfig.c:54 +msgid "Microsoft busmouse (mouse card)" +msgstr "Microsoft busmouse (mouse card)" + +#: ../mouseconfig.c:55 +msgid "Logitech busmouse (mouse card)" +msgstr "Logitech busmouse (mouse card)" + +#: ../mouseconfig.c:56 +msgid "A pointing pen (NCR3125) on some laptops" +msgstr "Pióro wskazuj±ce (NRC3125)" + +#: ../mouseconfig.c:57 +msgid "Twiddler keyboard, by HandyKey Corp" +msgstr "Twiddler keyboard, by HandyKey Corp" + +#: ../mouseconfig.c:58 +msgid "Genitizer tablet (relative mode)" +msgstr "Tablet Genitizer" + +#: ../mouseconfig.c:59 +msgid "Use a joystick as a mouse" +msgstr "Użyj joysticka jako mysz" + +#: ../mouseconfig.c:60 +msgid "Wacom serial graphics tablet" +msgstr "Tablet Wacoma" + +#: ../mouseconfig.c:64 +msgid "Configure the console mouse support (GPM)" +msgstr "Konfiguracja wsparcia myszy dla konsoli (GPM)" + +#: ../mouseconfig.c:65 +msgid "" +"This part of the configuration process will create a /dev/mouse link " +"pointing to your default mouse device. You can change the /dev/mouse link " +"later in the /etc/sysconfig/gpm configuration file if the mouse doesn't " +"work, or if you switch to a different type of pointing device. We will also " +"use the information about the mouse to set the correct protocol for gpm, the " +"Linux mouse server. Please select a mouse type from the list below:" +msgstr "" +"Ta czê¶æ konfiguracji utworzy symlink /dev/mouse wskazuj±cy " +"na twoj± domy¶ln± mysz. Możesz zmieniæ symlink póŒniej " +"w /etc/sysconfig/gpm. Proszê wybraæ typ myszy z poniższej listy:" + +#: ../mouseconfig.c:77 +msgid "(COM1: under DOS)" +msgstr "(COM1: pod DOS)" + +#: ../mouseconfig.c:78 +msgid "(COM2: under DOS)" +msgstr "(COM2: pod DOS)" + +#: ../mouseconfig.c:79 +msgid "(COM3: under DOS)" +msgstr "(COM3: pod DOS)" + +#: ../mouseconfig.c:80 +msgid "(COM4: under DOS)" +msgstr "(COM4: pod DOSC)" + +#: ../mouseconfig.c:84 +msgid "Select Serial Port" +msgstr "Wybierz Port Szeregowy" + +#: ../mouseconfig.c:85 +msgid "Your mouse requires a serial port. Which one would you like to use?" +msgstr "Mysza wymaga portu szeregowego. Który wybraæ?" + +#: ../mouseconfig.c:99 +msgid "Mouse configuration" +msgstr "Konfiguracja myszy" hunk ./netconfig/po/Makefile 19 -LANGS=fr hu +LANGS=fr hu pl hunk ./netconfig/po/pl.po 1 +# translation of hu.po to +# Hungarian translations for netconfig package. +# Copyright (C) 2006 THE netconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the netconfig package. +# +# , 2006. +# VMiklos , 2006. +msgid "" +msgstr "" +"Project-Id-Version: hu\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../netconfig.c:44 +#, c-format +msgid "usage: %s [options] start|stop|restart|status|list\n" +msgstr "użycie: %s [opcje] start|stop|restart|status|list\n" + +#: ../netconfig.c:45 +#, c-format +msgid " %s [options] [profile]\n" +msgstr " %s [opcje] [profil]\n" + +#: ../netconfig.c:46 +#, c-format +msgid "-h | --help This help.\n" +msgstr "-h | --help Pomoc.\n" + +#: ../netconfig.c:47 +#, c-format +msgid "-f | --fast Fast mode, used by the setup.\n" +msgstr "-f | --fast Tryb szybki, używany przez konfigurator.\n" + +#: ../netconfig.c:48 +#, c-format +msgid " --dry-run Do not actually perform the operation.\n" +msgstr "" +" --dry-run Nie wykonuj żadnych operacji (symulacja).\n" + +#: ../netconfig.c:57 +msgid "Use a DHCP server" +msgstr "Użyj serwera DHCP" + +#: ../netconfig.c:58 +msgid "Use a static IP address" +msgstr "Użyj statycznego IP" + +#: ../netconfig.c:59 +msgid "DSL connection" +msgstr "Poł±czenie DSL" + +#: ../netconfig.c:60 +msgid "No network - loopback connection only" +msgstr "Brak poł±czenia sieciowego" + +#: ../netconfig.c:62 +msgid "Select network connection type" +msgstr "Wybierz typ poł±czenia sieciowego" + +#: ../netconfig.c:63 +msgid "" +"Now we need to know how your machine connects to the network.\n" +"If you have an internal network card and an assigned IP address, gateway, " +"and DNS, use 'static' to enter these values. Also may use this if you have a " +"DSL connection.\n" +"If your IP address is assigned by a DHCP server (commonly used by cable " +"modem services), select 'dhcp'. \n" +"If you just have a network card to connect directly to a DSL modem, then " +"select 'dsl'. \n" +"Finally, if you do not have a network card, select the 'lo' choice. \n" +msgstr "" +"Jeżeli masz kartê sieciow± i przypisane IP, bramkê i DNSy to użyj opcji ze statycznym IP. " +"Jeżeli IP przypisane jest przez serwer DHCP użyj opcji z serwerem DHCP. Jeżeli korzystasz " +"z poł±czeń DSL wybierz opcjê dotycz±c± tych poł±czeń.\n" + +#: ../netconfig.c:80 +msgid "DSL configuration" +msgstr "Konfiguracja DSL" + +#: ../netconfig.c:80 +msgid "Do you want to configure a DSL connetion now?" +msgstr "Czy chcesz skonfigurowaæ poł±czenie DSL?" + +#: ../netconfig.c:82 +msgid "Enter user name" +msgstr "Podaj nazwê użytkownika" + +#: ../netconfig.c:83 +msgid "Enter your PPPoE user name:" +msgstr "Podaj nazwê użytkownika PPPoE:" + +#: ../netconfig.c:87 ../netconfig.c:89 +msgid "Password" +msgstr "Hasło" + +#: ../netconfig.c:88 +msgid "Please enter your PPPoE password" +msgstr "Podaj hasło PPPoE" + +#: ../netconfig.c:90 +msgid "Please re-enter your PPPoE password" +msgstr "Podaj hasło PPPoE ponownie" + +#: ../netconfig.c:96 +msgid "Passwords don't match" +msgstr "Hasła nie zgadzaj± siê" + +#: ../netconfig.c:97 +msgid "Sorry, the passwords do not match. Try again?" +msgstr "Spróbowaæ ponownie?" + +#: ../netconfig.c:100 ../netconfig.c:149 +msgid "Enter interface name" +msgstr "Podaj nazwê interfejsu" + +#: ../netconfig.c:101 +msgid "" +"Enter the Ethernet interface connected to the DSL modem. It will be ethn, " +"where 'n' is a number.\n" +"If unsure, just hit enter.\n" +"Enter interface name:" +msgstr "" +"Podaj nazwê interfejsu ł±cz±cego siê z modemem DSL. Bêdzie to ethN, " +"gdzie 'N' to liczba.\n" +"Jeżeli nie jeste¶ pewien wci¶nij enter.\n" +"Podaj nazwê interfejsu:" + +#: ../netconfig.c:130 +msgid "Network configuration" +msgstr "Konfiguracja sieci" + +#: ../netconfig.c:133 +msgid "Enter hostname" +msgstr "Podaj nazwê hosta" + +#: ../netconfig.c:133 +msgid "" +"We'll need the name you'd like to give your host.\n" +"The full hostname is needed, such as:\n" +"\n" +"frugalware.example.net\n" +"\n" +"Enter full hostname:" +msgstr "" +"Podaj nazwê jak± chcesz nadaæ swojej maszynie.\n" +"Wymagana jest pełne nazwa, np:\n" +"\n" +"frugalware.przyklad.net\n" +"\n" +"Podaj pełn± nazwê hosta:" + + +#: ../netconfig.c:150 +msgid "" +"We'll need the name of the interface you'd like to use for your network " +"connection.\n" +"If unsure, just hit enter.\n" +"Enter interface name:" +msgstr "" +"Podaj nazwê interfejsu do wykorzystania w poł±czeniu.\n" +"Jeżeli nie jeste¶ pewien wci¶nij enter.\n" +"Podaj nazwê interfejsu:" + +#: ../netconfig.c:158 +msgid "Extended network name" +msgstr "Rozszerzona nazwa sieci" + +#: ../netconfig.c:158 +msgid "" +"It seems that this network card has a wireless extension. In order to use " +"it, you must set your extended netwok name (ESSID). Enter your ESSID:" +msgstr "" +"Wygl±da na to że ta karta sieciowa służy do poł±czeń bezprzewodowych. " +"Musisz podaæ ESSID - rozszerzon± nazwê sieci:" + +#: ../netconfig.c:163 +msgid "Encryption key" +msgstr "Klucz" + +#: ../netconfig.c:163 +msgid "" +"If you have an encryption key, then please enter it below.\n" +"Examples: 4567-89AB-CD or s:password" +msgstr "" +"Jeżeli sieæ jest kodowana podaj klucz poniżej." + +#: ../netconfig.c:170 +msgid "Set DHCP hostname" +msgstr "Nazwa hosta serwera DHCP" + +#: ../netconfig.c:170 +msgid "" +"Some network providers require that the DHCP hostname beset in order to " +"connect. If so, they'll have assigned a hostname to your machine. If you " +"wereassigned a DHCP hostname, please enter it below. If you do not have a " +"DHCP hostname, justhit enter." +msgstr "" +"Niektórzy dostawcy usług internetowych wymagaj± ustawienia nazwy hosta DHCP " +"w celu nawi±zania poł±czenia. Jeżeli posiadasz nazwê hosta DHCP to j± podaj poniżej, " +"jeżeli nie to wci¶nij enter." + +#. options = ip netmask netmask +#: ../netconfig.c:183 +msgid "Enter ip address" +msgstr "Podaj adres IP" + +#: ../netconfig.c:183 +msgid "Enter your IP address for the local machine." +msgstr "Podaj adres IP dla lokalnej maszyny." + +#: ../netconfig.c:184 +msgid "Enter netmask for local network" +msgstr "Podaj maskê sieci dla maszymy" + +#: ../netconfig.c:185 +msgid "" +"Enter your netmask. This will generally look something like this: " +"255.255.255.0\n" +"If unsure, just hit enter." +msgstr "" +"Podaj masê sieci. Zazwyczaj bêdzie to: " +"255.255.255.0\n" +"Jeżeli nie jeste¶ pewien wci¶nij enter." + +#: ../netconfig.c:192 +msgid "Enter gateway address" +msgstr "Podaj adres bramki" + +#: ../netconfig.c:192 +msgid "" +"Enter the address for the gateway on your network. If you don't have a " +"gateway on your network just hit enter, without entering any ip address." +msgstr "" +"Podaj adres bramki jeżeli posiadasz taki." + +#: ../netconfig.c:198 +msgid "Select nameserver" +msgstr "Serwery DNS" + +#: ../netconfig.c:198 +msgid "" +"Please give the IP address of the name server to use. You canadd more Domain " +"Name Servers later by editing /etc/sysconfig/network/default.\n" +"If you don't have a name server on your network just hit enter, without " +"entering any ip address." +msgstr "" +"Podaj adresy IP serwerów DNS. Możesz dodaæ ich wiêcej póŒniej edytuj±c " +"/etc/sysconfig/network/default.\n" +"Jeżeli DNSy nie funkcjonuj± w twojej sieci wci¶nij enter." + +#: ../netconfig.c:207 +msgid "Adjust configuration files" +msgstr "Edycja plików konfiguracyjnych" + +#: ../netconfig.c:207 +msgid "Accept these settings and adjust configuration files?" +msgstr "Zaakceptowaæ ustawienia i zmodyfikowaæ pliki konfiguracyjne?" + +#: ../netconfig.c:271 +#, c-format +msgid "No profile loaded.\n" +msgstr "Nie załadowano profilu.\n" + +#: ../netconfig.c:276 +#, c-format +msgid "Current profile: %s\n" +msgstr "Obecny profil: %s\n" + hunk ./raidconfig/po/Makefile 19 -LANGS=fr hu +LANGS=fr hu pl hunk ./raidconfig/po/pl.po 1 +# Hungarian translations for raidconfig package. +# Copyright (C) 2006 THE raidconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the raidconfig package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: raidconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../raidconfig.c:39 +msgid "Select RAID device" +msgstr "Wybierz urz±dzenie RAID" + +#: ../raidconfig.c:40 +msgid "Please specify the raid device you want to create:" +msgstr "Proszê wybraæ urz±dzenie raid, które ma byæ stworzone:" + +#: ../raidconfig.c:51 +msgid "raid0 (stripe)" +msgstr "raid0 (stripe)" + +#: ../raidconfig.c:52 +msgid "raid1 (mirror)" +msgstr "raid1 (mirror)" + +#: ../raidconfig.c:59 +msgid "Choose a RAID level" +msgstr "Wybierz poziom RAID" + +#: ../raidconfig.c:60 +msgid "Please choose what level of raid array you want to build" +msgstr "Podaj poziom tablicy RAID do zbudowania" + +#: ../raidconfig.c:76 +msgid "Add" +msgstr "Dodaj" + +#: ../raidconfig.c:77 +msgid "Finish" +msgstr "Zakończ" + +#: ../raidconfig.c:82 +msgid "The list is currently empty." +msgstr "Lista jest pusta." + +#: ../raidconfig.c:86 +#, c-format +msgid "The current list contains: %s." +msgstr "Obecna lista zawiera: %s." + +#: ../raidconfig.c:90 +#, c-format +msgid "" +"Please select the devices you want to build the array from. When you are " +"ready, press 'Finish'.\n" +"%s" +msgstr "" +"Proszê wybraæ urz±dzenia, z których zbudowana ma byæ tablica RAID. " +"Gdy bêdziesz gotowy wci¶nij 'Zakończ'\n" +"%s" + +#: ../raidconfig.c:98 +msgid "Selecting devices" +msgstr "Wybór urz±dzeń" + +#: ../raidconfig.c:120 +msgid "RAID configuration" +msgstr "Konfiguracja RAID" hunk ./setup/po/Makefile 19 -LANGS=fr hu +LANGS=fr hu pl hunk ./setup/po/pl.po 1 +# Hungarian translations for setup package. +# Copyright (C) 2006 THE setup'S COPYRIGHT HOLDER +# This file is distributed under the same license as the setup package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: setup\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../setup.c:115 +msgid "Control center" +msgstr "Panel sterowania" + +#: ../setup.c:116 +msgid "Please select one of the following configuration tools to start:" +msgstr "Proszê wybraæ narzêdzie konfiguracyjne do uruchomienia:" + +#: ../setup.c:130 +msgid "General configuration" +msgstr "Ogólna konfiguracja" hunk ./timeconfig/po/Makefile 19 -LANGS=fr hu +LANGS=fr hu pl hunk ./timeconfig/po/pl.po 1 +# Hungarian translations for timeconfig package. +# Copyright (C) 2006 THE timeconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the timeconfig package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: timeconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../timeconfig.c:44 +msgid "no" +msgstr "nie" + +#: ../timeconfig.c:44 +msgid "Hardware clock is set to local time" +msgstr "Zegar ustawiony jest na czas lokalny" + +#: ../timeconfig.c:45 +msgid "yes" +msgstr "tak" + +#: ../timeconfig.c:45 +msgid "Hardware clock is set to UTC" +msgstr "Zegar ustawiony jest na czas UTC/GMT" + +#: ../timeconfig.c:49 +msgid "Do you want to set hardware clock utc?" +msgstr "Ustawiæ zegar na UTC?" + +#: ../timeconfig.c:50 +msgid "" +"Is the hardware clock set to Coordinated Universal Time (UTC/GMT)? If it " +"is, select 'yes' here. If the hardware clock is set to the current local " +"time (this is how most PCs are set up), then say 'no' here. If you are not " +"sure what this is, you should answer 'no' here." +msgstr "" +"Czy zegar ustawiony jest na UTC/GMT? Jeżeli nie wybierz opcjê 'tak'. Jeżeli " +"zegar ustawiony jest na czas lokalny wybierz 'nie'." + +#: ../timeconfig.c:98 +msgid "Timezone configuration" +msgstr "Konfiguracja strefy czasowej" + +#: ../timeconfig.c:99 +msgid "Please select one of the following timezones for your machine:" +msgstr "Proszê wybraæ jedn± z podanych stref czasowych::" + +#: ../timeconfig.c:115 +msgid "Time configuration" +msgstr "Konfiguracja czasu" hunk ./xconfig/po/Makefile 19 -LANGS=de fr hu +LANGS=de fr hu pl hunk ./xconfig/po/pl.po 1 +# Hungarian translations for xconfig package. +# Copyright (C) 2006 THE xconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xconfig package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: xconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../xconfig.c:45 +#, c-format +msgid "usage: %s [--live \n" +msgstr "użycie: %s [--live ]\n" + +#: ../xconfig.c:54 ../xconfig.c:106 +msgid "X configuration" +msgstr "Konfiguracja X" + +#: ../xconfig.c:59 +msgid "xinit missing" +msgstr "Brak xinit" + +#: ../xconfig.c:59 +msgid "Could not find xinit, please install it with pacman -S xinit." +msgstr "Nie mogê znale¶æ xinit. Zainstaluj poleceniem pacman -S xinit." + +#: ../xconfig.c:66 +msgid "xmessage missing" +msgstr "brak xmessage" + +#: ../xconfig.c:66 +msgid "Could not find xmessage, please install it with pacman -S xmessage." +msgstr "Zainstaluj xmessage poleceniem: pacman -S xmessage." + +#: ../xconfig.c:73 +msgid "xsetroot missing" +msgstr "brak xsetroot" + +#: ../xconfig.c:73 +msgid "Could not find xsetroot, please install it with pacman -S xsetroot." +msgstr "Zainstaluj xsetroot poleceniem pacman -S xsetroot." + +#: ../xconfig.c:79 +msgid "Configuring the X server" +msgstr "Konfiguracja serwera X" + +#: ../xconfig.c:79 +msgid "Attemping to create an X config file..." +msgstr "Próbujê utworzyæ plik xorg.conf..." + +#: ../xconfig.c:95 +msgid "Selecting resolution" +msgstr "Rozdzielczo¶æ" + +#: ../xconfig.c:96 +msgid "" +"Please enter the screen resolution you want to use. You can use values such " +"as 1024x768, 800x600 or 640x480. If unsure, just press ENTER." +msgstr "" +"Proszê podaæ rozdzielczo¶æ z jakiej chcesz korzystaæ. Jeżeli nie jeste¶ pewien wybierz " +"1024x768 lub 800x600 lub nawet 640x480 (stare bardzo monitory). Wci¶nij ENTER by zaakceptowaæ." + +#: ../xconfig.c:99 +msgid "Selecting color depth" +msgstr "Wybór głêbi kolorów" + +#: ../xconfig.c:100 +msgid "" +"Please enter the color depth you want to use. If unsure, just press ENTER." +msgstr "" +"Proszê podaæ głêbiê kolorów jaka ma byæ stosowana. Jeżeli nie jeste¶ pewien, wci¶nij ENTER." hunk ./xwmconfig/po/Makefile 19 -LANGS=hu +LANGS=hu pl hunk ./xwmconfig/po/pl.po 1 +# Hungarian translations for xwmconfig package. +# Copyright (C) 2006 THE xwmconfig'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xwmconfig package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: xwmconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../xwmconfig.c:46 +msgid "Window managers" +msgstr "Šrodowiska graficzne" + +#: ../xwmconfig.c:47 +msgid "" +"Choose one from the window managers listed below. Window managers are " +"responsible for the desktop layout." +msgstr "" +"Wybierz jedeno z poniższych ¶rodowisk graficznych." + +#: ../xwmconfig.c:56 +#, c-format +msgid "usage: %s [options]\n" +msgstr "użycie: %s [opcje]\n" + +#: ../xwmconfig.c:57 +#, c-format +msgid "--force Run this tool even GDM or KDM installed.\n" +msgstr "--force Uruchom nawet przy zainstalowanym KDM lub GDM.\n" + +#: ../xwmconfig.c:58 +#, c-format +msgid "--help This help.\n" +msgstr "--help Pomoc\n" + +#: ../xwmconfig.c:59 +#, c-format +msgid "--silent Do not print any warning if GDM or KDM installed.\n" +msgstr "--silent Nie wy¶wietlaj żadnych ostrzeżeń jeżeli GDM lub KDM jest zainstalowany.\n" + +#: ../xwmconfig.c:95 +msgid "XDM configuration" +msgstr "Konfiguracja XDM" + +#: ../xwmconfig.c:96 +msgid "Please wait" +msgstr "Proszê czekaæ" + +#: ../xwmconfig.c:96 +msgid "Searching for desktop managers..." +msgstr "Szukam menadżerów logowania..." + +#: ../xwmconfig.c:104 +msgid "KDM found" +msgstr "KDM znalezione" + +#: ../xwmconfig.c:104 +msgid "KDM is installed, you can choose a window manager from the login menu." +msgstr "KDM jest znaleziony. Możesz wybraæ ¶rodowisko graficzne z menu KDM przy logowaniu." + +#: ../xwmconfig.c:107 +msgid "GDM found" +msgstr "GDM znalezione" + +#: ../xwmconfig.c:107 +msgid "GDM is installed, you can choose a window manager from the login menu." +msgstr "GDM jest znaleziony. Możesz wybraæ ¶rodowisko graficzne z menu KDM przy logowaniu." + +#: ../xwmconfig.c:117 +msgid "No X server found" +msgstr "Brak serwera Xów" + +#: ../xwmconfig.c:117 +msgid "" +"The X server is not installed, please issue a 'pacman -S x11' command as " +"root." +msgstr "" +"Serwer Xów nie jest zainstalowany. Proszê zainstalowaæ go poleceniem 'pacman -S x11' jako root." } From vmiklos at frugalware.org Sun Sep 3 13:28:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 13:28:37 2006 Subject: [Frugalware-darcs] pacman-tools: added Polish translations Message-ID: <20060903112834.A689C4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20060903112632-e2957-26b6ce969ffbe3dba19740a1bf3935b0e830fb3f.gz; [added Polish translations VMiklos **20060903112632 from Piotr Maliński closes #1098 ] { hunk ./Makefile 21 +LANGS = hu pl + hunk ./Makefile 51 - $(INSTALL) -d $(DESTDIR)/lib/initscripts/messages/hu_HU/LC_MESSAGES/ + for i in $(LANGS); do \ + mkdir -p $(DESTDIR)/lib/initscripts/messages/`echo $$i|sed 's/.*-\(.*\).po/\1/'`/LC_MESSAGES/; \ + done hunk ./Makefile 72 - msgfmt -o $(DESTDIR)/lib/initscripts/messages/hu_HU/LC_MESSAGES/syncpkgd.mo rc.syncpkgd-hu.po + for i in $(LANGS); do \ + msgfmt -c --statistics -o $(DESTDIR)/lib/initscripts/messages/`echo $$i|sed 's/.*-\(.*\).po/\1/'`/LC_MESSAGES/syncpkgd.mo rc.syncpkgd-$$i; \ + done addfile ./rc.syncpkgd-pl.po hunk ./rc.syncpkgd-pl.po 1 +# Polish translations for rc.syncpkgd package. +# Copyright (C) 2006 THE rc.syncpkgd'S COPYRIGHT HOLDER +# This file is distributed under the same license as the rc.syncpkgd package. +# , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: rc.syncpkgd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-09 00:20+0200\n" +"PO-Revision-Date: 2006-04-08 12:19+0900\n" +"Last-Translator: Piotr Maliński \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: rc.syncpkgd:15 +msgid "package builder daemon" +msgstr "demon buduj±cy pakiety" } From vmiklos at frugalware.org Sun Sep 3 13:53:26 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 13:53:30 2006 Subject: [Frugalware-darcs] pacman: updated Hungarian translation Message-ID: <20060903115326.D8BFC4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903115301-e2957-93210d1119a12ddadab062dfe83a0f8131a1471b.gz; [updated Hungarian translation VMiklos **20060903115301] { hunk ./lib/libalpm/po/hu.po 12 -"PO-Revision-Date: 2006-08-19 04:29+0200\n" +"PO-Revision-Date: 2006-09-03 13:49+0200\n" hunk ./lib/libalpm/po/hu.po 18 -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0;" hunk ./lib/libalpm/po/hu.po 338 -msgstr "" +msgstr "nem sikerült megkapni az utolsó módosítási időpontját a következőnek: %s " +"(nincs sok esély)\n" hunk ./lib/libalpm/po/hu.po 344 -msgstr "" +msgstr "szinkronizálás: új módosítási dátum a %s számára: %s\n" hunk ./lib/libalpm/po/hu.po 409 -msgstr "" +msgstr "beállítások: új szekció '%s'\n" hunk ./lib/libalpm/po/hu.po 413 -msgstr "" +msgstr "beállítások: syslog használata\n" hunk ./lib/libalpm/po/hu.po 418 -msgstr "" +msgstr "beállítások: a %s beolvasása\n" hunk ./lib/libalpm/po/hu.po 423 -msgstr "" +msgstr "beállítások: nem fog frissülni: %s\n" hunk ./lib/libalpm/po/hu.po 426 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 428 -msgstr "nem sikerült kifejteni: %s (%s)\n" +msgstr "nem sikerült kifejteni: %s\n" hunk ./lib/libalpm/po/hu.po 433 -msgstr "" +msgstr "beállítások: a %s csomag figyelmen kívül hagyása\n" hunk ./lib/libalpm/po/hu.po 438 -msgstr "" +msgstr "beállítások: ez a csomag mindenképp meg lesz tartva: %s\n" hunk ./lib/libalpm/po/hu.po 443 -msgstr "" +msgstr "beállítások: adatbázis útvonala: %s\n" hunk ./lib/libalpm/po/hu.po 448 -msgstr "" +msgstr "beállítások: gyorsítótár könyvtára: %s\n" hunk ./lib/libalpm/po/hu.po 451 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 453 -msgstr "nem sikerült megnyitni a %s naplófájlt" +msgstr "beállítások: naplófájl: %s\n" hunk ./lib/libalpm/po/hu.po 459 -msgstr "" +msgstr "beállítások: frissítés késleltetése: %i\n" hunk ./lib/libalpm/po/hu.po 463 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 465 -msgstr "figyelmeztetés: a %s elmentve %s néven" +msgstr "beállítások: %s: kiszolgáló: %s\n" hunk ./lib/libalpm/po/hu.po 797 -msgstr "" +msgstr "nem megerősített" hunk ./lib/libalpm/po/hu.po 801 -msgstr "" +msgstr "rossz szekciónév" hunk ./lib/libalpm/po/hu.po 805 -msgstr "" +msgstr "a 'local' név fenntartott és nem használható csomagfaként" hunk ./lib/libalpm/po/hu.po 808 -#, fuzzy hunk ./lib/libalpm/po/hu.po 809 -msgstr "belső hiba" +msgstr "szintaktikai hiba" hunk ./lib/libalpm/po/hu.po 813 -msgstr "" +msgstr "minden direktívának egy szekcióhoz kell tartoznia" hunk ./lib/libalpm/po/hu.po 863 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 865 -msgstr "'%s' hozzáadva a PM_OPT_IGNOREPKG listához" +msgstr "'%s' hozzáadva a PM_OPT_HOLDPKG listához" hunk ./lib/libalpm/po/hu.po 868 -#, fuzzy hunk ./lib/libalpm/po/hu.po 869 -msgstr "a PM_OPT_IGNOREPKG lista ürítve" +msgstr "a PM_OPT_HOLDPKG lista ürítve" hunk ./lib/libalpm/po/hu.po 882 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 884 -msgstr "PM_OPT_DBPATH beállítva a '%s' értékre" +msgstr "PM_OPT_PROXYHOST beállítva a '%s' értékre" hunk ./lib/libalpm/po/hu.po 887 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 889 -msgstr "PM_OPT_DBPATH beállítva a '%s' értékre" +msgstr "PM_OPT_PROXYPORT beállítva a '%d' értékre" hunk ./lib/libalpm/po/hu.po 892 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 894 -msgstr "PM_OPT_CACHEDIR beállítva a '%s' értékre" +msgstr "PM_OPT_XFERCOMMAND beállítva a '%s' értékre" hunk ./lib/libalpm/po/hu.po 897 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 899 -msgstr "PM_OPT_DBPATH beállítva a '%s' értékre" +msgstr "PM_OPT_NOPASSIVEFTP beállítva a '%d' értékre" hunk ./lib/libalpm/po/hu.po 902 -#, fuzzy, c-format +#, c-format hunk ./lib/libalpm/po/hu.po 904 -msgstr "PM_OPT_CACHEDIR beállítva a '%s' értékre" +msgstr "PM_OPT_CHOMP beállítva a '%d' értékre" hunk ./lib/libalpm/po/hu.po 1136 -#: ../sync.c:515 -#, c-format -msgid "package '%s' is conflicting with '%s'" -msgstr "a '%s' csomag ütközik a '%s' csomaggal" - -#: ../sync.c:537 -#, c-format -msgid "'%s' not found in transaction set -- skipping" -msgstr "'%s' nem található meg a tranzakcióban -- kihagyás" - -#. so just treat it like a "replaces" item so the REQUIREDBY -#. * fields are inherited properly. -#. -#: ../sync.c:548 -#, c-format -msgid "package '%s' provides its own conflict" -msgstr "a '%s' csomag szolgáltatása ütközik a csomaggal" - -#: ../sync.c:571 ../sync.c:576 -#, c-format -msgid "'%s' is in the target list -- keeping it" -msgstr "a '%s' a céllistában van -- megtartás" - -#: ../sync.c:588 ../sync.c:625 -#, c-format -msgid "removing '%s' from target list" -msgstr "a '%s' eltávolítása a céllistából" - -#. It's a conflict -- see if they want to remove it -#. -#: ../sync.c:597 -#, c-format -msgid "resolving package '%s' conflict" -msgstr "a '%s' csomag ütközéseinek feloldása" - -#. append to the replaces list -#: ../sync.c:620 -#, c-format -msgid "electing '%s' for removal" -msgstr "a '%s' kiválasztva eltávolításra" - -#. abort -#: ../sync.c:631 ../sync.c:647 -msgid "unresolvable package conflicts detected" -msgstr "feloldhatatlan csomagütközések észlelve" - -#: ../sync.c:699 -msgid "checking dependencies of packages designated for removal" -msgstr "az eltávolításra szánt csomagok függőségeinek ellenőrzése" - -#: ../sync.c:713 -msgid "something has gone horribly wrong" -msgstr "valami borzasztóan rossz történt" - -#. found matching provisio -- we're good to go -#: ../sync.c:732 -#, c-format -msgid "found '%s' as a provision for '%s' -- conflict aborted" -msgstr "a '%s' szolgáltatja a következőt: '%s' -- az ütközés megszakítva" - -#: ../sync.c:825 -#, c-format -msgid "%s-%s-%s%s is already in the cache\n" -msgstr "" - -#. no cache directory.... try creating it -#: ../sync.c:837 -#, c-format -msgid "no %s cache exists. creating...\n" -msgstr "" - -#: ../sync.c:838 -#, c-format -msgid "warning: no %s cache exists. creating..." -msgstr "" - -#. couldn't mkdir the cache directory, so fall back to /tmp and unlink -#. * the package afterwards. -#. -#: ../sync.c:843 -msgid "couldn't create package cache, using /tmp instead\n" -msgstr "" - -#: ../sync.c:844 -msgid "warning: couldn't create package cache, using /tmp instead" -msgstr "" - -#: ../sync.c:847 -#, c-format -msgid "failed to set option CACHEDIR (%s)\n" -msgstr "" - -#: ../sync.c:854 -#, c-format -msgid "failed to retrieve some files from %s\n" -msgstr "" - -#: ../sync.c:883 ../sync.c:895 -#, c-format -msgid "can't get md5 or sha1 checksum for package %s\n" -msgstr "" -"nem sikerült md5 vagy sha1 ellenőrző-összeget kapni a '%s' csomag számára\n" - -#: ../sync.c:914 -#, c-format -msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" -msgstr "a %s archívum sérült volt (rossz MD5 vagy SHA1 ellenőrzőösszeg)\n" - -#: ../sync.c:916 -#, c-format -msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" -msgstr "a %s archívum sérült (rossz MD5 vagy SHA1 ellenőrzőösszeg)\n" - -#: ../sync.c:936 -msgid "could not create removal transaction" -msgstr "nem sikerült létrehozni az eltávolítási tranzakciót" - -#: ../sync.c:942 -msgid "could not initialize the removal transaction" -msgstr "nem sikerült inicializálni az eltávolítási tranzakciót" - -#: ../sync.c:962 -msgid "removing conflicting and to-be-replaced packages" -msgstr "az ütköző vagy lecserélésre ítélt csomagok eltávolítása" - -#: ../sync.c:964 -msgid "could not prepare removal transaction" -msgstr "nem sikerült előkészíteni az eltávolítási tranzakciót" - -#: ../sync.c:970 -msgid "could not commit removal transaction" -msgstr "nem sikerült végrehajtani az eltávolítási tranzakciót" - -#. install targets -#: ../sync.c:977 -msgid "installing packages" -msgstr "csomagok telepítése" - -#: ../sync.c:980 -msgid "could not create transaction" -msgstr "nem sikerült létrehozni a tranzakciót" - -#: ../sync.c:985 -msgid "could not initialize transaction" -msgstr "nem sikerült inicializálni a tranzakciót" - -#: ../sync.c:1004 -msgid "could not prepare transaction" -msgstr "nem sikerült előkészíteni a tranzakciót" - -#: ../sync.c:1009 -msgid "could not commit transaction" -msgstr "nem sikerült végrehajtani a tranzakciót" - -#: ../sync.c:1016 -msgid "updating database for replaced packages' dependencies" -msgstr "az adatbázis frissítése a lecserélt csomagok függőségei miatt" - -#: ../sync.c:1045 -#, c-format -msgid "could not update requiredby for database entry %s-%s" -msgstr "nem sikerült frissíteni a \"függ tőle\" mezőjét a %s-%s bejegyzésnek" - -#: ../sync.c:1054 -#, c-format -msgid "could not update new database entry %s-%s" -msgstr "nem sikerült frissíteni az új adatbázis-bejegyzést: %s-%s" - -#: ../util.c:285 -#, c-format -msgid "could not extract %s: %s\n" -msgstr "nem sikerült kifejteni: %s (%s)\n" - -#: ../util.c:436 -msgid "could not create temp directory" -msgstr "nem sikerült létrehozni az ideiglenes könyvtárat" - -#: ../util.c:463 -#, c-format -msgid "could not change directory to %s (%s)" -msgstr "nem sikerült könyvtárat váltani ide: %s (%s)" - -#: ../util.c:466 -#, c-format -msgid "executing %s script..." -msgstr "a %s szkript végrehajtása..." - -#: ../util.c:479 -#, c-format -msgid "could not fork a new process (%s)" -msgstr "nem sikerült forkolni egy új folyamatot (%s)" - -#: ../util.c:486 -#, c-format -msgid "chrooting in %s" -msgstr "chrootolás ide: %s" - -#: ../util.c:488 -#, c-format -msgid "could not change the root directory (%s)" -msgstr "nem sikerült megváltoztatni a gyökérkönyvtárat (%s)" - -#: ../util.c:492 -#, c-format -msgid "could not change directory to / (%s)" -msgstr "nem sikekrült könyvtárat váltani a /-be (%s)" - -#: ../util.c:496 -#, c-format -msgid "executing \"%s\"" -msgstr "a \"%s\" végrehajtása" - -#: ../util.c:499 -#, c-format -msgid "call to popen failed (%s)" -msgstr "a popen hívás nem sikerült (%s)" - -#: ../util.c:521 -#, c-format -msgid "call to waitpid failed (%s)" -msgstr "a waitpit hívás nem sikerült (%s)" - -#: ../util.c:529 -#, c-format -msgid "could not remove tmpdir %s" -msgstr "nem sikerült eltávolítani a %s ideiglenes könyvtárat" - -#: ../util.c:593 -#, c-format -msgid "check_freespace: total pkg size: %lld, disk space: %lld" -msgstr "check_freespace: teljes csomagméret: %lld, hely a lemezen: %lld" hunk ./src/pacman/po/hu.po 12 -"PO-Revision-Date: 2006-08-26 14:44+0200\n" +"PO-Revision-Date: 2006-09-03 13:52+0200\n" hunk ./src/pacman/po/hu.po 18 -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0;" hunk ./src/pacman/po/hu.po 694 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 696 -msgstr "nem sikerült előkészíteni a tranzakciót (%s)\n" +msgstr "nem sikerült értelmezni a beállítási fájlt (%s)\n" hunk ./src/pacman/po/hu.po 709 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 711 -msgstr "nem sikerült beállítani a LOGCB opciót (%s)\n" +msgstr "nem sikerült beállítani a DLCB opciót (%s)\n" hunk ./src/pacman/po/hu.po 714 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 716 -msgstr "nem sikerült beállítani a LOGFILE opciót (%s)\n" +msgstr "nem sikerült beállítani a DLFNM opciót (%s)\n" hunk ./src/pacman/po/hu.po 719 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 721 -msgstr "nem sikerült beállítani a LOGFILE opciót (%s)\n" +msgstr "nem sikerült beállítani a DLOFFSET opciót (%s)\n" hunk ./src/pacman/po/hu.po 724 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 726 -msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" +msgstr "nem sikerült beállítani a DBT0 opciót (%s)\n" hunk ./src/pacman/po/hu.po 729 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 731 -msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" +msgstr "nem sikerült beállítani a DLT opciót (%s)\n" hunk ./src/pacman/po/hu.po 734 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 736 -msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" +msgstr "nem sikerült beállítani a DLRATE opciót (%s)\n" hunk ./src/pacman/po/hu.po 739 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 741 -msgstr "nem sikerült beállítani a LOGFILE opciót (%s)\n" +msgstr "nem sikerült beállítani a DLXFERED1 opciót (%s)\n" hunk ./src/pacman/po/hu.po 744 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 746 -msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" +msgstr "nem sikerült beállítani a DLETA_H opciót (%s)\n" hunk ./src/pacman/po/hu.po 749 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 751 -msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" +msgstr "nem sikerült beállítani a DBETA_M opciót (%s)\n" hunk ./src/pacman/po/hu.po 754 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 756 -msgstr "nem sikerült beállítani a LOGMASK opciót (%s)\n" +msgstr "nem sikerült beállítani a DLETA_S opciót (%s)\n" hunk ./src/pacman/po/hu.po 1162 -#, fuzzy hunk ./src/pacman/po/hu.po 1163 -msgstr "%s eltávolítása... " +msgstr "eltávolíás:" hunk ./src/pacman/po/hu.po 1176 -#~ msgstr "beállítások: új szekció '%s'\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: Ășj szekciĂł '%s'\n" hunk ./src/pacman/po/hu.po 1179 -#~ msgstr "beállítások: %d. sor: rossz szekciónév\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: %d. sor: rossz szekciĂłnĂ©v\n" hunk ./src/pacman/po/hu.po 1184 -#~ "beállítások: %d. sor: a '%s' név fenntartott és nem használható csomagfa " -#~ "névként\n" +#~ "beĂĄllĂ­tĂĄsok: %d. sor: a '%s' nĂ©v fenntartott Ă©s nem hasznĂĄlhatĂł csomagfa " +#~ "nĂ©vkĂ©nt\n" hunk ./src/pacman/po/hu.po 1188 -#~ msgstr "beállítások: %d. sor: szintaktikai hiba\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: %d. sor: szintaktikai hiba\n" hunk ./src/pacman/po/hu.po 1192 -#~ "beállítások: %d. sor: minden direktívának egy szekcióhoz kell tartoznia\n" +#~ "beĂĄllĂ­tĂĄsok: %d. sor: minden direktĂ­vĂĄnak egy szekciĂłhoz kell tartoznia\n" hunk ./src/pacman/po/hu.po 1195 -#~ msgstr "beállítások: nem lesz passzív ftp\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: nem lesz passzĂ­v ftp\n" hunk ./src/pacman/po/hu.po 1198 -#~ msgstr "nem sikerült beállítani a USESYSLOG opciót (%s)\n" +#~ msgstr "nem sikerĂŒlt beĂĄllĂ­tani a USESYSLOG opciĂłt (%s)\n" hunk ./src/pacman/po/hu.po 1201 -#~ msgstr "beállítások: syslog használata\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: syslog hasznĂĄlata\n" hunk ./src/pacman/po/hu.po 1204 -#~ msgstr "beállítások: a %s beolvasása\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: a %s beolvasĂĄsa\n" hunk ./src/pacman/po/hu.po 1207 -#~ msgstr "nem sikerült beállítani a NOUPGRADE opciót (%s)\n" +#~ msgstr "nem sikerĂŒlt beĂĄllĂ­tani a NOUPGRADE opciĂłt (%s)\n" hunk ./src/pacman/po/hu.po 1210 -#~ msgstr "beállítások: nem fog frissülni: %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: nem fog frissĂŒlni: %s\n" hunk ./src/pacman/po/hu.po 1213 -#~ msgstr "nem sikerült beállítani a NOEXTRACT opciót (%s)\n" +#~ msgstr "nem sikerĂŒlt beĂĄllĂ­tani a NOEXTRACT opciĂłt (%s)\n" hunk ./src/pacman/po/hu.po 1216 -#~ msgstr "beállítások: nem lesz kifejtve: %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: nem lesz kifejtve: %s\n" hunk ./src/pacman/po/hu.po 1219 -#~ msgstr "beállítások: a %s csomag figyelmen kívül hagyása\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: a %s csomag figyelmen kĂ­vĂŒl hagyĂĄsa\n" hunk ./src/pacman/po/hu.po 1222 -#~ msgstr "beállítások: ez a csomag mindenképp meg lesz tartva: %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: ez a csomag mindenkĂ©pp meg lesz tartva: %s\n" hunk ./src/pacman/po/hu.po 1225 -#~ msgstr "beállítások: adatbázis útvonala: %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: adatbĂĄzis Ăștvonala: %s\n" hunk ./src/pacman/po/hu.po 1228 -#~ msgstr "beállítások: gyorsítótár könyvtára: %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: gyorsĂ­tĂłtĂĄr könyvtĂĄra: %s\n" hunk ./src/pacman/po/hu.po 1231 -#~ msgstr "beállítások: naplófájl: %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: naplĂłfĂĄjl: %s\n" hunk ./src/pacman/po/hu.po 1234 -#~ msgstr "beállítások: átviteli parancs: %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: ĂĄtviteli parancs: %s\n" hunk ./src/pacman/po/hu.po 1237 -#~ msgstr "beállítások: frissítés késleltetése: %i\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: frissĂ­tĂ©s kĂ©sleltetĂ©se: %i\n" hunk ./src/pacman/po/hu.po 1240 -#~ msgstr "nem sikerült beállítani az UPGRADEDELAY opciót (%s)\n" +#~ msgstr "nem sikerĂŒlt beĂĄllĂ­tani az UPGRADEDELAY opciĂłt (%s)\n" hunk ./src/pacman/po/hu.po 1248 -#~ "Figyelmeztetés: az UpgradeDelay opció túl nagy értéken van.\n" -#~ "Ha egy csomag gyakran frissül, soha nem lesz frissítve.\n" -#~ "Frissítse kézzel ezeket a csomagokat vagy használjon egy kisebb értéket, " -#~ "hogy elkerülje ezt a problémát.\n" +#~ "FigyelmeztetĂ©s: az UpgradeDelay opciĂł tĂșl nagy Ă©rtĂ©ken van.\n" +#~ "Ha egy csomag gyakran frissĂŒl, soha nem lesz frissĂ­tve.\n" +#~ "FrissĂ­tse kĂ©zzel ezeket a csomagokat vagy hasznĂĄljon egy kisebb Ă©rtĂ©ket, " +#~ "hogy elkerĂŒlje ezt a problĂ©mĂĄt.\n" hunk ./src/pacman/po/hu.po 1254 -#~ msgstr "beállítások: %d. sor: rossz szerver hely\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: %d. sor: rossz szerver hely\n" hunk ./src/pacman/po/hu.po 1257 -#~ msgstr "beállítások: proxyszerver: %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: proxyszerver: %s\n" hunk ./src/pacman/po/hu.po 1260 -#~ msgstr "beállítások: proxyport: %u\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: proxyport: %u\n" hunk ./src/pacman/po/hu.po 1263 -#~ msgstr "nem sikerült allokálni %d bájtot\n" +#~ msgstr "nem sikerĂŒlt allokĂĄlni %d bĂĄjtot\n" hunk ./src/pacman/po/hu.po 1266 -#~ msgstr "beállítások: %d. sor: a %s protokoll nem támogatott\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: %d. sor: a %s protokoll nem tĂĄmogatott\n" hunk ./src/pacman/po/hu.po 1269 -#~ msgstr "beállítások: %s: szerver: %s %s %s\n" +#~ msgstr "beĂĄllĂ­tĂĄsok: %s: szerver: %s %s %s\n" hunk ./src/pacman/po/hu.po 1272 -#~ msgstr "kapcsolódás a %s:21-hez\n" +#~ msgstr "kapcsolĂłdĂĄs a %s:21-hez\n" hunk ./src/pacman/po/hu.po 1275 -#~ msgstr "nem sikerült kapcsolódni ide: %s\n" +#~ msgstr "nem sikerĂŒlt kapcsolĂłdni ide: %s\n" hunk ./src/pacman/po/hu.po 1278 -#~ msgstr "a névtelen bejelentkezés sikertelen\n" +#~ msgstr "a nĂ©vtelen bejelentkezĂ©s sikertelen\n" hunk ./src/pacman/po/hu.po 1281 -#~ msgstr "nem sikerült könyvtárt váltani a %s címe: %s\n" +#~ msgstr "nem sikerĂŒlt könyvtĂĄrt vĂĄltani a %s cĂ­me: %s\n" hunk ./src/pacman/po/hu.po 1284 -#~ msgstr "nem sikerült beállítani a passzív módot\n" +#~ msgstr "nem sikerĂŒlt beĂĄllĂ­tani a passzĂ­v mĂłdot\n" hunk ./src/pacman/po/hu.po 1287 -#~ msgstr "az FTP passív mód nem lett beállítva\n" +#~ msgstr "az FTP passĂ­v mĂłd nem lett beĂĄllĂ­tva\n" hunk ./src/pacman/po/hu.po 1290 -#~ msgstr "kapcsolódás ide: %s\n" +#~ msgstr "kapcsolĂłdĂĄs ide: %s\n" hunk ./src/pacman/po/hu.po 1293 -#~ msgstr "kapcsolódás ide: %s:%u\n" +#~ msgstr "kapcsolĂłdĂĄs ide: %s:%u\n" hunk ./src/pacman/po/hu.po 1296 -#~ msgstr "nem sikerült könyvtárat váltani ide: %s\n" +#~ msgstr "nem sikerĂŒlt könyvtĂĄrat vĂĄltani ide: %s\n" hunk ./src/pacman/po/hu.po 1299 -#~ msgstr "parancs futtatása: %s\n" +#~ msgstr "parancs futtatĂĄsa: %s\n" hunk ./src/pacman/po/hu.po 1302 -#~ msgstr "XferCommand futtatása: a fork nem sikerült!\n" +#~ msgstr "XferCommand futtatĂĄsa: a fork nem sikerĂŒlt!\n" hunk ./src/pacman/po/hu.po 1305 -#~ msgstr "az XferCommand parancs nem-0 státuszkóddal tért vissza (%d)\n" +#~ msgstr "az XferCommand parancs nem-0 stĂĄtuszkĂłddal tĂ©rt vissza (%d)\n" hunk ./src/pacman/po/hu.po 1308 -#~ msgstr "nem sikerült megkapni a %s fájlméretét\n" +#~ msgstr "nem sikerĂŒlt megkapni a %s fĂĄjlmĂ©retĂ©t\n" hunk ./src/pacman/po/hu.po 1311 -#~ msgstr "nem sikerült megkapni a %s módosítási dátumát\n" +#~ msgstr "nem sikerĂŒlt megkapni a %s mĂłdosĂ­tĂĄsi dĂĄtumĂĄt\n" hunk ./src/pacman/po/hu.po 1314 -#~ msgstr "a módosítási dátumok egyeznek, a %s kihagyása\n" +#~ msgstr "a mĂłdosĂ­tĂĄsi dĂĄtumok egyeznek, a %s kihagyĂĄsa\n" hunk ./src/pacman/po/hu.po 1317 -#~ msgstr "nem sikerült folytatni a letöltést -- újrakezdés\n" +#~ msgstr "nem sikerĂŒlt folytatni a letöltĂ©st -- ĂșjrakezdĂ©s\n" hunk ./src/pacman/po/hu.po 1324 -#~ "nem sikerült letölteni a %s-et a %s-ról: %s\n" +#~ "nem sikerĂŒlt letölteni a %s-et a %s-rĂłl: %s\n" hunk ./src/pacman/po/hu.po 1327 -#~ msgstr "a %s másolása ide: %s/%s\n" +#~ msgstr "a %s mĂĄsolĂĄsa ide: %s/%s\n" hunk ./src/pacman/po/hu.po 1330 -#~ msgstr "nem sikerült másolni a következőt: %s\n" +#~ msgstr "nem sikerĂŒlt mĂĄsolni a következƑt: %s\n" hunk ./src/pacman/po/hu.po 1333 -#~ msgstr " %s már a jelenlegi könyvtárban van\n" +#~ msgstr " %s mĂĄr a jelenlegi könyvtĂĄrban van\n" hunk ./src/pacman/po/hu.po 1336 -#~ msgstr "nem sikerült letölteni: %s\n" +#~ msgstr "nem sikerĂŒlt letölteni: %s\n" hunk ./src/pacman/po/hu.po 1339 -#~ msgstr "nem sikerült beállítani a CACHEDIR opciót (%s)\n" +#~ msgstr "nem sikerĂŒlt beĂĄllĂ­tani a CACHEDIR opciĂłt (%s)\n" hunk ./src/pacman/po/hu.po 1343 -#~ "nem sikerült megkapni az utolsó módosítási időpontját a következőnek: %s " -#~ "(nincs sok esély)\n" +#~ "nem sikerĂŒlt megkapni az utolsĂł mĂłdosĂ­tĂĄsi idƑpontjĂĄt a következƑnek: %s " +#~ "(nincs sok esĂ©ly)\n" hunk ./src/pacman/po/hu.po 1347 -#~ msgstr "szinkronizálás: új módosítási dátum a %s számára: %s\n" +#~ msgstr "szinkronizĂĄlĂĄs: Ășj mĂłdosĂ­tĂĄsi dĂĄtum a %s szĂĄmĂĄra: %s\n" hunk ./src/pacman/po/hu.po 1350 -#~ msgstr "%s-%s-%s%s már a gyorsítótárban\n" +#~ msgstr "%s-%s-%s%s mĂĄr a gyorsĂ­tĂłtĂĄrban\n" hunk ./src/pacman/po/hu.po 1353 -#~ msgstr "nem létezik a %s gyorsítótár. létrehozás...\n" +#~ msgstr "nem lĂ©tezik a %s gyorsĂ­tĂłtĂĄr. lĂ©trehozĂĄs...\n" hunk ./src/pacman/po/hu.po 1356 -#~ msgstr "figyelmeztetés: nem létezik a %s gyorsítótár. létrehozás..." +#~ msgstr "figyelmeztetĂ©s: nem lĂ©tezik a %s gyorsĂ­tĂłtĂĄr. lĂ©trehozĂĄs..." hunk ./src/pacman/po/hu.po 1359 -#~ msgstr "nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp használata\n" +#~ msgstr "nem sikerĂŒlt lĂ©trehozni a csomag-gyorsĂ­tĂłtĂĄrat, a /tmp hasznĂĄlata\n" hunk ./src/pacman/po/hu.po 1363 -#~ "figyelmeztetés: nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp " -#~ "használata" +#~ "figyelmeztetĂ©s: nem sikerĂŒlt lĂ©trehozni a csomag-gyorsĂ­tĂłtĂĄrat, a /tmp " +#~ "hasznĂĄlata" hunk ./src/pacman/po/hu.po 1367 -#~ msgstr "nem sikerült letölteni néhány fájlt a %s repóból\n" +#~ msgstr "nem sikerĂŒlt letölteni nĂ©hĂĄny fĂĄjlt a %s repĂłbĂłl\n" } From vmiklos at frugalware.org Sun Sep 3 13:53:27 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 13:53:32 2006 Subject: [Frugalware-darcs] pacman: regen po{,t}s Message-ID: <20060903115327.597AB4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060903113643-e2957-500495b69df1939d5c83f85f28caa38b2fa523fd.gz; [regen po{,t}s VMiklos **20060903113643] { hunk ./doc/po/hu.po 8 -"POT-Creation-Date: 2006-08-26 14:52+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./doc/po/hu.po 1003 -#: pacman.8:353 makepkg.8:149 FrugalBuild.8:447 +#: pacman.8:353 makepkg.8:149 FrugalBuild.8:453 hunk ./doc/po/hu.po 1014 -#: pacman.8:355 makepkg.8:152 FrugalBuild.8:450 +#: pacman.8:355 makepkg.8:152 FrugalBuild.8:456 hunk ./doc/po/hu.po 1020 -#: pacman.8:359 makepkg.8:156 FrugalBuild.8:454 +#: pacman.8:359 makepkg.8:156 FrugalBuild.8:460 hunk ./doc/po/hu.po 1028 -#: makepkg.8:1 FrugalBuild.8:1 +#: makepkg.8:1 hunk ./doc/po/hu.po 1422 +# type: SH +#: FrugalBuild.8:1 +#, fuzzy, no-wrap +msgid "FrugalBuild" +msgstr "FrugalBuild példa:" + hunk ./doc/po/hu.po 2240 -#: FrugalBuild.8:399 +#: FrugalBuild.8:397 hunk ./doc/po/hu.po 2243 -"(like libmysql out of mysql) and then defining the properties of " -"subpackages. The B array is to define the pkgnames of the " -"subpackages. From now all the directives has their subfoo equivalent:" +"(like libmysql out of mysql) and then defining the properties of subpackages." +msgstr "" + +# type: Plain text +#: FrugalBuild.8:402 +msgid "" +"NOTE: if you create several subpackages, maintaining those packages will " +"require more and more time. Thus, unnecessary splits aren't welcome. " +"Especially, if you split out a library, then don't move the headers to the " +"package just to speed up building with a few seconds!" hunk ./doc/po/hu.po 2256 -#: FrugalBuild.8:415 +#: FrugalBuild.8:405 +msgid "" +"The B array is to define the pkgnames of the subpackages. From " +"now all the directives has their subfoo equivalent:" +msgstr "" + +# type: Plain text +#: FrugalBuild.8:421 hunk ./doc/po/hu.po 2284 -#: FrugalBuild.8:419 +#: FrugalBuild.8:425 hunk ./doc/po/hu.po 2292 -#: FrugalBuild.8:421 +#: FrugalBuild.8:427 hunk ./doc/po/hu.po 2297 -#: FrugalBuild.8:428 +#: FrugalBuild.8:434 hunk ./doc/po/hu.po 2309 -#: FrugalBuild.8:432 +#: FrugalBuild.8:438 hunk ./doc/po/hu.po 2316 -#: FrugalBuild.8:437 +#: FrugalBuild.8:443 hunk ./doc/po/hu.po 2325 -#: FrugalBuild.8:440 +#: FrugalBuild.8:446 hunk ./doc/po/hu.po 2331 -#: FrugalBuild.8:443 +#: FrugalBuild.8:449 hunk ./doc/po/hu.po 2338 -#: FrugalBuild.8:446 +#: FrugalBuild.8:452 hunk ./doc/po/hu.po 2345 -#: FrugalBuild.8:450 +#: FrugalBuild.8:456 hunk ./doc/po/pacman.pot 9 -"POT-Creation-Date: 2006-08-26 14:52+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./doc/po/pacman.pot 1004 -#: pacman.8:353 makepkg.8:149 FrugalBuild.8:447 +#: pacman.8:353 makepkg.8:149 FrugalBuild.8:453 hunk ./doc/po/pacman.pot 1015 -#: pacman.8:355 makepkg.8:152 FrugalBuild.8:450 +#: pacman.8:355 makepkg.8:152 FrugalBuild.8:456 hunk ./doc/po/pacman.pot 1021 -#: pacman.8:359 makepkg.8:156 FrugalBuild.8:454 +#: pacman.8:359 makepkg.8:156 FrugalBuild.8:460 hunk ./doc/po/pacman.pot 1029 -#: makepkg.8:1 FrugalBuild.8:1 +#: makepkg.8:1 hunk ./doc/po/pacman.pot 1423 +# type: TH +#: FrugalBuild.8:1 +#, no-wrap +msgid "FrugalBuild" +msgstr "" + hunk ./doc/po/pacman.pot 2240 -#: FrugalBuild.8:399 +#: FrugalBuild.8:397 hunk ./doc/po/pacman.pot 2244 -"subpackages. The B array is to define the pkgnames of the " -"subpackages. From now all the directives has their subfoo equivalent:" +"subpackages." +msgstr "" + +# type: Plain text +#: FrugalBuild.8:402 +msgid "" +"NOTE: if you create several subpackages, maintaining those packages will " +"require more and more time. Thus, unnecessary splits aren't welcome. " +"Especially, if you split out a library, then don't move the headers to the " +"package just to speed up building with a few seconds!" hunk ./doc/po/pacman.pot 2257 -#: FrugalBuild.8:415 +#: FrugalBuild.8:405 +msgid "" +"The B array is to define the pkgnames of the subpackages. From " +"now all the directives has their subfoo equivalent:" +msgstr "" + +# type: Plain text +#: FrugalBuild.8:421 hunk ./doc/po/pacman.pot 2285 -#: FrugalBuild.8:419 +#: FrugalBuild.8:425 hunk ./doc/po/pacman.pot 2293 -#: FrugalBuild.8:421 +#: FrugalBuild.8:427 hunk ./doc/po/pacman.pot 2298 -#: FrugalBuild.8:428 +#: FrugalBuild.8:434 hunk ./doc/po/pacman.pot 2310 -#: FrugalBuild.8:432 +#: FrugalBuild.8:438 hunk ./doc/po/pacman.pot 2317 -#: FrugalBuild.8:437 +#: FrugalBuild.8:443 hunk ./doc/po/pacman.pot 2326 -#: FrugalBuild.8:440 +#: FrugalBuild.8:446 hunk ./doc/po/pacman.pot 2332 -#: FrugalBuild.8:443 +#: FrugalBuild.8:449 hunk ./doc/po/pacman.pot 2339 -#: FrugalBuild.8:446 +#: FrugalBuild.8:452 hunk ./doc/po/pacman.pot 2346 -#: FrugalBuild.8:450 +#: FrugalBuild.8:456 hunk ./lib/libalpm/po/de.po 10 -"POT-Creation-Date: 2006-08-26 14:56+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./lib/libalpm/po/de.po 19 -#: ../add.c:91 +#: ../add.c:95 hunk ./lib/libalpm/po/de.po 24 -#: ../add.c:123 +#: ../add.c:127 hunk ./lib/libalpm/po/de.po 29 -#: ../add.c:165 +#: ../add.c:169 hunk ./lib/libalpm/po/de.po 34 -#: ../add.c:174 +#: ../add.c:178 hunk ./lib/libalpm/po/de.po 39 -#: ../add.c:181 +#: ../add.c:185 hunk ./lib/libalpm/po/de.po 45 -#: ../add.c:223 ../remove.c:92 +#: ../add.c:227 ../remove.c:104 hunk ./lib/libalpm/po/de.po 50 -#: ../add.c:235 ../sync.c:499 +#: ../add.c:239 ../sync.c:504 hunk ./lib/libalpm/po/de.po 55 -#: ../add.c:247 ../remove.c:128 +#: ../add.c:251 ../remove.c:140 hunk ./lib/libalpm/po/de.po 59 -#: ../add.c:259 +#: ../add.c:263 hunk ./lib/libalpm/po/de.po 63 -#: ../add.c:276 +#: ../add.c:280 hunk ./lib/libalpm/po/de.po 67 -#: ../add.c:341 +#: ../add.c:345 hunk ./lib/libalpm/po/de.po 72 -#: ../add.c:351 ../alpm.c:515 ../conflict.c:271 ../conflict.c:301 +#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304 hunk ./lib/libalpm/po/de.po 77 -#: ../add.c:361 ../alpm.c:495 ../alpm.c:627 ../alpm.c:674 +#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726 hunk ./lib/libalpm/po/de.po 82 -#: ../add.c:374 +#: ../add.c:378 hunk ./lib/libalpm/po/de.po 87 -#: ../add.c:404 +#: ../add.c:408 hunk ./lib/libalpm/po/de.po 92 -#: ../add.c:415 +#: ../add.c:419 hunk ./lib/libalpm/po/de.po 97 -#: ../add.c:419 +#: ../add.c:423 hunk ./lib/libalpm/po/de.po 101 -#: ../add.c:434 ../util.c:452 +#: ../add.c:438 ../util.c:456 hunk ./lib/libalpm/po/de.po 105 -#: ../add.c:488 +#: ../add.c:492 hunk ./lib/libalpm/po/de.po 110 -#: ../add.c:524 ../add.c:677 +#: ../add.c:528 ../add.c:681 hunk ./lib/libalpm/po/de.po 115 -#: ../add.c:567 +#: ../add.c:571 hunk ./lib/libalpm/po/de.po 120 -#: ../add.c:568 ../add.c:575 +#: ../add.c:572 ../add.c:579 hunk ./lib/libalpm/po/de.po 125 -#: ../add.c:569 ../add.c:576 +#: ../add.c:573 ../add.c:580 hunk ./lib/libalpm/po/de.po 130 -#: ../add.c:571 ../add.c:578 +#: ../add.c:575 ../add.c:582 hunk ./lib/libalpm/po/de.po 135 -#: ../add.c:574 +#: ../add.c:578 hunk ./lib/libalpm/po/de.po 140 -#: ../add.c:592 +#: ../add.c:596 hunk ./lib/libalpm/po/de.po 145 -#: ../add.c:593 +#: ../add.c:597 hunk ./lib/libalpm/po/de.po 150 -#: ../add.c:597 ../add.c:641 +#: ../add.c:601 ../add.c:645 hunk ./lib/libalpm/po/de.po 155 -#: ../add.c:598 +#: ../add.c:602 hunk ./lib/libalpm/po/de.po 160 -#: ../add.c:602 +#: ../add.c:606 hunk ./lib/libalpm/po/de.po 165 -#: ../add.c:603 +#: ../add.c:607 hunk ./lib/libalpm/po/de.po 170 -#: ../add.c:613 ../add.c:616 ../add.c:622 +#: ../add.c:617 ../add.c:620 ../add.c:626 hunk ./lib/libalpm/po/de.po 174 -#: ../add.c:620 +#: ../add.c:624 hunk ./lib/libalpm/po/de.po 178 -#: ../add.c:626 +#: ../add.c:630 hunk ./lib/libalpm/po/de.po 183 -#: ../add.c:630 +#: ../add.c:634 hunk ./lib/libalpm/po/de.po 188 -#: ../add.c:631 +#: ../add.c:635 hunk ./lib/libalpm/po/de.po 193 -#: ../add.c:633 +#: ../add.c:637 hunk ./lib/libalpm/po/de.po 198 -#: ../add.c:634 +#: ../add.c:638 hunk ./lib/libalpm/po/de.po 203 -#: ../add.c:639 ../add.c:659 +#: ../add.c:643 ../add.c:663 hunk ./lib/libalpm/po/de.po 208 -#: ../add.c:661 +#: ../add.c:665 hunk ./lib/libalpm/po/de.po 213 -#: ../add.c:663 +#: ../add.c:667 hunk ./lib/libalpm/po/de.po 218 -#: ../add.c:664 +#: ../add.c:668 hunk ./lib/libalpm/po/de.po 223 -#: ../add.c:678 +#: ../add.c:682 hunk ./lib/libalpm/po/de.po 228 -#: ../add.c:689 +#: ../add.c:693 hunk ./lib/libalpm/po/de.po 232 -#: ../add.c:721 ../add.c:723 +#: ../add.c:725 ../add.c:727 hunk ./lib/libalpm/po/de.po 237 -#: ../add.c:722 ../add.c:724 +#: ../add.c:726 ../add.c:728 hunk ./lib/libalpm/po/de.po 241 -#: ../add.c:722 ../add.c:724 +#: ../add.c:726 ../add.c:728 hunk ./lib/libalpm/po/de.po 245 -#: ../add.c:745 ../add.c:796 +#: ../add.c:749 ../add.c:800 hunk ./lib/libalpm/po/de.po 251 -#: ../add.c:756 ../remove.c:262 +#: ../add.c:760 ../remove.c:284 hunk ./lib/libalpm/po/de.po 255 -#: ../add.c:757 +#: ../add.c:761 hunk ./lib/libalpm/po/de.po 260 -#: ../add.c:759 +#: ../add.c:763 hunk ./lib/libalpm/po/de.po 265 -#: ../add.c:761 +#: ../add.c:765 hunk ./lib/libalpm/po/de.po 270 -#: ../add.c:765 +#: ../add.c:769 hunk ./lib/libalpm/po/de.po 276 -#: ../add.c:770 ../remove.c:272 +#: ../add.c:774 ../remove.c:294 hunk ./lib/libalpm/po/de.po 280 -#: ../add.c:791 ../remove.c:300 +#: ../add.c:795 ../remove.c:322 hunk ./lib/libalpm/po/de.po 285 -#: ../add.c:799 ../remove.c:310 +#: ../add.c:803 ../remove.c:332 hunk ./lib/libalpm/po/de.po 290 -#: ../add.c:826 ../remove.c:322 +#: ../add.c:830 ../remove.c:345 hunk ./lib/libalpm/po/de.po 295 -#: ../alpm.c:196 +#: ../alpm.c:201 hunk ./lib/libalpm/po/de.po 300 -#: ../alpm.c:201 +#: ../alpm.c:206 hunk ./lib/libalpm/po/de.po 306 -#: ../alpm.c:212 +#: ../alpm.c:217 hunk ./lib/libalpm/po/de.po 311 -#: ../alpm.c:256 +#: ../alpm.c:261 hunk ./lib/libalpm/po/de.po 316 -#: ../alpm.c:261 +#: ../alpm.c:266 hunk ./lib/libalpm/po/de.po 321 -#: ../alpm.c:327 +#: ../alpm.c:344 hunk ./lib/libalpm/po/de.po 327 -#: ../alpm.c:331 +#: ../alpm.c:348 hunk ./lib/libalpm/po/de.po 332 +#: ../alpm.c:383 +#, c-format +msgid "failed to get lastupdate time for %s (no big deal)\n" +msgstr "" + +#: ../alpm.c:402 +#, c-format +msgid "sync: new mtime for %s: %s\n" +msgstr "" + hunk ./lib/libalpm/po/de.po 343 -#: ../alpm.c:358 +#: ../alpm.c:408 hunk ./lib/libalpm/po/de.po 348 -#: ../alpm.c:362 +#: ../alpm.c:412 hunk ./lib/libalpm/po/de.po 353 -#: ../alpm.c:377 +#. uncompress the sync database +#. ORE +#. we should not simply unpack the archive, but better parse it and +#. db_write each entry (see sync_load_dbarchive to get archive content) +#: ../alpm.c:426 hunk ./lib/libalpm/po/de.po 362 -#: ../alpm.c:522 +#: ../alpm.c:574 hunk ./lib/libalpm/po/de.po 367 -#: ../alpm.c:621 +#: ../alpm.c:673 hunk ./lib/libalpm/po/de.po 372 -#: ../alpm.c:632 ../alpm.c:679 +#: ../alpm.c:684 ../alpm.c:731 hunk ./lib/libalpm/po/de.po 377 -#: ../alpm.c:635 +#: ../alpm.c:687 hunk ./lib/libalpm/po/de.po 382 -#: ../alpm.c:668 +#: ../alpm.c:720 hunk ./lib/libalpm/po/de.po 387 -#: ../alpm.c:682 +#: ../alpm.c:734 hunk ./lib/libalpm/po/de.po 392 -#: ../alpm.c:941 +#: ../alpm.c:993 hunk ./lib/libalpm/po/de.po 397 -#: ../alpm.c:942 +#: ../alpm.c:994 hunk ./lib/libalpm/po/de.po 402 -#: ../be_files.c:147 +#: ../alpm.c:1232 +#, c-format +msgid "config: new section '%s'\n" +msgstr "" + +#: ../alpm.c:1275 +msgid "config: usesyslog\n" +msgstr "" + +#: ../alpm.c:1286 +#, c-format +msgid "config: including %s\n" +msgstr "" + +#: ../alpm.c:1298 ../alpm.c:1306 +#, c-format +msgid "config: noupgrade: %s\n" +msgstr "" + +#: ../alpm.c:1316 ../alpm.c:1324 +#, fuzzy, c-format +msgid "config: noextract: %s\n" +msgstr "Konnte %s nicht entpacken: %s\n" + +#: ../alpm.c:1334 ../alpm.c:1342 +#, c-format +msgid "config: ignorepkg: %s\n" +msgstr "" + +#: ../alpm.c:1352 ../alpm.c:1360 +#, c-format +msgid "config: holdpkg: %s\n" +msgstr "" + +#: ../alpm.c:1370 +#, c-format +msgid "config: dbpath: %s\n" +msgstr "" + +#: ../alpm.c:1380 +#, c-format +msgid "config: cachedir: %s\n" +msgstr "" + +#: ../alpm.c:1386 +#, fuzzy, c-format +msgid "config: log file: %s\n" +msgstr "Kann Logdatei '%s' nicht öffnen" + +#. The config value is in days, we use seconds +#: ../alpm.c:1394 +#, c-format +msgid "config: UpgradeDelay: %i\n" +msgstr "" + +#. add to the list +#: ../alpm.c:1415 +#, fuzzy, c-format +msgid "config: %s: server: %s\n" +msgstr "Warnung: %s gesichert als %s" + +#: ../be_files.c:151 hunk ./lib/libalpm/po/de.po 468 -#: ../be_files.c:428 +#: ../be_files.c:432 hunk ./lib/libalpm/po/de.po 473 -#: ../be_files.c:513 +#: ../be_files.c:517 hunk ./lib/libalpm/po/de.po 478 -#: ../be_files.c:539 +#: ../be_files.c:543 hunk ./lib/libalpm/po/de.po 483 -#: ../cache.c:55 +#: ../cache.c:57 hunk ./lib/libalpm/po/de.po 488 -#: ../cache.c:75 +#: ../cache.c:77 hunk ./lib/libalpm/po/de.po 493 -#: ../cache.c:110 +#: ../cache.c:112 hunk ./lib/libalpm/po/de.po 498 -#: ../cache.c:132 +#: ../cache.c:134 hunk ./lib/libalpm/po/de.po 503 -#: ../cache.c:163 +#: ../cache.c:165 hunk ./lib/libalpm/po/de.po 509 -#: ../conflict.c:68 +#: ../conflict.c:71 hunk ./lib/libalpm/po/de.po 516 -#: ../conflict.c:77 ../conflict.c:91 +#: ../conflict.c:80 ../conflict.c:94 hunk ./lib/libalpm/po/de.po 522 -#: ../conflict.c:104 +#: ../conflict.c:107 hunk ./lib/libalpm/po/de.po 528 -#: ../conflict.c:113 ../conflict.c:126 +#: ../conflict.c:116 ../conflict.c:129 hunk ./lib/libalpm/po/de.po 534 -#: ../conflict.c:140 +#: ../conflict.c:143 hunk ./lib/libalpm/po/de.po 539 -#: ../conflict.c:167 ../conflict.c:182 +#: ../conflict.c:170 ../conflict.c:185 hunk ./lib/libalpm/po/de.po 544 -#: ../conflict.c:231 ../conflict.c:332 ../deps.c:52 ../deps.c:599 -#: ../deps.c:639 ../group.c:40 ../handle.c:50 ../package.c:95 ../sync.c:60 -#: ../sync.c:630 ../sync.c:646 ../sync.c:742 ../trans.c:46 ../util.c:594 -#: ../util.c:601 +#: ../conflict.c:234 ../conflict.c:335 ../deps.c:54 ../deps.c:601 +#: ../deps.c:641 ../group.c:42 ../handle.c:62 ../package.c:98 ../sync.c:65 +#: ../sync.c:635 ../sync.c:651 ../sync.c:747 ../trans.c:49 ../util.c:598 +#: ../util.c:605 hunk ./lib/libalpm/po/de.po 552 -#: ../db.c:53 ../db.c:60 +#: ../db.c:57 ../db.c:64 hunk ./lib/libalpm/po/de.po 557 -#: ../deps.c:116 +#: ../deps.c:118 hunk ./lib/libalpm/po/de.po 562 -#: ../deps.c:121 +#: ../deps.c:123 hunk ./lib/libalpm/po/de.po 566 -#: ../deps.c:164 +#: ../deps.c:166 hunk ./lib/libalpm/po/de.po 571 -#: ../deps.c:258 ../deps.c:404 +#: ../deps.c:260 ../deps.c:406 hunk ./lib/libalpm/po/de.po 576 -#: ../deps.c:368 +#: ../deps.c:370 hunk ./lib/libalpm/po/de.po 581 -#: ../deps.c:492 +#: ../deps.c:494 hunk ./lib/libalpm/po/de.po 586 -#: ../deps.c:497 +#: ../deps.c:499 hunk ./lib/libalpm/po/de.po 590 -#: ../deps.c:509 +#: ../deps.c:511 hunk ./lib/libalpm/po/de.po 596 -#: ../deps.c:526 +#: ../deps.c:528 hunk ./lib/libalpm/po/de.po 601 -#: ../deps.c:529 +#: ../deps.c:531 hunk ./lib/libalpm/po/de.po 606 -#: ../deps.c:571 +#: ../deps.c:573 hunk ./lib/libalpm/po/de.po 611 -#: ../deps.c:595 +#: ../deps.c:597 hunk ./lib/libalpm/po/de.po 620 -#: ../deps.c:612 +#: ../deps.c:614 hunk ./lib/libalpm/po/de.po 625 -#: ../deps.c:632 +#: ../deps.c:634 hunk ./lib/libalpm/po/de.po 630 -#: ../deps.c:636 +#: ../deps.c:638 hunk ./lib/libalpm/po/de.po 636 -#: ../deps.c:652 +#: ../deps.c:654 hunk ./lib/libalpm/po/de.po 641 -#: ../error.c:31 +#: ../error.c:34 hunk ./lib/libalpm/po/de.po 645 -#: ../error.c:33 ../error.c:121 +#: ../error.c:36 ../error.c:135 hunk ./lib/libalpm/po/de.po 649 -#: ../error.c:35 +#: ../error.c:38 hunk ./lib/libalpm/po/de.po 653 -#: ../error.c:37 +#: ../error.c:40 hunk ./lib/libalpm/po/de.po 657 -#: ../error.c:39 +#: ../error.c:42 hunk ./lib/libalpm/po/de.po 661 -#: ../error.c:42 +#: ../error.c:45 hunk ./lib/libalpm/po/de.po 665 -#: ../error.c:44 +#: ../error.c:47 hunk ./lib/libalpm/po/de.po 669 -#: ../error.c:46 +#: ../error.c:49 hunk ./lib/libalpm/po/de.po 673 -#: ../error.c:49 +#: ../error.c:52 hunk ./lib/libalpm/po/de.po 677 -#: ../error.c:51 +#: ../error.c:54 hunk ./lib/libalpm/po/de.po 681 -#: ../error.c:53 +#: ../error.c:56 hunk ./lib/libalpm/po/de.po 685 -#: ../error.c:55 +#: ../error.c:58 hunk ./lib/libalpm/po/de.po 689 -#: ../error.c:57 +#: ../error.c:60 hunk ./lib/libalpm/po/de.po 693 -#: ../error.c:59 +#: ../error.c:62 hunk ./lib/libalpm/po/de.po 697 -#: ../error.c:61 +#: ../error.c:64 hunk ./lib/libalpm/po/de.po 701 -#: ../error.c:68 +#: ../error.c:71 hunk ./lib/libalpm/po/de.po 705 -#: ../error.c:71 ../error.c:77 +#: ../error.c:74 ../error.c:80 hunk ./lib/libalpm/po/de.po 709 -#: ../error.c:73 +#: ../error.c:76 hunk ./lib/libalpm/po/de.po 713 -#: ../error.c:75 +#: ../error.c:78 hunk ./lib/libalpm/po/de.po 717 -#: ../error.c:79 +#: ../error.c:82 hunk ./lib/libalpm/po/de.po 721 -#: ../error.c:81 +#: ../error.c:84 hunk ./lib/libalpm/po/de.po 725 -#: ../error.c:83 +#: ../error.c:86 hunk ./lib/libalpm/po/de.po 729 -#: ../error.c:86 +#: ../error.c:89 hunk ./lib/libalpm/po/de.po 733 -#: ../error.c:88 +#: ../error.c:91 hunk ./lib/libalpm/po/de.po 737 -#: ../error.c:90 +#: ../error.c:93 hunk ./lib/libalpm/po/de.po 741 -#: ../error.c:92 +#: ../error.c:95 hunk ./lib/libalpm/po/de.po 745 -#: ../error.c:94 +#: ../error.c:97 hunk ./lib/libalpm/po/de.po 749 -#: ../error.c:96 +#: ../error.c:99 hunk ./lib/libalpm/po/de.po 753 -#: ../error.c:98 +#: ../error.c:101 hunk ./lib/libalpm/po/de.po 757 -#: ../error.c:100 +#: ../error.c:103 hunk ./lib/libalpm/po/de.po 761 -#: ../error.c:103 +#: ../error.c:106 hunk ./lib/libalpm/po/de.po 765 -#: ../error.c:106 +#: ../error.c:109 hunk ./lib/libalpm/po/de.po 769 -#: ../error.c:108 +#: ../error.c:111 hunk ./lib/libalpm/po/de.po 773 -#: ../error.c:110 +#: ../error.c:113 hunk ./lib/libalpm/po/de.po 777 -#: ../error.c:113 +#: ../error.c:116 hunk ./lib/libalpm/po/de.po 781 -#: ../error.c:115 +#: ../error.c:118 hunk ./lib/libalpm/po/de.po 785 -#: ../error.c:117 +#: ../error.c:120 hunk ./lib/libalpm/po/de.po 789 -#: ../error.c:119 +#: ../error.c:122 hunk ./lib/libalpm/po/de.po 793 -#: ../handle.c:127 +#: ../error.c:124 +msgid "not confirmed" +msgstr "" + +#: ../error.c:127 +msgid "bad section name" +msgstr "" + +#: ../error.c:129 +msgid "'local' is reserved and cannot be used as a package tree" +msgstr "" + +#: ../error.c:131 +#, fuzzy +msgid "syntax error" +msgstr "Interner Fehler" + +#: ../error.c:133 +msgid "all directives must belong to a section" +msgstr "" + +#: ../handle.c:143 hunk ./lib/libalpm/po/de.po 819 -#: ../handle.c:134 +#: ../handle.c:150 hunk ./lib/libalpm/po/de.po 824 -#: ../handle.c:151 +#: ../handle.c:167 hunk ./lib/libalpm/po/de.po 829 -#: ../handle.c:155 +#: ../handle.c:171 hunk ./lib/libalpm/po/de.po 834 -#: ../handle.c:160 +#: ../handle.c:176 hunk ./lib/libalpm/po/de.po 839 -#: ../handle.c:163 +#: ../handle.c:179 hunk ./lib/libalpm/po/de.po 843 -#: ../handle.c:169 +#: ../handle.c:185 hunk ./lib/libalpm/po/de.po 848 -#: ../handle.c:172 +#: ../handle.c:188 hunk ./lib/libalpm/po/de.po 852 -#: ../handle.c:178 +#: ../handle.c:194 hunk ./lib/libalpm/po/de.po 857 -#: ../handle.c:181 +#: ../handle.c:197 hunk ./lib/libalpm/po/de.po 861 -#: ../handle.c:197 +#: ../handle.c:203 +#, fuzzy, c-format +msgid "'%s' added to PM_OPT_HOLDPKG" +msgstr "'%s' zu PM_OPT_IGNOREPKG hinzugefĂŒgt" + +#: ../handle.c:206 +msgid "PM_OPT_HOLDPKG flushed" +msgstr "" + +#: ../handle.c:222 hunk ./lib/libalpm/po/de.po 875 -#: ../handle.c:207 +#: ../handle.c:262 hunk ./lib/libalpm/po/de.po 880 +#: ../handle.c:281 +#, fuzzy, c-format +msgid "PM_OPT_PROXYHOST set to '%s'" +msgstr "PM_OPT_DBPATH auf '%s' gesetzt" + +#: ../handle.c:285 +#, fuzzy, c-format +msgid "PM_OPT_PROXYPORT set to '%d'" +msgstr "PM_OPT_DBPATH auf '%s' gesetzt" + +#: ../handle.c:296 +#, fuzzy, c-format +msgid "PM_OPT_XFERCOMMAND set to '%s'" +msgstr "PM_OPT_CACHEDIR auf '%s' gesetzt" + +#: ../handle.c:300 +#, fuzzy, c-format +msgid "PM_OPT_NOPASSIVEFTP set to '%d'" +msgstr "PM_OPT_DBPATH auf '%s' gesetzt" + +#: ../handle.c:304 +#, fuzzy, c-format +msgid "PM_OPT_CHOMP set to '%d'" +msgstr "PM_OPT_CACHEDIR auf '%s' gesetzt" + hunk ./lib/libalpm/po/de.po 910 -#: ../package.c:182 +#: ../package.c:185 hunk ./lib/libalpm/po/de.po 915 -#: ../package.c:199 ../package.c:259 +#: ../package.c:202 ../package.c:262 hunk ./lib/libalpm/po/de.po 920 -#: ../package.c:316 +#: ../package.c:319 hunk ./lib/libalpm/po/de.po 924 -#: ../package.c:324 +#: ../package.c:327 hunk ./lib/libalpm/po/de.po 929 -#: ../package.c:332 +#: ../package.c:335 hunk ./lib/libalpm/po/de.po 934 -#: ../package.c:371 +#: ../package.c:374 hunk ./lib/libalpm/po/de.po 939 -#: ../package.c:388 +#: ../package.c:391 hunk ./lib/libalpm/po/de.po 944 -#: ../package.c:396 +#: ../package.c:399 hunk ./lib/libalpm/po/de.po 949 -#: ../remove.c:72 +#: ../remove.c:76 hunk ./lib/libalpm/po/de.po 954 -#: ../remove.c:76 +#: ../remove.c:88 hunk ./lib/libalpm/po/de.po 959 -#: ../remove.c:102 +#: ../remove.c:114 hunk ./lib/libalpm/po/de.po 964 -#: ../remove.c:105 +#: ../remove.c:117 hunk ./lib/libalpm/po/de.po 969 -#: ../remove.c:123 +#: ../remove.c:135 hunk ./lib/libalpm/po/de.po 973 -#: ../remove.c:167 +#: ../remove.c:180 hunk ./lib/libalpm/po/de.po 978 -#: ../remove.c:177 +#: ../remove.c:191 hunk ./lib/libalpm/po/de.po 982 -#: ../remove.c:198 +#: ../remove.c:217 hunk ./lib/libalpm/po/de.po 988 -#: ../remove.c:204 +#: ../remove.c:223 hunk ./lib/libalpm/po/de.po 993 -#: ../remove.c:206 +#: ../remove.c:225 hunk ./lib/libalpm/po/de.po 998 -#: ../remove.c:220 +#: ../remove.c:239 hunk ./lib/libalpm/po/de.po 1003 -#: ../remove.c:232 ../remove.c:233 +#: ../remove.c:251 ../remove.c:252 hunk ./lib/libalpm/po/de.po 1008 -#: ../remove.c:235 ../remove.c:242 +#: ../remove.c:254 ../remove.c:261 hunk ./lib/libalpm/po/de.po 1013 -#: ../remove.c:237 ../remove.c:244 +#: ../remove.c:256 ../remove.c:266 hunk ./lib/libalpm/po/de.po 1018 -#: ../remove.c:263 +#: ../remove.c:285 hunk ./lib/libalpm/po/de.po 1023 -#: ../remove.c:265 +#: ../remove.c:287 hunk ./lib/libalpm/po/de.po 1028 -#: ../remove.c:268 +#: ../remove.c:290 hunk ./lib/libalpm/po/de.po 1033 -#: ../remove.c:308 +#: ../remove.c:330 hunk ./lib/libalpm/po/de.po 1039 -#: ../sync.c:155 +#: ../sync.c:160 hunk ./lib/libalpm/po/de.po 1043 -#: ../sync.c:164 +#: ../sync.c:169 hunk ./lib/libalpm/po/de.po 1048 -#: ../sync.c:166 +#: ../sync.c:171 hunk ./lib/libalpm/po/de.po 1053 -#: ../sync.c:200 +#: ../sync.c:205 hunk ./lib/libalpm/po/de.po 1059 -#: ../sync.c:212 +#: ../sync.c:217 hunk ./lib/libalpm/po/de.po 1063 -#: ../sync.c:224 +#: ../sync.c:229 hunk ./lib/libalpm/po/de.po 1068 -#: ../sync.c:238 ../sync.c:525 +#: ../sync.c:243 ../sync.c:530 hunk ./lib/libalpm/po/de.po 1074 -#: ../sync.c:247 +#: ../sync.c:252 hunk ./lib/libalpm/po/de.po 1080 -#: ../sync.c:253 +#: ../sync.c:258 hunk ./lib/libalpm/po/de.po 1086 -#: ../sync.c:257 +#: ../sync.c:262 hunk ./lib/libalpm/po/de.po 1091 -#: ../sync.c:261 +#: ../sync.c:266 hunk ./lib/libalpm/po/de.po 1097 -#: ../sync.c:312 ../sync.c:331 +#: ../sync.c:317 ../sync.c:336 hunk ./lib/libalpm/po/de.po 1102 -#: ../sync.c:317 ../sync.c:336 +#: ../sync.c:322 ../sync.c:341 hunk ./lib/libalpm/po/de.po 1107 -#: ../sync.c:355 +#: ../sync.c:360 hunk ./lib/libalpm/po/de.po 1112 -#: ../sync.c:363 +#: ../sync.c:368 hunk ./lib/libalpm/po/de.po 1117 -#: ../sync.c:383 +#: ../sync.c:388 hunk ./lib/libalpm/po/de.po 1122 -#: ../sync.c:428 +#: ../sync.c:433 hunk ./lib/libalpm/po/de.po 1126 -#: ../sync.c:448 +#: ../sync.c:453 hunk ./lib/libalpm/po/de.po 1131 -#: ../sync.c:480 +#: ../sync.c:485 hunk ./lib/libalpm/po/de.po 1135 -#: ../sync.c:510 +#: ../sync.c:515 hunk ./lib/libalpm/po/de.po 1140 -#: ../sync.c:532 +#: ../sync.c:537 hunk ./lib/libalpm/po/de.po 1148 -#: ../sync.c:543 +#: ../sync.c:548 hunk ./lib/libalpm/po/de.po 1153 -#: ../sync.c:566 ../sync.c:571 +#: ../sync.c:571 ../sync.c:576 hunk ./lib/libalpm/po/de.po 1158 -#: ../sync.c:583 ../sync.c:620 +#: ../sync.c:588 ../sync.c:625 hunk ./lib/libalpm/po/de.po 1165 -#: ../sync.c:592 +#: ../sync.c:597 hunk ./lib/libalpm/po/de.po 1171 -#: ../sync.c:615 +#: ../sync.c:620 hunk ./lib/libalpm/po/de.po 1177 -#: ../sync.c:626 ../sync.c:642 +#: ../sync.c:631 ../sync.c:647 hunk ./lib/libalpm/po/de.po 1181 -#: ../sync.c:694 +#: ../sync.c:699 hunk ./lib/libalpm/po/de.po 1185 -#: ../sync.c:708 +#: ../sync.c:713 hunk ./lib/libalpm/po/de.po 1190 -#: ../sync.c:727 +#: ../sync.c:732 hunk ./lib/libalpm/po/de.po 1195 -#: ../sync.c:812 ../sync.c:824 +#: ../sync.c:825 +#, c-format +msgid "%s-%s-%s%s is already in the cache\n" +msgstr "" + +#. no cache directory.... try creating it +#: ../sync.c:837 +#, c-format +msgid "no %s cache exists. creating...\n" +msgstr "" + +#: ../sync.c:838 +#, c-format +msgid "warning: no %s cache exists. creating..." +msgstr "" + +#. couldn't mkdir the cache directory, so fall back to /tmp and unlink +#. * the package afterwards. +#. +#: ../sync.c:843 +msgid "couldn't create package cache, using /tmp instead\n" +msgstr "" + +#: ../sync.c:844 +msgid "warning: couldn't create package cache, using /tmp instead" +msgstr "" + +#: ../sync.c:847 +#, c-format +msgid "failed to set option CACHEDIR (%s)\n" +msgstr "" + +#: ../sync.c:854 +#, c-format +msgid "failed to retrieve some files from %s\n" +msgstr "" + +#: ../sync.c:883 ../sync.c:895 hunk ./lib/libalpm/po/de.po 1237 -#: ../sync.c:843 +#: ../sync.c:914 hunk ./lib/libalpm/po/de.po 1242 -#: ../sync.c:845 +#: ../sync.c:916 hunk ./lib/libalpm/po/de.po 1247 -#: ../sync.c:865 +#: ../sync.c:936 hunk ./lib/libalpm/po/de.po 1251 -#: ../sync.c:871 +#: ../sync.c:942 hunk ./lib/libalpm/po/de.po 1255 -#: ../sync.c:891 +#: ../sync.c:962 hunk ./lib/libalpm/po/de.po 1259 -#: ../sync.c:893 +#: ../sync.c:964 hunk ./lib/libalpm/po/de.po 1263 -#: ../sync.c:899 +#: ../sync.c:970 hunk ./lib/libalpm/po/de.po 1268 -#: ../sync.c:906 +#: ../sync.c:977 hunk ./lib/libalpm/po/de.po 1272 -#: ../sync.c:909 +#: ../sync.c:980 hunk ./lib/libalpm/po/de.po 1276 -#: ../sync.c:914 +#: ../sync.c:985 hunk ./lib/libalpm/po/de.po 1280 -#: ../sync.c:933 +#: ../sync.c:1004 hunk ./lib/libalpm/po/de.po 1284 -#: ../sync.c:938 +#: ../sync.c:1009 hunk ./lib/libalpm/po/de.po 1288 -#: ../sync.c:945 +#: ../sync.c:1016 hunk ./lib/libalpm/po/de.po 1293 -#: ../sync.c:974 +#: ../sync.c:1045 hunk ./lib/libalpm/po/de.po 1298 -#: ../sync.c:983 +#: ../sync.c:1054 hunk ./lib/libalpm/po/de.po 1303 -#: ../util.c:281 +#: ../util.c:285 hunk ./lib/libalpm/po/de.po 1308 -#: ../util.c:432 +#: ../util.c:436 hunk ./lib/libalpm/po/de.po 1312 -#: ../util.c:459 +#: ../util.c:463 hunk ./lib/libalpm/po/de.po 1317 -#: ../util.c:462 +#: ../util.c:466 hunk ./lib/libalpm/po/de.po 1322 -#: ../util.c:475 +#: ../util.c:479 hunk ./lib/libalpm/po/de.po 1327 -#: ../util.c:482 +#: ../util.c:486 hunk ./lib/libalpm/po/de.po 1332 -#: ../util.c:484 +#: ../util.c:488 hunk ./lib/libalpm/po/de.po 1337 -#: ../util.c:488 +#: ../util.c:492 hunk ./lib/libalpm/po/de.po 1342 -#: ../util.c:492 +#: ../util.c:496 hunk ./lib/libalpm/po/de.po 1347 -#: ../util.c:495 +#: ../util.c:499 hunk ./lib/libalpm/po/de.po 1352 -#: ../util.c:517 +#: ../util.c:521 hunk ./lib/libalpm/po/de.po 1357 -#: ../util.c:525 +#: ../util.c:529 hunk ./lib/libalpm/po/de.po 1362 -#: ../util.c:589 +#: ../util.c:593 hunk ./lib/libalpm/po/fr.po 10 -"POT-Creation-Date: 2006-08-26 14:56+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./lib/libalpm/po/fr.po 20 -#: ../add.c:91 +#: ../add.c:95 hunk ./lib/libalpm/po/fr.po 25 -#: ../add.c:123 +#: ../add.c:127 hunk ./lib/libalpm/po/fr.po 30 -#: ../add.c:165 +#: ../add.c:169 hunk ./lib/libalpm/po/fr.po 35 -#: ../add.c:174 +#: ../add.c:178 hunk ./lib/libalpm/po/fr.po 40 -#: ../add.c:181 +#: ../add.c:185 hunk ./lib/libalpm/po/fr.po 46 -#: ../add.c:223 ../remove.c:92 +#: ../add.c:227 ../remove.c:104 hunk ./lib/libalpm/po/fr.po 51 -#: ../add.c:235 ../sync.c:499 +#: ../add.c:239 ../sync.c:504 hunk ./lib/libalpm/po/fr.po 56 -#: ../add.c:247 ../remove.c:128 +#: ../add.c:251 ../remove.c:140 hunk ./lib/libalpm/po/fr.po 60 -#: ../add.c:259 +#: ../add.c:263 hunk ./lib/libalpm/po/fr.po 64 -#: ../add.c:276 +#: ../add.c:280 hunk ./lib/libalpm/po/fr.po 68 -#: ../add.c:341 +#: ../add.c:345 hunk ./lib/libalpm/po/fr.po 73 -#: ../add.c:351 ../alpm.c:515 ../conflict.c:271 ../conflict.c:301 +#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304 hunk ./lib/libalpm/po/fr.po 78 -#: ../add.c:361 ../alpm.c:495 ../alpm.c:627 ../alpm.c:674 +#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726 hunk ./lib/libalpm/po/fr.po 83 -#: ../add.c:374 +#: ../add.c:378 hunk ./lib/libalpm/po/fr.po 88 -#: ../add.c:404 +#: ../add.c:408 hunk ./lib/libalpm/po/fr.po 93 -#: ../add.c:415 +#: ../add.c:419 hunk ./lib/libalpm/po/fr.po 98 -#: ../add.c:419 +#: ../add.c:423 hunk ./lib/libalpm/po/fr.po 102 -#: ../add.c:434 ../util.c:452 +#: ../add.c:438 ../util.c:456 hunk ./lib/libalpm/po/fr.po 106 -#: ../add.c:488 +#: ../add.c:492 hunk ./lib/libalpm/po/fr.po 111 -#: ../add.c:524 ../add.c:677 +#: ../add.c:528 ../add.c:681 hunk ./lib/libalpm/po/fr.po 116 -#: ../add.c:567 +#: ../add.c:571 hunk ./lib/libalpm/po/fr.po 121 -#: ../add.c:568 ../add.c:575 +#: ../add.c:572 ../add.c:579 hunk ./lib/libalpm/po/fr.po 126 -#: ../add.c:569 ../add.c:576 +#: ../add.c:573 ../add.c:580 hunk ./lib/libalpm/po/fr.po 131 -#: ../add.c:571 ../add.c:578 +#: ../add.c:575 ../add.c:582 hunk ./lib/libalpm/po/fr.po 136 -#: ../add.c:574 +#: ../add.c:578 hunk ./lib/libalpm/po/fr.po 141 -#: ../add.c:592 +#: ../add.c:596 hunk ./lib/libalpm/po/fr.po 146 -#: ../add.c:593 +#: ../add.c:597 hunk ./lib/libalpm/po/fr.po 151 -#: ../add.c:597 ../add.c:641 +#: ../add.c:601 ../add.c:645 hunk ./lib/libalpm/po/fr.po 156 -#: ../add.c:598 +#: ../add.c:602 hunk ./lib/libalpm/po/fr.po 161 -#: ../add.c:602 +#: ../add.c:606 hunk ./lib/libalpm/po/fr.po 166 -#: ../add.c:603 +#: ../add.c:607 hunk ./lib/libalpm/po/fr.po 171 -#: ../add.c:613 ../add.c:616 ../add.c:622 +#: ../add.c:617 ../add.c:620 ../add.c:626 hunk ./lib/libalpm/po/fr.po 175 -#: ../add.c:620 +#: ../add.c:624 hunk ./lib/libalpm/po/fr.po 179 -#: ../add.c:626 +#: ../add.c:630 hunk ./lib/libalpm/po/fr.po 185 -#: ../add.c:630 +#: ../add.c:634 hunk ./lib/libalpm/po/fr.po 190 -#: ../add.c:631 +#: ../add.c:635 hunk ./lib/libalpm/po/fr.po 195 -#: ../add.c:633 +#: ../add.c:637 hunk ./lib/libalpm/po/fr.po 200 -#: ../add.c:634 +#: ../add.c:638 hunk ./lib/libalpm/po/fr.po 205 -#: ../add.c:639 ../add.c:659 +#: ../add.c:643 ../add.c:663 hunk ./lib/libalpm/po/fr.po 210 -#: ../add.c:661 +#: ../add.c:665 hunk ./lib/libalpm/po/fr.po 215 -#: ../add.c:663 +#: ../add.c:667 hunk ./lib/libalpm/po/fr.po 220 -#: ../add.c:664 +#: ../add.c:668 hunk ./lib/libalpm/po/fr.po 225 -#: ../add.c:678 +#: ../add.c:682 hunk ./lib/libalpm/po/fr.po 230 -#: ../add.c:689 +#: ../add.c:693 hunk ./lib/libalpm/po/fr.po 234 -#: ../add.c:721 ../add.c:723 +#: ../add.c:725 ../add.c:727 hunk ./lib/libalpm/po/fr.po 239 -#: ../add.c:722 ../add.c:724 +#: ../add.c:726 ../add.c:728 hunk ./lib/libalpm/po/fr.po 243 -#: ../add.c:722 ../add.c:724 +#: ../add.c:726 ../add.c:728 hunk ./lib/libalpm/po/fr.po 247 -#: ../add.c:745 ../add.c:796 +#: ../add.c:749 ../add.c:800 hunk ./lib/libalpm/po/fr.po 253 -#: ../add.c:756 ../remove.c:262 +#: ../add.c:760 ../remove.c:284 hunk ./lib/libalpm/po/fr.po 257 -#: ../add.c:757 +#: ../add.c:761 hunk ./lib/libalpm/po/fr.po 262 -#: ../add.c:759 +#: ../add.c:763 hunk ./lib/libalpm/po/fr.po 267 -#: ../add.c:761 +#: ../add.c:765 hunk ./lib/libalpm/po/fr.po 272 -#: ../add.c:765 +#: ../add.c:769 hunk ./lib/libalpm/po/fr.po 278 -#: ../add.c:770 ../remove.c:272 +#: ../add.c:774 ../remove.c:294 hunk ./lib/libalpm/po/fr.po 282 -#: ../add.c:791 ../remove.c:300 +#: ../add.c:795 ../remove.c:322 hunk ./lib/libalpm/po/fr.po 287 -#: ../add.c:799 ../remove.c:310 +#: ../add.c:803 ../remove.c:332 hunk ./lib/libalpm/po/fr.po 294 -#: ../add.c:826 ../remove.c:322 +#: ../add.c:830 ../remove.c:345 hunk ./lib/libalpm/po/fr.po 299 -#: ../alpm.c:196 +#: ../alpm.c:201 hunk ./lib/libalpm/po/fr.po 304 -#: ../alpm.c:201 +#: ../alpm.c:206 hunk ./lib/libalpm/po/fr.po 310 -#: ../alpm.c:212 +#: ../alpm.c:217 hunk ./lib/libalpm/po/fr.po 315 -#: ../alpm.c:256 +#: ../alpm.c:261 hunk ./lib/libalpm/po/fr.po 320 -#: ../alpm.c:261 +#: ../alpm.c:266 hunk ./lib/libalpm/po/fr.po 325 -#: ../alpm.c:327 +#: ../alpm.c:344 hunk ./lib/libalpm/po/fr.po 331 -#: ../alpm.c:331 +#: ../alpm.c:348 hunk ./lib/libalpm/po/fr.po 336 +#: ../alpm.c:383 +#, c-format +msgid "failed to get lastupdate time for %s (no big deal)\n" +msgstr "" + +#: ../alpm.c:402 +#, c-format +msgid "sync: new mtime for %s: %s\n" +msgstr "" + hunk ./lib/libalpm/po/fr.po 347 -#: ../alpm.c:358 +#: ../alpm.c:408 hunk ./lib/libalpm/po/fr.po 352 -#: ../alpm.c:362 +#: ../alpm.c:412 hunk ./lib/libalpm/po/fr.po 357 -#: ../alpm.c:377 +#. uncompress the sync database +#. ORE +#. we should not simply unpack the archive, but better parse it and +#. db_write each entry (see sync_load_dbarchive to get archive content) +#: ../alpm.c:426 hunk ./lib/libalpm/po/fr.po 366 -#: ../alpm.c:522 +#: ../alpm.c:574 hunk ./lib/libalpm/po/fr.po 371 -#: ../alpm.c:621 +#: ../alpm.c:673 hunk ./lib/libalpm/po/fr.po 376 -#: ../alpm.c:632 ../alpm.c:679 +#: ../alpm.c:684 ../alpm.c:731 hunk ./lib/libalpm/po/fr.po 381 -#: ../alpm.c:635 +#: ../alpm.c:687 hunk ./lib/libalpm/po/fr.po 386 -#: ../alpm.c:668 +#: ../alpm.c:720 hunk ./lib/libalpm/po/fr.po 391 -#: ../alpm.c:682 +#: ../alpm.c:734 hunk ./lib/libalpm/po/fr.po 396 -#: ../alpm.c:941 +#: ../alpm.c:993 hunk ./lib/libalpm/po/fr.po 401 -#: ../alpm.c:942 +#: ../alpm.c:994 hunk ./lib/libalpm/po/fr.po 406 -#: ../be_files.c:147 +#: ../alpm.c:1232 +#, c-format +msgid "config: new section '%s'\n" +msgstr "" + +#: ../alpm.c:1275 +msgid "config: usesyslog\n" +msgstr "" + +#: ../alpm.c:1286 +#, c-format +msgid "config: including %s\n" +msgstr "" + +#: ../alpm.c:1298 ../alpm.c:1306 +#, c-format +msgid "config: noupgrade: %s\n" +msgstr "" + +#: ../alpm.c:1316 ../alpm.c:1324 +#, fuzzy, c-format +msgid "config: noextract: %s\n" +msgstr "n'a pas pu extraire %s: %s\n" + +#: ../alpm.c:1334 ../alpm.c:1342 +#, c-format +msgid "config: ignorepkg: %s\n" +msgstr "" + +#: ../alpm.c:1352 ../alpm.c:1360 +#, c-format +msgid "config: holdpkg: %s\n" +msgstr "" + +#: ../alpm.c:1370 +#, c-format +msgid "config: dbpath: %s\n" +msgstr "" + +#: ../alpm.c:1380 +#, c-format +msgid "config: cachedir: %s\n" +msgstr "" + +#: ../alpm.c:1386 +#, fuzzy, c-format +msgid "config: log file: %s\n" +msgstr "ne peut ouvrir le fichier de log %s" + +#. The config value is in days, we use seconds +#: ../alpm.c:1394 +#, c-format +msgid "config: UpgradeDelay: %i\n" +msgstr "" + +#. add to the list +#: ../alpm.c:1415 +#, fuzzy, c-format +msgid "config: %s: server: %s\n" +msgstr "avertissement: %s sauve en tant que %s" + +#: ../be_files.c:151 hunk ./lib/libalpm/po/fr.po 472 -#: ../be_files.c:428 +#: ../be_files.c:432 hunk ./lib/libalpm/po/fr.po 477 -#: ../be_files.c:513 +#: ../be_files.c:517 hunk ./lib/libalpm/po/fr.po 482 -#: ../be_files.c:539 +#: ../be_files.c:543 hunk ./lib/libalpm/po/fr.po 487 -#: ../cache.c:55 +#: ../cache.c:57 hunk ./lib/libalpm/po/fr.po 492 -#: ../cache.c:75 +#: ../cache.c:77 hunk ./lib/libalpm/po/fr.po 497 -#: ../cache.c:110 +#: ../cache.c:112 hunk ./lib/libalpm/po/fr.po 502 -#: ../cache.c:132 +#: ../cache.c:134 hunk ./lib/libalpm/po/fr.po 507 -#: ../cache.c:163 +#: ../cache.c:165 hunk ./lib/libalpm/po/fr.po 513 -#: ../conflict.c:68 +#: ../conflict.c:71 hunk ./lib/libalpm/po/fr.po 520 -#: ../conflict.c:77 ../conflict.c:91 +#: ../conflict.c:80 ../conflict.c:94 hunk ./lib/libalpm/po/fr.po 526 -#: ../conflict.c:104 +#: ../conflict.c:107 hunk ./lib/libalpm/po/fr.po 532 -#: ../conflict.c:113 ../conflict.c:126 +#: ../conflict.c:116 ../conflict.c:129 hunk ./lib/libalpm/po/fr.po 538 -#: ../conflict.c:140 +#: ../conflict.c:143 hunk ./lib/libalpm/po/fr.po 543 -#: ../conflict.c:167 ../conflict.c:182 +#: ../conflict.c:170 ../conflict.c:185 hunk ./lib/libalpm/po/fr.po 548 -#: ../conflict.c:231 ../conflict.c:332 ../deps.c:52 ../deps.c:599 -#: ../deps.c:639 ../group.c:40 ../handle.c:50 ../package.c:95 ../sync.c:60 -#: ../sync.c:630 ../sync.c:646 ../sync.c:742 ../trans.c:46 ../util.c:594 -#: ../util.c:601 +#: ../conflict.c:234 ../conflict.c:335 ../deps.c:54 ../deps.c:601 +#: ../deps.c:641 ../group.c:42 ../handle.c:62 ../package.c:98 ../sync.c:65 +#: ../sync.c:635 ../sync.c:651 ../sync.c:747 ../trans.c:49 ../util.c:598 +#: ../util.c:605 hunk ./lib/libalpm/po/fr.po 556 -#: ../db.c:53 ../db.c:60 +#: ../db.c:57 ../db.c:64 hunk ./lib/libalpm/po/fr.po 561 -#: ../deps.c:116 +#: ../deps.c:118 hunk ./lib/libalpm/po/fr.po 565 -#: ../deps.c:121 +#: ../deps.c:123 hunk ./lib/libalpm/po/fr.po 569 -#: ../deps.c:164 +#: ../deps.c:166 hunk ./lib/libalpm/po/fr.po 573 -#: ../deps.c:258 ../deps.c:404 +#: ../deps.c:260 ../deps.c:406 hunk ./lib/libalpm/po/fr.po 578 -#: ../deps.c:368 +#: ../deps.c:370 hunk ./lib/libalpm/po/fr.po 583 -#: ../deps.c:492 +#: ../deps.c:494 hunk ./lib/libalpm/po/fr.po 588 -#: ../deps.c:497 +#: ../deps.c:499 hunk ./lib/libalpm/po/fr.po 592 -#: ../deps.c:509 +#: ../deps.c:511 hunk ./lib/libalpm/po/fr.po 598 -#: ../deps.c:526 +#: ../deps.c:528 hunk ./lib/libalpm/po/fr.po 603 -#: ../deps.c:529 +#: ../deps.c:531 hunk ./lib/libalpm/po/fr.po 608 -#: ../deps.c:571 +#: ../deps.c:573 hunk ./lib/libalpm/po/fr.po 613 -#: ../deps.c:595 +#: ../deps.c:597 hunk ./lib/libalpm/po/fr.po 622 -#: ../deps.c:612 +#: ../deps.c:614 hunk ./lib/libalpm/po/fr.po 627 -#: ../deps.c:632 +#: ../deps.c:634 hunk ./lib/libalpm/po/fr.po 632 -#: ../deps.c:636 +#: ../deps.c:638 hunk ./lib/libalpm/po/fr.po 638 -#: ../deps.c:652 +#: ../deps.c:654 hunk ./lib/libalpm/po/fr.po 643 -#: ../error.c:31 +#: ../error.c:34 hunk ./lib/libalpm/po/fr.po 647 -#: ../error.c:33 ../error.c:121 +#: ../error.c:36 ../error.c:135 hunk ./lib/libalpm/po/fr.po 651 -#: ../error.c:35 +#: ../error.c:38 hunk ./lib/libalpm/po/fr.po 655 -#: ../error.c:37 +#: ../error.c:40 hunk ./lib/libalpm/po/fr.po 659 -#: ../error.c:39 +#: ../error.c:42 hunk ./lib/libalpm/po/fr.po 663 -#: ../error.c:42 +#: ../error.c:45 hunk ./lib/libalpm/po/fr.po 667 -#: ../error.c:44 +#: ../error.c:47 hunk ./lib/libalpm/po/fr.po 671 -#: ../error.c:46 +#: ../error.c:49 hunk ./lib/libalpm/po/fr.po 675 -#: ../error.c:49 +#: ../error.c:52 hunk ./lib/libalpm/po/fr.po 679 -#: ../error.c:51 +#: ../error.c:54 hunk ./lib/libalpm/po/fr.po 683 -#: ../error.c:53 +#: ../error.c:56 hunk ./lib/libalpm/po/fr.po 687 -#: ../error.c:55 +#: ../error.c:58 hunk ./lib/libalpm/po/fr.po 691 -#: ../error.c:57 +#: ../error.c:60 hunk ./lib/libalpm/po/fr.po 695 -#: ../error.c:59 +#: ../error.c:62 hunk ./lib/libalpm/po/fr.po 699 -#: ../error.c:61 +#: ../error.c:64 hunk ./lib/libalpm/po/fr.po 703 -#: ../error.c:68 +#: ../error.c:71 hunk ./lib/libalpm/po/fr.po 707 -#: ../error.c:71 ../error.c:77 +#: ../error.c:74 ../error.c:80 hunk ./lib/libalpm/po/fr.po 711 -#: ../error.c:73 +#: ../error.c:76 hunk ./lib/libalpm/po/fr.po 715 -#: ../error.c:75 +#: ../error.c:78 hunk ./lib/libalpm/po/fr.po 719 -#: ../error.c:79 +#: ../error.c:82 hunk ./lib/libalpm/po/fr.po 723 -#: ../error.c:81 +#: ../error.c:84 hunk ./lib/libalpm/po/fr.po 727 -#: ../error.c:83 +#: ../error.c:86 hunk ./lib/libalpm/po/fr.po 731 -#: ../error.c:86 +#: ../error.c:89 hunk ./lib/libalpm/po/fr.po 735 -#: ../error.c:88 +#: ../error.c:91 hunk ./lib/libalpm/po/fr.po 739 -#: ../error.c:90 +#: ../error.c:93 hunk ./lib/libalpm/po/fr.po 743 -#: ../error.c:92 +#: ../error.c:95 hunk ./lib/libalpm/po/fr.po 747 -#: ../error.c:94 +#: ../error.c:97 hunk ./lib/libalpm/po/fr.po 751 -#: ../error.c:96 +#: ../error.c:99 hunk ./lib/libalpm/po/fr.po 755 -#: ../error.c:98 +#: ../error.c:101 hunk ./lib/libalpm/po/fr.po 759 -#: ../error.c:100 +#: ../error.c:103 hunk ./lib/libalpm/po/fr.po 763 -#: ../error.c:103 +#: ../error.c:106 hunk ./lib/libalpm/po/fr.po 767 -#: ../error.c:106 +#: ../error.c:109 hunk ./lib/libalpm/po/fr.po 771 -#: ../error.c:108 +#: ../error.c:111 hunk ./lib/libalpm/po/fr.po 775 -#: ../error.c:110 +#: ../error.c:113 hunk ./lib/libalpm/po/fr.po 779 -#: ../error.c:113 +#: ../error.c:116 hunk ./lib/libalpm/po/fr.po 783 -#: ../error.c:115 +#: ../error.c:118 hunk ./lib/libalpm/po/fr.po 787 -#: ../error.c:117 +#: ../error.c:120 hunk ./lib/libalpm/po/fr.po 791 -#: ../error.c:119 +#: ../error.c:122 hunk ./lib/libalpm/po/fr.po 795 -#: ../handle.c:127 +#: ../error.c:124 +msgid "not confirmed" +msgstr "" + +#: ../error.c:127 +msgid "bad section name" +msgstr "" + +#: ../error.c:129 +msgid "'local' is reserved and cannot be used as a package tree" +msgstr "" + +#: ../error.c:131 +#, fuzzy +msgid "syntax error" +msgstr "erreur interne" + +#: ../error.c:133 +msgid "all directives must belong to a section" +msgstr "" + +#: ../handle.c:143 hunk ./lib/libalpm/po/fr.po 821 -#: ../handle.c:134 +#: ../handle.c:150 hunk ./lib/libalpm/po/fr.po 826 -#: ../handle.c:151 +#: ../handle.c:167 hunk ./lib/libalpm/po/fr.po 831 -#: ../handle.c:155 +#: ../handle.c:171 hunk ./lib/libalpm/po/fr.po 836 -#: ../handle.c:160 +#: ../handle.c:176 hunk ./lib/libalpm/po/fr.po 841 -#: ../handle.c:163 +#: ../handle.c:179 hunk ./lib/libalpm/po/fr.po 845 -#: ../handle.c:169 +#: ../handle.c:185 hunk ./lib/libalpm/po/fr.po 850 -#: ../handle.c:172 +#: ../handle.c:188 hunk ./lib/libalpm/po/fr.po 854 -#: ../handle.c:178 +#: ../handle.c:194 hunk ./lib/libalpm/po/fr.po 859 -#: ../handle.c:181 +#: ../handle.c:197 hunk ./lib/libalpm/po/fr.po 863 -#: ../handle.c:197 +#: ../handle.c:203 +#, fuzzy, c-format +msgid "'%s' added to PM_OPT_HOLDPKG" +msgstr "'%s' ajouté à PM_OPT_IGNOREPKG" + +#: ../handle.c:206 +#, fuzzy +msgid "PM_OPT_HOLDPKG flushed" +msgstr "PM_OPT_IGNOREPKG rechargé" + +#: ../handle.c:222 hunk ./lib/libalpm/po/fr.po 878 -#: ../handle.c:207 +#: ../handle.c:262 hunk ./lib/libalpm/po/fr.po 883 +#: ../handle.c:281 +#, fuzzy, c-format +msgid "PM_OPT_PROXYHOST set to '%s'" +msgstr "PM_OPT_DBPATH défini à '%s'" + +#: ../handle.c:285 +#, fuzzy, c-format +msgid "PM_OPT_PROXYPORT set to '%d'" +msgstr "PM_OPT_DBPATH défini à '%s'" + +#: ../handle.c:296 +#, fuzzy, c-format +msgid "PM_OPT_XFERCOMMAND set to '%s'" +msgstr "PM_OPT_CACHEDIR défini à '%s'" + +#: ../handle.c:300 +#, fuzzy, c-format +msgid "PM_OPT_NOPASSIVEFTP set to '%d'" +msgstr "PM_OPT_DBPATH défini à '%s'" + +#: ../handle.c:304 +#, fuzzy, c-format +msgid "PM_OPT_CHOMP set to '%d'" +msgstr "PM_OPT_CACHEDIR défini à '%s'" + hunk ./lib/libalpm/po/fr.po 913 -#: ../package.c:182 +#: ../package.c:185 hunk ./lib/libalpm/po/fr.po 918 -#: ../package.c:199 ../package.c:259 +#: ../package.c:202 ../package.c:262 hunk ./lib/libalpm/po/fr.po 923 -#: ../package.c:316 +#: ../package.c:319 hunk ./lib/libalpm/po/fr.po 927 -#: ../package.c:324 +#: ../package.c:327 hunk ./lib/libalpm/po/fr.po 932 -#: ../package.c:332 +#: ../package.c:335 hunk ./lib/libalpm/po/fr.po 937 -#: ../package.c:371 +#: ../package.c:374 hunk ./lib/libalpm/po/fr.po 942 -#: ../package.c:388 +#: ../package.c:391 hunk ./lib/libalpm/po/fr.po 947 -#: ../package.c:396 +#: ../package.c:399 hunk ./lib/libalpm/po/fr.po 952 -#: ../remove.c:72 +#: ../remove.c:76 hunk ./lib/libalpm/po/fr.po 957 -#: ../remove.c:76 +#: ../remove.c:88 hunk ./lib/libalpm/po/fr.po 962 -#: ../remove.c:102 +#: ../remove.c:114 hunk ./lib/libalpm/po/fr.po 967 -#: ../remove.c:105 +#: ../remove.c:117 hunk ./lib/libalpm/po/fr.po 972 -#: ../remove.c:123 +#: ../remove.c:135 hunk ./lib/libalpm/po/fr.po 976 -#: ../remove.c:167 +#: ../remove.c:180 hunk ./lib/libalpm/po/fr.po 981 -#: ../remove.c:177 +#: ../remove.c:191 hunk ./lib/libalpm/po/fr.po 985 -#: ../remove.c:198 +#: ../remove.c:217 hunk ./lib/libalpm/po/fr.po 991 -#: ../remove.c:204 +#: ../remove.c:223 hunk ./lib/libalpm/po/fr.po 996 -#: ../remove.c:206 +#: ../remove.c:225 hunk ./lib/libalpm/po/fr.po 1001 -#: ../remove.c:220 +#: ../remove.c:239 hunk ./lib/libalpm/po/fr.po 1006 -#: ../remove.c:232 ../remove.c:233 +#: ../remove.c:251 ../remove.c:252 hunk ./lib/libalpm/po/fr.po 1011 -#: ../remove.c:235 ../remove.c:242 +#: ../remove.c:254 ../remove.c:261 hunk ./lib/libalpm/po/fr.po 1016 -#: ../remove.c:237 ../remove.c:244 +#: ../remove.c:256 ../remove.c:266 hunk ./lib/libalpm/po/fr.po 1021 -#: ../remove.c:263 +#: ../remove.c:285 hunk ./lib/libalpm/po/fr.po 1026 -#: ../remove.c:265 +#: ../remove.c:287 hunk ./lib/libalpm/po/fr.po 1031 -#: ../remove.c:268 +#: ../remove.c:290 hunk ./lib/libalpm/po/fr.po 1036 -#: ../remove.c:308 +#: ../remove.c:330 hunk ./lib/libalpm/po/fr.po 1042 -#: ../sync.c:155 +#: ../sync.c:160 hunk ./lib/libalpm/po/fr.po 1046 -#: ../sync.c:164 +#: ../sync.c:169 hunk ./lib/libalpm/po/fr.po 1051 -#: ../sync.c:166 +#: ../sync.c:171 hunk ./lib/libalpm/po/fr.po 1056 -#: ../sync.c:200 +#: ../sync.c:205 hunk ./lib/libalpm/po/fr.po 1062 -#: ../sync.c:212 +#: ../sync.c:217 hunk ./lib/libalpm/po/fr.po 1066 -#: ../sync.c:224 +#: ../sync.c:229 hunk ./lib/libalpm/po/fr.po 1071 -#: ../sync.c:238 ../sync.c:525 +#: ../sync.c:243 ../sync.c:530 hunk ./lib/libalpm/po/fr.po 1077 -#: ../sync.c:247 +#: ../sync.c:252 hunk ./lib/libalpm/po/fr.po 1083 -#: ../sync.c:253 +#: ../sync.c:258 hunk ./lib/libalpm/po/fr.po 1089 -#: ../sync.c:257 +#: ../sync.c:262 hunk ./lib/libalpm/po/fr.po 1094 -#: ../sync.c:261 +#: ../sync.c:266 hunk ./lib/libalpm/po/fr.po 1100 -#: ../sync.c:312 ../sync.c:331 +#: ../sync.c:317 ../sync.c:336 hunk ./lib/libalpm/po/fr.po 1105 -#: ../sync.c:317 ../sync.c:336 +#: ../sync.c:322 ../sync.c:341 hunk ./lib/libalpm/po/fr.po 1110 -#: ../sync.c:355 +#: ../sync.c:360 hunk ./lib/libalpm/po/fr.po 1115 -#: ../sync.c:363 +#: ../sync.c:368 hunk ./lib/libalpm/po/fr.po 1120 -#: ../sync.c:383 +#: ../sync.c:388 hunk ./lib/libalpm/po/fr.po 1125 -#: ../sync.c:428 +#: ../sync.c:433 hunk ./lib/libalpm/po/fr.po 1129 -#: ../sync.c:448 +#: ../sync.c:453 hunk ./lib/libalpm/po/fr.po 1134 -#: ../sync.c:480 +#: ../sync.c:485 hunk ./lib/libalpm/po/fr.po 1138 -#: ../sync.c:510 +#: ../sync.c:515 hunk ./lib/libalpm/po/fr.po 1143 -#: ../sync.c:532 +#: ../sync.c:537 hunk ./lib/libalpm/po/fr.po 1151 -#: ../sync.c:543 +#: ../sync.c:548 hunk ./lib/libalpm/po/fr.po 1156 -#: ../sync.c:566 ../sync.c:571 +#: ../sync.c:571 ../sync.c:576 hunk ./lib/libalpm/po/fr.po 1161 -#: ../sync.c:583 ../sync.c:620 +#: ../sync.c:588 ../sync.c:625 hunk ./lib/libalpm/po/fr.po 1168 -#: ../sync.c:592 +#: ../sync.c:597 hunk ./lib/libalpm/po/fr.po 1174 -#: ../sync.c:615 +#: ../sync.c:620 hunk ./lib/libalpm/po/fr.po 1180 -#: ../sync.c:626 ../sync.c:642 +#: ../sync.c:631 ../sync.c:647 hunk ./lib/libalpm/po/fr.po 1184 -#: ../sync.c:694 +#: ../sync.c:699 hunk ./lib/libalpm/po/fr.po 1188 -#: ../sync.c:708 +#: ../sync.c:713 hunk ./lib/libalpm/po/fr.po 1193 -#: ../sync.c:727 +#: ../sync.c:732 hunk ./lib/libalpm/po/fr.po 1198 -#: ../sync.c:812 ../sync.c:824 +#: ../sync.c:825 +#, c-format +msgid "%s-%s-%s%s is already in the cache\n" +msgstr "" + +#. no cache directory.... try creating it +#: ../sync.c:837 +#, c-format +msgid "no %s cache exists. creating...\n" +msgstr "" + +#: ../sync.c:838 +#, c-format +msgid "warning: no %s cache exists. creating..." +msgstr "" + +#. couldn't mkdir the cache directory, so fall back to /tmp and unlink +#. * the package afterwards. +#. +#: ../sync.c:843 +msgid "couldn't create package cache, using /tmp instead\n" +msgstr "" + +#: ../sync.c:844 +msgid "warning: couldn't create package cache, using /tmp instead" +msgstr "" + +#: ../sync.c:847 +#, c-format +msgid "failed to set option CACHEDIR (%s)\n" +msgstr "" + +#: ../sync.c:854 +#, c-format +msgid "failed to retrieve some files from %s\n" +msgstr "" + +#: ../sync.c:883 ../sync.c:895 hunk ./lib/libalpm/po/fr.po 1240 -#: ../sync.c:843 +#: ../sync.c:914 hunk ./lib/libalpm/po/fr.po 1245 -#: ../sync.c:845 +#: ../sync.c:916 hunk ./lib/libalpm/po/fr.po 1250 -#: ../sync.c:865 +#: ../sync.c:936 hunk ./lib/libalpm/po/fr.po 1254 -#: ../sync.c:871 +#: ../sync.c:942 hunk ./lib/libalpm/po/fr.po 1258 -#: ../sync.c:891 +#: ../sync.c:962 hunk ./lib/libalpm/po/fr.po 1262 -#: ../sync.c:893 +#: ../sync.c:964 hunk ./lib/libalpm/po/fr.po 1266 -#: ../sync.c:899 +#: ../sync.c:970 hunk ./lib/libalpm/po/fr.po 1271 -#: ../sync.c:906 +#: ../sync.c:977 hunk ./lib/libalpm/po/fr.po 1275 -#: ../sync.c:909 +#: ../sync.c:980 hunk ./lib/libalpm/po/fr.po 1279 -#: ../sync.c:914 +#: ../sync.c:985 hunk ./lib/libalpm/po/fr.po 1283 -#: ../sync.c:933 +#: ../sync.c:1004 hunk ./lib/libalpm/po/fr.po 1287 -#: ../sync.c:938 +#: ../sync.c:1009 hunk ./lib/libalpm/po/fr.po 1291 -#: ../sync.c:945 +#: ../sync.c:1016 hunk ./lib/libalpm/po/fr.po 1297 -#: ../sync.c:974 +#: ../sync.c:1045 hunk ./lib/libalpm/po/fr.po 1304 -#: ../sync.c:983 +#: ../sync.c:1054 hunk ./lib/libalpm/po/fr.po 1309 -#: ../util.c:281 +#: ../util.c:285 hunk ./lib/libalpm/po/fr.po 1314 -#: ../util.c:432 +#: ../util.c:436 hunk ./lib/libalpm/po/fr.po 1318 -#: ../util.c:459 +#: ../util.c:463 hunk ./lib/libalpm/po/fr.po 1323 -#: ../util.c:462 +#: ../util.c:466 hunk ./lib/libalpm/po/fr.po 1328 -#: ../util.c:475 +#: ../util.c:479 hunk ./lib/libalpm/po/fr.po 1333 -#: ../util.c:482 +#: ../util.c:486 hunk ./lib/libalpm/po/fr.po 1338 -#: ../util.c:484 +#: ../util.c:488 hunk ./lib/libalpm/po/fr.po 1343 -#: ../util.c:488 +#: ../util.c:492 hunk ./lib/libalpm/po/fr.po 1348 -#: ../util.c:492 +#: ../util.c:496 hunk ./lib/libalpm/po/fr.po 1353 -#: ../util.c:495 +#: ../util.c:499 hunk ./lib/libalpm/po/fr.po 1358 -#: ../util.c:517 +#: ../util.c:521 hunk ./lib/libalpm/po/fr.po 1363 -#: ../util.c:525 +#: ../util.c:529 hunk ./lib/libalpm/po/fr.po 1368 -#: ../util.c:589 +#: ../util.c:593 hunk ./lib/libalpm/po/hu.po 11 -"POT-Creation-Date: 2006-08-26 14:56+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./lib/libalpm/po/hu.po 20 -#: ../add.c:91 +#: ../add.c:95 hunk ./lib/libalpm/po/hu.po 25 -#: ../add.c:123 +#: ../add.c:127 hunk ./lib/libalpm/po/hu.po 30 -#: ../add.c:165 +#: ../add.c:169 hunk ./lib/libalpm/po/hu.po 35 -#: ../add.c:174 +#: ../add.c:178 hunk ./lib/libalpm/po/hu.po 40 -#: ../add.c:181 +#: ../add.c:185 hunk ./lib/libalpm/po/hu.po 46 -#: ../add.c:223 ../remove.c:92 +#: ../add.c:227 ../remove.c:104 hunk ./lib/libalpm/po/hu.po 51 -#: ../add.c:235 ../sync.c:499 +#: ../add.c:239 ../sync.c:504 hunk ./lib/libalpm/po/hu.po 56 -#: ../add.c:247 ../remove.c:128 +#: ../add.c:251 ../remove.c:140 hunk ./lib/libalpm/po/hu.po 60 -#: ../add.c:259 +#: ../add.c:263 hunk ./lib/libalpm/po/hu.po 64 -#: ../add.c:276 +#: ../add.c:280 hunk ./lib/libalpm/po/hu.po 68 -#: ../add.c:341 +#: ../add.c:345 hunk ./lib/libalpm/po/hu.po 73 -#: ../add.c:351 ../alpm.c:515 ../conflict.c:271 ../conflict.c:301 +#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304 hunk ./lib/libalpm/po/hu.po 78 -#: ../add.c:361 ../alpm.c:495 ../alpm.c:627 ../alpm.c:674 +#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726 hunk ./lib/libalpm/po/hu.po 83 -#: ../add.c:374 +#: ../add.c:378 hunk ./lib/libalpm/po/hu.po 88 -#: ../add.c:404 +#: ../add.c:408 hunk ./lib/libalpm/po/hu.po 93 -#: ../add.c:415 +#: ../add.c:419 hunk ./lib/libalpm/po/hu.po 98 -#: ../add.c:419 +#: ../add.c:423 hunk ./lib/libalpm/po/hu.po 102 -#: ../add.c:434 ../util.c:452 +#: ../add.c:438 ../util.c:456 hunk ./lib/libalpm/po/hu.po 106 -#: ../add.c:488 +#: ../add.c:492 hunk ./lib/libalpm/po/hu.po 111 -#: ../add.c:524 ../add.c:677 +#: ../add.c:528 ../add.c:681 hunk ./lib/libalpm/po/hu.po 116 -#: ../add.c:567 +#: ../add.c:571 hunk ./lib/libalpm/po/hu.po 121 -#: ../add.c:568 ../add.c:575 +#: ../add.c:572 ../add.c:579 hunk ./lib/libalpm/po/hu.po 126 -#: ../add.c:569 ../add.c:576 +#: ../add.c:573 ../add.c:580 hunk ./lib/libalpm/po/hu.po 131 -#: ../add.c:571 ../add.c:578 +#: ../add.c:575 ../add.c:582 hunk ./lib/libalpm/po/hu.po 136 -#: ../add.c:574 +#: ../add.c:578 hunk ./lib/libalpm/po/hu.po 141 -#: ../add.c:592 +#: ../add.c:596 hunk ./lib/libalpm/po/hu.po 146 -#: ../add.c:593 +#: ../add.c:597 hunk ./lib/libalpm/po/hu.po 151 -#: ../add.c:597 ../add.c:641 +#: ../add.c:601 ../add.c:645 hunk ./lib/libalpm/po/hu.po 156 -#: ../add.c:598 +#: ../add.c:602 hunk ./lib/libalpm/po/hu.po 161 -#: ../add.c:602 +#: ../add.c:606 hunk ./lib/libalpm/po/hu.po 166 -#: ../add.c:603 +#: ../add.c:607 hunk ./lib/libalpm/po/hu.po 171 -#: ../add.c:613 ../add.c:616 ../add.c:622 +#: ../add.c:617 ../add.c:620 ../add.c:626 hunk ./lib/libalpm/po/hu.po 175 -#: ../add.c:620 +#: ../add.c:624 hunk ./lib/libalpm/po/hu.po 179 -#: ../add.c:626 +#: ../add.c:630 hunk ./lib/libalpm/po/hu.po 185 -#: ../add.c:630 +#: ../add.c:634 hunk ./lib/libalpm/po/hu.po 190 -#: ../add.c:631 +#: ../add.c:635 hunk ./lib/libalpm/po/hu.po 195 -#: ../add.c:633 +#: ../add.c:637 hunk ./lib/libalpm/po/hu.po 200 -#: ../add.c:634 +#: ../add.c:638 hunk ./lib/libalpm/po/hu.po 205 -#: ../add.c:639 ../add.c:659 +#: ../add.c:643 ../add.c:663 hunk ./lib/libalpm/po/hu.po 210 -#: ../add.c:661 +#: ../add.c:665 hunk ./lib/libalpm/po/hu.po 215 -#: ../add.c:663 +#: ../add.c:667 hunk ./lib/libalpm/po/hu.po 220 -#: ../add.c:664 +#: ../add.c:668 hunk ./lib/libalpm/po/hu.po 225 -#: ../add.c:678 +#: ../add.c:682 hunk ./lib/libalpm/po/hu.po 230 -#: ../add.c:689 +#: ../add.c:693 hunk ./lib/libalpm/po/hu.po 234 -#: ../add.c:721 ../add.c:723 +#: ../add.c:725 ../add.c:727 hunk ./lib/libalpm/po/hu.po 239 -#: ../add.c:722 ../add.c:724 +#: ../add.c:726 ../add.c:728 hunk ./lib/libalpm/po/hu.po 243 -#: ../add.c:722 ../add.c:724 +#: ../add.c:726 ../add.c:728 hunk ./lib/libalpm/po/hu.po 247 -#: ../add.c:745 ../add.c:796 +#: ../add.c:749 ../add.c:800 hunk ./lib/libalpm/po/hu.po 253 -#: ../add.c:756 ../remove.c:262 +#: ../add.c:760 ../remove.c:284 hunk ./lib/libalpm/po/hu.po 257 -#: ../add.c:757 +#: ../add.c:761 hunk ./lib/libalpm/po/hu.po 262 -#: ../add.c:759 +#: ../add.c:763 hunk ./lib/libalpm/po/hu.po 267 -#: ../add.c:761 +#: ../add.c:765 hunk ./lib/libalpm/po/hu.po 272 -#: ../add.c:765 +#: ../add.c:769 hunk ./lib/libalpm/po/hu.po 278 -#: ../add.c:770 ../remove.c:272 +#: ../add.c:774 ../remove.c:294 hunk ./lib/libalpm/po/hu.po 282 -#: ../add.c:791 ../remove.c:300 +#: ../add.c:795 ../remove.c:322 hunk ./lib/libalpm/po/hu.po 287 -#: ../add.c:799 ../remove.c:310 +#: ../add.c:803 ../remove.c:332 hunk ./lib/libalpm/po/hu.po 292 -#: ../add.c:826 ../remove.c:322 +#: ../add.c:830 ../remove.c:345 hunk ./lib/libalpm/po/hu.po 297 -#: ../alpm.c:196 +#: ../alpm.c:201 hunk ./lib/libalpm/po/hu.po 302 -#: ../alpm.c:201 +#: ../alpm.c:206 hunk ./lib/libalpm/po/hu.po 307 -#: ../alpm.c:212 +#: ../alpm.c:217 hunk ./lib/libalpm/po/hu.po 312 -#: ../alpm.c:256 +#: ../alpm.c:261 hunk ./lib/libalpm/po/hu.po 317 -#: ../alpm.c:261 +#: ../alpm.c:266 hunk ./lib/libalpm/po/hu.po 322 -#: ../alpm.c:327 +#: ../alpm.c:344 hunk ./lib/libalpm/po/hu.po 330 -#: ../alpm.c:331 +#: ../alpm.c:348 hunk ./lib/libalpm/po/hu.po 335 +#: ../alpm.c:383 +#, c-format +msgid "failed to get lastupdate time for %s (no big deal)\n" +msgstr "" + +#: ../alpm.c:402 +#, c-format +msgid "sync: new mtime for %s: %s\n" +msgstr "" + hunk ./lib/libalpm/po/hu.po 346 -#: ../alpm.c:358 +#: ../alpm.c:408 hunk ./lib/libalpm/po/hu.po 351 -#: ../alpm.c:362 +#: ../alpm.c:412 hunk ./lib/libalpm/po/hu.po 356 -#: ../alpm.c:377 +#. uncompress the sync database +#. ORE +#. we should not simply unpack the archive, but better parse it and +#. db_write each entry (see sync_load_dbarchive to get archive content) +#: ../alpm.c:426 hunk ./lib/libalpm/po/hu.po 365 -#: ../alpm.c:522 +#: ../alpm.c:574 hunk ./lib/libalpm/po/hu.po 370 -#: ../alpm.c:621 +#: ../alpm.c:673 hunk ./lib/libalpm/po/hu.po 375 -#: ../alpm.c:632 ../alpm.c:679 +#: ../alpm.c:684 ../alpm.c:731 hunk ./lib/libalpm/po/hu.po 380 -#: ../alpm.c:635 +#: ../alpm.c:687 hunk ./lib/libalpm/po/hu.po 385 -#: ../alpm.c:668 +#: ../alpm.c:720 hunk ./lib/libalpm/po/hu.po 390 -#: ../alpm.c:682 +#: ../alpm.c:734 hunk ./lib/libalpm/po/hu.po 395 -#: ../alpm.c:941 +#: ../alpm.c:993 hunk ./lib/libalpm/po/hu.po 400 -#: ../alpm.c:942 +#: ../alpm.c:994 hunk ./lib/libalpm/po/hu.po 405 -#: ../be_files.c:147 +#: ../alpm.c:1232 +#, c-format +msgid "config: new section '%s'\n" +msgstr "" + +#: ../alpm.c:1275 +msgid "config: usesyslog\n" +msgstr "" + +#: ../alpm.c:1286 +#, c-format +msgid "config: including %s\n" +msgstr "" + +#: ../alpm.c:1298 ../alpm.c:1306 +#, c-format +msgid "config: noupgrade: %s\n" +msgstr "" + +#: ../alpm.c:1316 ../alpm.c:1324 +#, fuzzy, c-format +msgid "config: noextract: %s\n" +msgstr "nem sikerült kifejteni: %s (%s)\n" + +#: ../alpm.c:1334 ../alpm.c:1342 +#, c-format +msgid "config: ignorepkg: %s\n" +msgstr "" + +#: ../alpm.c:1352 ../alpm.c:1360 +#, c-format +msgid "config: holdpkg: %s\n" +msgstr "" + +#: ../alpm.c:1370 +#, c-format +msgid "config: dbpath: %s\n" +msgstr "" + +#: ../alpm.c:1380 +#, c-format +msgid "config: cachedir: %s\n" +msgstr "" + +#: ../alpm.c:1386 +#, fuzzy, c-format +msgid "config: log file: %s\n" +msgstr "nem sikerült megnyitni a %s naplófájlt" + +#. The config value is in days, we use seconds +#: ../alpm.c:1394 +#, c-format +msgid "config: UpgradeDelay: %i\n" +msgstr "" + +#. add to the list +#: ../alpm.c:1415 +#, fuzzy, c-format +msgid "config: %s: server: %s\n" +msgstr "figyelmeztetés: a %s elmentve %s néven" + +#: ../be_files.c:151 hunk ./lib/libalpm/po/hu.po 471 -#: ../be_files.c:428 +#: ../be_files.c:432 hunk ./lib/libalpm/po/hu.po 476 -#: ../be_files.c:513 +#: ../be_files.c:517 hunk ./lib/libalpm/po/hu.po 481 -#: ../be_files.c:539 +#: ../be_files.c:543 hunk ./lib/libalpm/po/hu.po 486 -#: ../cache.c:55 +#: ../cache.c:57 hunk ./lib/libalpm/po/hu.po 491 -#: ../cache.c:75 +#: ../cache.c:77 hunk ./lib/libalpm/po/hu.po 496 -#: ../cache.c:110 +#: ../cache.c:112 hunk ./lib/libalpm/po/hu.po 501 -#: ../cache.c:132 +#: ../cache.c:134 hunk ./lib/libalpm/po/hu.po 506 -#: ../cache.c:163 +#: ../cache.c:165 hunk ./lib/libalpm/po/hu.po 512 -#: ../conflict.c:68 +#: ../conflict.c:71 hunk ./lib/libalpm/po/hu.po 519 -#: ../conflict.c:77 ../conflict.c:91 +#: ../conflict.c:80 ../conflict.c:94 hunk ./lib/libalpm/po/hu.po 525 -#: ../conflict.c:104 +#: ../conflict.c:107 hunk ./lib/libalpm/po/hu.po 531 -#: ../conflict.c:113 ../conflict.c:126 +#: ../conflict.c:116 ../conflict.c:129 hunk ./lib/libalpm/po/hu.po 537 -#: ../conflict.c:140 +#: ../conflict.c:143 hunk ./lib/libalpm/po/hu.po 542 -#: ../conflict.c:167 ../conflict.c:182 +#: ../conflict.c:170 ../conflict.c:185 hunk ./lib/libalpm/po/hu.po 547 -#: ../conflict.c:231 ../conflict.c:332 ../deps.c:52 ../deps.c:599 -#: ../deps.c:639 ../group.c:40 ../handle.c:50 ../package.c:95 ../sync.c:60 -#: ../sync.c:630 ../sync.c:646 ../sync.c:742 ../trans.c:46 ../util.c:594 -#: ../util.c:601 +#: ../conflict.c:234 ../conflict.c:335 ../deps.c:54 ../deps.c:601 +#: ../deps.c:641 ../group.c:42 ../handle.c:62 ../package.c:98 ../sync.c:65 +#: ../sync.c:635 ../sync.c:651 ../sync.c:747 ../trans.c:49 ../util.c:598 +#: ../util.c:605 hunk ./lib/libalpm/po/hu.po 555 -#: ../db.c:53 ../db.c:60 +#: ../db.c:57 ../db.c:64 hunk ./lib/libalpm/po/hu.po 560 -#: ../deps.c:116 +#: ../deps.c:118 hunk ./lib/libalpm/po/hu.po 564 -#: ../deps.c:121 +#: ../deps.c:123 hunk ./lib/libalpm/po/hu.po 568 -#: ../deps.c:164 +#: ../deps.c:166 hunk ./lib/libalpm/po/hu.po 572 -#: ../deps.c:258 ../deps.c:404 +#: ../deps.c:260 ../deps.c:406 hunk ./lib/libalpm/po/hu.po 577 -#: ../deps.c:368 +#: ../deps.c:370 hunk ./lib/libalpm/po/hu.po 582 -#: ../deps.c:492 +#: ../deps.c:494 hunk ./lib/libalpm/po/hu.po 587 -#: ../deps.c:497 +#: ../deps.c:499 hunk ./lib/libalpm/po/hu.po 591 -#: ../deps.c:509 +#: ../deps.c:511 hunk ./lib/libalpm/po/hu.po 597 -#: ../deps.c:526 +#: ../deps.c:528 hunk ./lib/libalpm/po/hu.po 602 -#: ../deps.c:529 +#: ../deps.c:531 hunk ./lib/libalpm/po/hu.po 607 -#: ../deps.c:571 +#: ../deps.c:573 hunk ./lib/libalpm/po/hu.po 612 -#: ../deps.c:595 +#: ../deps.c:597 hunk ./lib/libalpm/po/hu.po 621 -#: ../deps.c:612 +#: ../deps.c:614 hunk ./lib/libalpm/po/hu.po 626 -#: ../deps.c:632 +#: ../deps.c:634 hunk ./lib/libalpm/po/hu.po 631 -#: ../deps.c:636 +#: ../deps.c:638 hunk ./lib/libalpm/po/hu.po 637 -#: ../deps.c:652 +#: ../deps.c:654 hunk ./lib/libalpm/po/hu.po 642 -#: ../error.c:31 +#: ../error.c:34 hunk ./lib/libalpm/po/hu.po 646 -#: ../error.c:33 ../error.c:121 +#: ../error.c:36 ../error.c:135 hunk ./lib/libalpm/po/hu.po 650 -#: ../error.c:35 +#: ../error.c:38 hunk ./lib/libalpm/po/hu.po 654 -#: ../error.c:37 +#: ../error.c:40 hunk ./lib/libalpm/po/hu.po 658 -#: ../error.c:39 +#: ../error.c:42 hunk ./lib/libalpm/po/hu.po 662 -#: ../error.c:42 +#: ../error.c:45 hunk ./lib/libalpm/po/hu.po 666 -#: ../error.c:44 +#: ../error.c:47 hunk ./lib/libalpm/po/hu.po 670 -#: ../error.c:46 +#: ../error.c:49 hunk ./lib/libalpm/po/hu.po 674 -#: ../error.c:49 +#: ../error.c:52 hunk ./lib/libalpm/po/hu.po 678 -#: ../error.c:51 +#: ../error.c:54 hunk ./lib/libalpm/po/hu.po 682 -#: ../error.c:53 +#: ../error.c:56 hunk ./lib/libalpm/po/hu.po 686 -#: ../error.c:55 +#: ../error.c:58 hunk ./lib/libalpm/po/hu.po 690 -#: ../error.c:57 +#: ../error.c:60 hunk ./lib/libalpm/po/hu.po 694 -#: ../error.c:59 +#: ../error.c:62 hunk ./lib/libalpm/po/hu.po 698 -#: ../error.c:61 +#: ../error.c:64 hunk ./lib/libalpm/po/hu.po 702 -#: ../error.c:68 +#: ../error.c:71 hunk ./lib/libalpm/po/hu.po 706 -#: ../error.c:71 ../error.c:77 +#: ../error.c:74 ../error.c:80 hunk ./lib/libalpm/po/hu.po 710 -#: ../error.c:73 +#: ../error.c:76 hunk ./lib/libalpm/po/hu.po 714 -#: ../error.c:75 +#: ../error.c:78 hunk ./lib/libalpm/po/hu.po 718 -#: ../error.c:79 +#: ../error.c:82 hunk ./lib/libalpm/po/hu.po 722 -#: ../error.c:81 +#: ../error.c:84 hunk ./lib/libalpm/po/hu.po 726 -#: ../error.c:83 +#: ../error.c:86 hunk ./lib/libalpm/po/hu.po 730 -#: ../error.c:86 +#: ../error.c:89 hunk ./lib/libalpm/po/hu.po 734 -#: ../error.c:88 +#: ../error.c:91 hunk ./lib/libalpm/po/hu.po 738 -#: ../error.c:90 +#: ../error.c:93 hunk ./lib/libalpm/po/hu.po 742 -#: ../error.c:92 +#: ../error.c:95 hunk ./lib/libalpm/po/hu.po 746 -#: ../error.c:94 +#: ../error.c:97 hunk ./lib/libalpm/po/hu.po 750 -#: ../error.c:96 +#: ../error.c:99 hunk ./lib/libalpm/po/hu.po 754 -#: ../error.c:98 +#: ../error.c:101 hunk ./lib/libalpm/po/hu.po 758 -#: ../error.c:100 +#: ../error.c:103 hunk ./lib/libalpm/po/hu.po 762 -#: ../error.c:103 +#: ../error.c:106 hunk ./lib/libalpm/po/hu.po 766 -#: ../error.c:106 +#: ../error.c:109 hunk ./lib/libalpm/po/hu.po 770 -#: ../error.c:108 +#: ../error.c:111 hunk ./lib/libalpm/po/hu.po 774 -#: ../error.c:110 +#: ../error.c:113 hunk ./lib/libalpm/po/hu.po 778 -#: ../error.c:113 +#: ../error.c:116 hunk ./lib/libalpm/po/hu.po 782 -#: ../error.c:115 +#: ../error.c:118 hunk ./lib/libalpm/po/hu.po 786 -#: ../error.c:117 +#: ../error.c:120 hunk ./lib/libalpm/po/hu.po 790 -#: ../error.c:119 +#: ../error.c:122 hunk ./lib/libalpm/po/hu.po 794 -#: ../handle.c:127 +#: ../error.c:124 +msgid "not confirmed" +msgstr "" + +#: ../error.c:127 +msgid "bad section name" +msgstr "" + +#: ../error.c:129 +msgid "'local' is reserved and cannot be used as a package tree" +msgstr "" + +#: ../error.c:131 +#, fuzzy +msgid "syntax error" +msgstr "belső hiba" + +#: ../error.c:133 +msgid "all directives must belong to a section" +msgstr "" + +#: ../handle.c:143 hunk ./lib/libalpm/po/hu.po 820 -#: ../handle.c:134 +#: ../handle.c:150 hunk ./lib/libalpm/po/hu.po 825 -#: ../handle.c:151 +#: ../handle.c:167 hunk ./lib/libalpm/po/hu.po 830 -#: ../handle.c:155 +#: ../handle.c:171 hunk ./lib/libalpm/po/hu.po 835 -#: ../handle.c:160 +#: ../handle.c:176 hunk ./lib/libalpm/po/hu.po 840 -#: ../handle.c:163 +#: ../handle.c:179 hunk ./lib/libalpm/po/hu.po 844 -#: ../handle.c:169 +#: ../handle.c:185 hunk ./lib/libalpm/po/hu.po 849 -#: ../handle.c:172 +#: ../handle.c:188 hunk ./lib/libalpm/po/hu.po 853 -#: ../handle.c:178 +#: ../handle.c:194 hunk ./lib/libalpm/po/hu.po 858 -#: ../handle.c:181 +#: ../handle.c:197 hunk ./lib/libalpm/po/hu.po 862 -#: ../handle.c:197 +#: ../handle.c:203 +#, fuzzy, c-format +msgid "'%s' added to PM_OPT_HOLDPKG" +msgstr "'%s' hozzáadva a PM_OPT_IGNOREPKG listához" + +#: ../handle.c:206 +#, fuzzy +msgid "PM_OPT_HOLDPKG flushed" +msgstr "a PM_OPT_IGNOREPKG lista ürítve" + +#: ../handle.c:222 hunk ./lib/libalpm/po/hu.po 877 -#: ../handle.c:207 +#: ../handle.c:262 hunk ./lib/libalpm/po/hu.po 882 +#: ../handle.c:281 +#, fuzzy, c-format +msgid "PM_OPT_PROXYHOST set to '%s'" +msgstr "PM_OPT_DBPATH beállítva a '%s' értékre" + +#: ../handle.c:285 +#, fuzzy, c-format +msgid "PM_OPT_PROXYPORT set to '%d'" +msgstr "PM_OPT_DBPATH beállítva a '%s' értékre" + +#: ../handle.c:296 +#, fuzzy, c-format +msgid "PM_OPT_XFERCOMMAND set to '%s'" +msgstr "PM_OPT_CACHEDIR beállítva a '%s' értékre" + +#: ../handle.c:300 +#, fuzzy, c-format +msgid "PM_OPT_NOPASSIVEFTP set to '%d'" +msgstr "PM_OPT_DBPATH beállítva a '%s' értékre" + +#: ../handle.c:304 +#, fuzzy, c-format +msgid "PM_OPT_CHOMP set to '%d'" +msgstr "PM_OPT_CACHEDIR beállítva a '%s' értékre" + hunk ./lib/libalpm/po/hu.po 912 -#: ../package.c:182 +#: ../package.c:185 hunk ./lib/libalpm/po/hu.po 917 -#: ../package.c:199 ../package.c:259 +#: ../package.c:202 ../package.c:262 hunk ./lib/libalpm/po/hu.po 922 -#: ../package.c:316 +#: ../package.c:319 hunk ./lib/libalpm/po/hu.po 926 -#: ../package.c:324 +#: ../package.c:327 hunk ./lib/libalpm/po/hu.po 931 -#: ../package.c:332 +#: ../package.c:335 hunk ./lib/libalpm/po/hu.po 936 -#: ../package.c:371 +#: ../package.c:374 hunk ./lib/libalpm/po/hu.po 941 -#: ../package.c:388 +#: ../package.c:391 hunk ./lib/libalpm/po/hu.po 946 -#: ../package.c:396 +#: ../package.c:399 hunk ./lib/libalpm/po/hu.po 951 -#: ../remove.c:72 +#: ../remove.c:76 hunk ./lib/libalpm/po/hu.po 956 -#: ../remove.c:76 +#: ../remove.c:88 hunk ./lib/libalpm/po/hu.po 961 -#: ../remove.c:102 +#: ../remove.c:114 hunk ./lib/libalpm/po/hu.po 966 -#: ../remove.c:105 +#: ../remove.c:117 hunk ./lib/libalpm/po/hu.po 971 -#: ../remove.c:123 +#: ../remove.c:135 hunk ./lib/libalpm/po/hu.po 975 -#: ../remove.c:167 +#: ../remove.c:180 hunk ./lib/libalpm/po/hu.po 980 -#: ../remove.c:177 +#: ../remove.c:191 hunk ./lib/libalpm/po/hu.po 984 -#: ../remove.c:198 +#: ../remove.c:217 hunk ./lib/libalpm/po/hu.po 990 -#: ../remove.c:204 +#: ../remove.c:223 hunk ./lib/libalpm/po/hu.po 995 -#: ../remove.c:206 +#: ../remove.c:225 hunk ./lib/libalpm/po/hu.po 1000 -#: ../remove.c:220 +#: ../remove.c:239 hunk ./lib/libalpm/po/hu.po 1005 -#: ../remove.c:232 ../remove.c:233 +#: ../remove.c:251 ../remove.c:252 hunk ./lib/libalpm/po/hu.po 1010 -#: ../remove.c:235 ../remove.c:242 +#: ../remove.c:254 ../remove.c:261 hunk ./lib/libalpm/po/hu.po 1015 -#: ../remove.c:237 ../remove.c:244 +#: ../remove.c:256 ../remove.c:266 hunk ./lib/libalpm/po/hu.po 1020 -#: ../remove.c:263 +#: ../remove.c:285 hunk ./lib/libalpm/po/hu.po 1025 -#: ../remove.c:265 +#: ../remove.c:287 hunk ./lib/libalpm/po/hu.po 1030 -#: ../remove.c:268 +#: ../remove.c:290 hunk ./lib/libalpm/po/hu.po 1035 -#: ../remove.c:308 +#: ../remove.c:330 hunk ./lib/libalpm/po/hu.po 1041 -#: ../sync.c:155 +#: ../sync.c:160 hunk ./lib/libalpm/po/hu.po 1045 -#: ../sync.c:164 +#: ../sync.c:169 hunk ./lib/libalpm/po/hu.po 1050 -#: ../sync.c:166 +#: ../sync.c:171 hunk ./lib/libalpm/po/hu.po 1055 -#: ../sync.c:200 +#: ../sync.c:205 hunk ./lib/libalpm/po/hu.po 1061 -#: ../sync.c:212 +#: ../sync.c:217 hunk ./lib/libalpm/po/hu.po 1065 -#: ../sync.c:224 +#: ../sync.c:229 hunk ./lib/libalpm/po/hu.po 1070 -#: ../sync.c:238 ../sync.c:525 +#: ../sync.c:243 ../sync.c:530 hunk ./lib/libalpm/po/hu.po 1076 -#: ../sync.c:247 +#: ../sync.c:252 hunk ./lib/libalpm/po/hu.po 1082 -#: ../sync.c:253 +#: ../sync.c:258 hunk ./lib/libalpm/po/hu.po 1088 -#: ../sync.c:257 +#: ../sync.c:262 hunk ./lib/libalpm/po/hu.po 1093 -#: ../sync.c:261 +#: ../sync.c:266 hunk ./lib/libalpm/po/hu.po 1099 -#: ../sync.c:312 ../sync.c:331 +#: ../sync.c:317 ../sync.c:336 hunk ./lib/libalpm/po/hu.po 1104 -#: ../sync.c:317 ../sync.c:336 +#: ../sync.c:322 ../sync.c:341 hunk ./lib/libalpm/po/hu.po 1109 -#: ../sync.c:355 +#: ../sync.c:360 hunk ./lib/libalpm/po/hu.po 1114 -#: ../sync.c:363 +#: ../sync.c:368 hunk ./lib/libalpm/po/hu.po 1119 -#: ../sync.c:383 +#: ../sync.c:388 hunk ./lib/libalpm/po/hu.po 1124 -#: ../sync.c:428 +#: ../sync.c:433 hunk ./lib/libalpm/po/hu.po 1128 -#: ../sync.c:448 +#: ../sync.c:453 hunk ./lib/libalpm/po/hu.po 1133 -#: ../sync.c:480 +#: ../sync.c:485 hunk ./lib/libalpm/po/hu.po 1137 -#: ../sync.c:510 +#: ../sync.c:515 hunk ./lib/libalpm/po/hu.po 1142 -#: ../sync.c:532 +#: ../sync.c:537 hunk ./lib/libalpm/po/hu.po 1150 -#: ../sync.c:543 +#: ../sync.c:548 hunk ./lib/libalpm/po/hu.po 1155 -#: ../sync.c:566 ../sync.c:571 +#: ../sync.c:571 ../sync.c:576 hunk ./lib/libalpm/po/hu.po 1160 -#: ../sync.c:583 ../sync.c:620 +#: ../sync.c:588 ../sync.c:625 hunk ./lib/libalpm/po/hu.po 1167 -#: ../sync.c:592 +#: ../sync.c:597 hunk ./lib/libalpm/po/hu.po 1173 -#: ../sync.c:615 +#: ../sync.c:620 hunk ./lib/libalpm/po/hu.po 1179 -#: ../sync.c:626 ../sync.c:642 +#: ../sync.c:631 ../sync.c:647 hunk ./lib/libalpm/po/hu.po 1183 -#: ../sync.c:694 +#: ../sync.c:699 hunk ./lib/libalpm/po/hu.po 1187 -#: ../sync.c:708 +#: ../sync.c:713 hunk ./lib/libalpm/po/hu.po 1192 -#: ../sync.c:727 +#: ../sync.c:732 hunk ./lib/libalpm/po/hu.po 1197 -#: ../sync.c:812 ../sync.c:824 +#: ../sync.c:825 +#, c-format +msgid "%s-%s-%s%s is already in the cache\n" +msgstr "" + +#. no cache directory.... try creating it +#: ../sync.c:837 +#, c-format +msgid "no %s cache exists. creating...\n" +msgstr "" + +#: ../sync.c:838 +#, c-format +msgid "warning: no %s cache exists. creating..." +msgstr "" + +#. couldn't mkdir the cache directory, so fall back to /tmp and unlink +#. * the package afterwards. +#. +#: ../sync.c:843 +msgid "couldn't create package cache, using /tmp instead\n" +msgstr "" + +#: ../sync.c:844 +msgid "warning: couldn't create package cache, using /tmp instead" +msgstr "" + +#: ../sync.c:847 +#, c-format +msgid "failed to set option CACHEDIR (%s)\n" +msgstr "" + +#: ../sync.c:854 +#, c-format +msgid "failed to retrieve some files from %s\n" +msgstr "" + +#: ../sync.c:883 ../sync.c:895 hunk ./lib/libalpm/po/hu.po 1240 -#: ../sync.c:843 +#: ../sync.c:914 hunk ./lib/libalpm/po/hu.po 1245 -#: ../sync.c:845 +#: ../sync.c:916 hunk ./lib/libalpm/po/hu.po 1250 -#: ../sync.c:865 +#: ../sync.c:936 hunk ./lib/libalpm/po/hu.po 1254 -#: ../sync.c:871 +#: ../sync.c:942 hunk ./lib/libalpm/po/hu.po 1258 -#: ../sync.c:891 +#: ../sync.c:962 hunk ./lib/libalpm/po/hu.po 1262 -#: ../sync.c:893 +#: ../sync.c:964 hunk ./lib/libalpm/po/hu.po 1266 -#: ../sync.c:899 +#: ../sync.c:970 hunk ./lib/libalpm/po/hu.po 1271 -#: ../sync.c:906 +#: ../sync.c:977 hunk ./lib/libalpm/po/hu.po 1275 -#: ../sync.c:909 +#: ../sync.c:980 hunk ./lib/libalpm/po/hu.po 1279 -#: ../sync.c:914 +#: ../sync.c:985 hunk ./lib/libalpm/po/hu.po 1283 -#: ../sync.c:933 +#: ../sync.c:1004 hunk ./lib/libalpm/po/hu.po 1287 -#: ../sync.c:938 +#: ../sync.c:1009 hunk ./lib/libalpm/po/hu.po 1291 -#: ../sync.c:945 +#: ../sync.c:1016 hunk ./lib/libalpm/po/hu.po 1295 -#: ../sync.c:974 +#: ../sync.c:1045 hunk ./lib/libalpm/po/hu.po 1300 -#: ../sync.c:983 +#: ../sync.c:1054 hunk ./lib/libalpm/po/hu.po 1305 -#: ../util.c:281 +#: ../util.c:285 hunk ./lib/libalpm/po/hu.po 1310 -#: ../util.c:432 +#: ../util.c:436 hunk ./lib/libalpm/po/hu.po 1314 -#: ../util.c:459 +#: ../util.c:463 hunk ./lib/libalpm/po/hu.po 1319 -#: ../util.c:462 +#: ../util.c:466 hunk ./lib/libalpm/po/hu.po 1324 -#: ../util.c:475 +#: ../util.c:479 hunk ./lib/libalpm/po/hu.po 1329 -#: ../util.c:482 +#: ../util.c:486 hunk ./lib/libalpm/po/hu.po 1334 -#: ../util.c:484 +#: ../util.c:488 hunk ./lib/libalpm/po/hu.po 1339 -#: ../util.c:488 +#: ../util.c:492 hunk ./lib/libalpm/po/hu.po 1344 -#: ../util.c:492 +#: ../util.c:496 hunk ./lib/libalpm/po/hu.po 1349 -#: ../util.c:495 +#: ../util.c:499 hunk ./lib/libalpm/po/hu.po 1354 -#: ../util.c:517 +#: ../util.c:521 hunk ./lib/libalpm/po/hu.po 1359 -#: ../util.c:525 +#: ../util.c:529 hunk ./lib/libalpm/po/hu.po 1364 -#: ../util.c:589 +#: ../util.c:593 hunk ./lib/libalpm/po/libalpm.pot 11 -"POT-Creation-Date: 2006-08-26 14:56+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./lib/libalpm/po/libalpm.pot 19 -#: ../add.c:91 +#: ../add.c:95 hunk ./lib/libalpm/po/libalpm.pot 24 -#: ../add.c:123 +#: ../add.c:127 hunk ./lib/libalpm/po/libalpm.pot 29 -#: ../add.c:165 +#: ../add.c:169 hunk ./lib/libalpm/po/libalpm.pot 34 -#: ../add.c:174 +#: ../add.c:178 hunk ./lib/libalpm/po/libalpm.pot 39 -#: ../add.c:181 +#: ../add.c:185 hunk ./lib/libalpm/po/libalpm.pot 45 -#: ../add.c:223 ../remove.c:92 +#: ../add.c:227 ../remove.c:104 hunk ./lib/libalpm/po/libalpm.pot 50 -#: ../add.c:235 ../sync.c:499 +#: ../add.c:239 ../sync.c:504 hunk ./lib/libalpm/po/libalpm.pot 55 -#: ../add.c:247 ../remove.c:128 +#: ../add.c:251 ../remove.c:140 hunk ./lib/libalpm/po/libalpm.pot 59 -#: ../add.c:259 +#: ../add.c:263 hunk ./lib/libalpm/po/libalpm.pot 63 -#: ../add.c:276 +#: ../add.c:280 hunk ./lib/libalpm/po/libalpm.pot 67 -#: ../add.c:341 +#: ../add.c:345 hunk ./lib/libalpm/po/libalpm.pot 72 -#: ../add.c:351 ../alpm.c:515 ../conflict.c:271 ../conflict.c:301 +#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304 hunk ./lib/libalpm/po/libalpm.pot 77 -#: ../add.c:361 ../alpm.c:495 ../alpm.c:627 ../alpm.c:674 +#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726 hunk ./lib/libalpm/po/libalpm.pot 82 -#: ../add.c:374 +#: ../add.c:378 hunk ./lib/libalpm/po/libalpm.pot 87 -#: ../add.c:404 +#: ../add.c:408 hunk ./lib/libalpm/po/libalpm.pot 92 -#: ../add.c:415 +#: ../add.c:419 hunk ./lib/libalpm/po/libalpm.pot 97 -#: ../add.c:419 +#: ../add.c:423 hunk ./lib/libalpm/po/libalpm.pot 101 -#: ../add.c:434 ../util.c:452 +#: ../add.c:438 ../util.c:456 hunk ./lib/libalpm/po/libalpm.pot 105 -#: ../add.c:488 +#: ../add.c:492 hunk ./lib/libalpm/po/libalpm.pot 110 -#: ../add.c:524 ../add.c:677 +#: ../add.c:528 ../add.c:681 hunk ./lib/libalpm/po/libalpm.pot 115 -#: ../add.c:567 +#: ../add.c:571 hunk ./lib/libalpm/po/libalpm.pot 120 -#: ../add.c:568 ../add.c:575 +#: ../add.c:572 ../add.c:579 hunk ./lib/libalpm/po/libalpm.pot 125 -#: ../add.c:569 ../add.c:576 +#: ../add.c:573 ../add.c:580 hunk ./lib/libalpm/po/libalpm.pot 130 -#: ../add.c:571 ../add.c:578 +#: ../add.c:575 ../add.c:582 hunk ./lib/libalpm/po/libalpm.pot 135 -#: ../add.c:574 +#: ../add.c:578 hunk ./lib/libalpm/po/libalpm.pot 140 -#: ../add.c:592 +#: ../add.c:596 hunk ./lib/libalpm/po/libalpm.pot 145 -#: ../add.c:593 +#: ../add.c:597 hunk ./lib/libalpm/po/libalpm.pot 150 -#: ../add.c:597 ../add.c:641 +#: ../add.c:601 ../add.c:645 hunk ./lib/libalpm/po/libalpm.pot 155 -#: ../add.c:598 +#: ../add.c:602 hunk ./lib/libalpm/po/libalpm.pot 160 -#: ../add.c:602 +#: ../add.c:606 hunk ./lib/libalpm/po/libalpm.pot 165 -#: ../add.c:603 +#: ../add.c:607 hunk ./lib/libalpm/po/libalpm.pot 170 -#: ../add.c:613 ../add.c:616 ../add.c:622 +#: ../add.c:617 ../add.c:620 ../add.c:626 hunk ./lib/libalpm/po/libalpm.pot 174 -#: ../add.c:620 +#: ../add.c:624 hunk ./lib/libalpm/po/libalpm.pot 178 -#: ../add.c:626 +#: ../add.c:630 hunk ./lib/libalpm/po/libalpm.pot 182 -#: ../add.c:630 +#: ../add.c:634 hunk ./lib/libalpm/po/libalpm.pot 187 -#: ../add.c:631 +#: ../add.c:635 hunk ./lib/libalpm/po/libalpm.pot 192 -#: ../add.c:633 +#: ../add.c:637 hunk ./lib/libalpm/po/libalpm.pot 197 -#: ../add.c:634 +#: ../add.c:638 hunk ./lib/libalpm/po/libalpm.pot 202 -#: ../add.c:639 ../add.c:659 +#: ../add.c:643 ../add.c:663 hunk ./lib/libalpm/po/libalpm.pot 207 -#: ../add.c:661 +#: ../add.c:665 hunk ./lib/libalpm/po/libalpm.pot 212 -#: ../add.c:663 +#: ../add.c:667 hunk ./lib/libalpm/po/libalpm.pot 217 -#: ../add.c:664 +#: ../add.c:668 hunk ./lib/libalpm/po/libalpm.pot 222 -#: ../add.c:678 +#: ../add.c:682 hunk ./lib/libalpm/po/libalpm.pot 227 -#: ../add.c:689 +#: ../add.c:693 hunk ./lib/libalpm/po/libalpm.pot 231 -#: ../add.c:721 ../add.c:723 +#: ../add.c:725 ../add.c:727 hunk ./lib/libalpm/po/libalpm.pot 236 -#: ../add.c:722 ../add.c:724 +#: ../add.c:726 ../add.c:728 hunk ./lib/libalpm/po/libalpm.pot 240 -#: ../add.c:722 ../add.c:724 +#: ../add.c:726 ../add.c:728 hunk ./lib/libalpm/po/libalpm.pot 244 -#: ../add.c:745 ../add.c:796 +#: ../add.c:749 ../add.c:800 hunk ./lib/libalpm/po/libalpm.pot 250 -#: ../add.c:756 ../remove.c:262 +#: ../add.c:760 ../remove.c:284 hunk ./lib/libalpm/po/libalpm.pot 254 -#: ../add.c:757 +#: ../add.c:761 hunk ./lib/libalpm/po/libalpm.pot 259 -#: ../add.c:759 +#: ../add.c:763 hunk ./lib/libalpm/po/libalpm.pot 264 -#: ../add.c:761 +#: ../add.c:765 hunk ./lib/libalpm/po/libalpm.pot 269 -#: ../add.c:765 +#: ../add.c:769 hunk ./lib/libalpm/po/libalpm.pot 275 -#: ../add.c:770 ../remove.c:272 +#: ../add.c:774 ../remove.c:294 hunk ./lib/libalpm/po/libalpm.pot 279 -#: ../add.c:791 ../remove.c:300 +#: ../add.c:795 ../remove.c:322 hunk ./lib/libalpm/po/libalpm.pot 284 -#: ../add.c:799 ../remove.c:310 +#: ../add.c:803 ../remove.c:332 hunk ./lib/libalpm/po/libalpm.pot 289 -#: ../add.c:826 ../remove.c:322 +#: ../add.c:830 ../remove.c:345 hunk ./lib/libalpm/po/libalpm.pot 294 -#: ../alpm.c:196 +#: ../alpm.c:201 hunk ./lib/libalpm/po/libalpm.pot 299 -#: ../alpm.c:201 +#: ../alpm.c:206 hunk ./lib/libalpm/po/libalpm.pot 304 -#: ../alpm.c:212 +#: ../alpm.c:217 hunk ./lib/libalpm/po/libalpm.pot 309 -#: ../alpm.c:256 +#: ../alpm.c:261 hunk ./lib/libalpm/po/libalpm.pot 314 -#: ../alpm.c:261 +#: ../alpm.c:266 hunk ./lib/libalpm/po/libalpm.pot 319 -#: ../alpm.c:327 +#: ../alpm.c:344 hunk ./lib/libalpm/po/libalpm.pot 325 -#: ../alpm.c:331 +#: ../alpm.c:348 hunk ./lib/libalpm/po/libalpm.pot 330 +#: ../alpm.c:383 +#, c-format +msgid "failed to get lastupdate time for %s (no big deal)\n" +msgstr "" + +#: ../alpm.c:402 +#, c-format +msgid "sync: new mtime for %s: %s\n" +msgstr "" + hunk ./lib/libalpm/po/libalpm.pot 341 -#: ../alpm.c:358 +#: ../alpm.c:408 hunk ./lib/libalpm/po/libalpm.pot 346 -#: ../alpm.c:362 +#: ../alpm.c:412 hunk ./lib/libalpm/po/libalpm.pot 351 -#: ../alpm.c:377 +#. uncompress the sync database +#. ORE +#. we should not simply unpack the archive, but better parse it and +#. db_write each entry (see sync_load_dbarchive to get archive content) +#: ../alpm.c:426 hunk ./lib/libalpm/po/libalpm.pot 360 -#: ../alpm.c:522 +#: ../alpm.c:574 hunk ./lib/libalpm/po/libalpm.pot 365 -#: ../alpm.c:621 +#: ../alpm.c:673 hunk ./lib/libalpm/po/libalpm.pot 370 -#: ../alpm.c:632 ../alpm.c:679 +#: ../alpm.c:684 ../alpm.c:731 hunk ./lib/libalpm/po/libalpm.pot 375 -#: ../alpm.c:635 +#: ../alpm.c:687 hunk ./lib/libalpm/po/libalpm.pot 380 -#: ../alpm.c:668 +#: ../alpm.c:720 hunk ./lib/libalpm/po/libalpm.pot 385 -#: ../alpm.c:682 +#: ../alpm.c:734 hunk ./lib/libalpm/po/libalpm.pot 390 -#: ../alpm.c:941 +#: ../alpm.c:993 hunk ./lib/libalpm/po/libalpm.pot 395 -#: ../alpm.c:942 +#: ../alpm.c:994 hunk ./lib/libalpm/po/libalpm.pot 400 -#: ../be_files.c:147 +#: ../alpm.c:1232 +#, c-format +msgid "config: new section '%s'\n" +msgstr "" + +#: ../alpm.c:1275 +msgid "config: usesyslog\n" +msgstr "" + +#: ../alpm.c:1286 +#, c-format +msgid "config: including %s\n" +msgstr "" + +#: ../alpm.c:1298 ../alpm.c:1306 +#, c-format +msgid "config: noupgrade: %s\n" +msgstr "" + +#: ../alpm.c:1316 ../alpm.c:1324 +#, c-format +msgid "config: noextract: %s\n" +msgstr "" + +#: ../alpm.c:1334 ../alpm.c:1342 +#, c-format +msgid "config: ignorepkg: %s\n" +msgstr "" + +#: ../alpm.c:1352 ../alpm.c:1360 +#, c-format +msgid "config: holdpkg: %s\n" +msgstr "" + +#: ../alpm.c:1370 +#, c-format +msgid "config: dbpath: %s\n" +msgstr "" + +#: ../alpm.c:1380 +#, c-format +msgid "config: cachedir: %s\n" +msgstr "" + +#: ../alpm.c:1386 +#, c-format +msgid "config: log file: %s\n" +msgstr "" + +#. The config value is in days, we use seconds +#: ../alpm.c:1394 +#, c-format +msgid "config: UpgradeDelay: %i\n" +msgstr "" + +#. add to the list +#: ../alpm.c:1415 +#, c-format +msgid "config: %s: server: %s\n" +msgstr "" + +#: ../be_files.c:151 hunk ./lib/libalpm/po/libalpm.pot 466 -#: ../be_files.c:428 +#: ../be_files.c:432 hunk ./lib/libalpm/po/libalpm.pot 471 -#: ../be_files.c:513 +#: ../be_files.c:517 hunk ./lib/libalpm/po/libalpm.pot 476 -#: ../be_files.c:539 +#: ../be_files.c:543 hunk ./lib/libalpm/po/libalpm.pot 481 -#: ../cache.c:55 +#: ../cache.c:57 hunk ./lib/libalpm/po/libalpm.pot 486 -#: ../cache.c:75 +#: ../cache.c:77 hunk ./lib/libalpm/po/libalpm.pot 491 -#: ../cache.c:110 +#: ../cache.c:112 hunk ./lib/libalpm/po/libalpm.pot 496 -#: ../cache.c:132 +#: ../cache.c:134 hunk ./lib/libalpm/po/libalpm.pot 501 -#: ../cache.c:163 +#: ../cache.c:165 hunk ./lib/libalpm/po/libalpm.pot 507 -#: ../conflict.c:68 +#: ../conflict.c:71 hunk ./lib/libalpm/po/libalpm.pot 514 -#: ../conflict.c:77 ../conflict.c:91 +#: ../conflict.c:80 ../conflict.c:94 hunk ./lib/libalpm/po/libalpm.pot 520 -#: ../conflict.c:104 +#: ../conflict.c:107 hunk ./lib/libalpm/po/libalpm.pot 526 -#: ../conflict.c:113 ../conflict.c:126 +#: ../conflict.c:116 ../conflict.c:129 hunk ./lib/libalpm/po/libalpm.pot 532 -#: ../conflict.c:140 +#: ../conflict.c:143 hunk ./lib/libalpm/po/libalpm.pot 537 -#: ../conflict.c:167 ../conflict.c:182 +#: ../conflict.c:170 ../conflict.c:185 hunk ./lib/libalpm/po/libalpm.pot 542 -#: ../conflict.c:231 ../conflict.c:332 ../deps.c:52 ../deps.c:599 -#: ../deps.c:639 ../group.c:40 ../handle.c:50 ../package.c:95 ../sync.c:60 -#: ../sync.c:630 ../sync.c:646 ../sync.c:742 ../trans.c:46 ../util.c:594 -#: ../util.c:601 +#: ../conflict.c:234 ../conflict.c:335 ../deps.c:54 ../deps.c:601 +#: ../deps.c:641 ../group.c:42 ../handle.c:62 ../package.c:98 ../sync.c:65 +#: ../sync.c:635 ../sync.c:651 ../sync.c:747 ../trans.c:49 ../util.c:598 +#: ../util.c:605 hunk ./lib/libalpm/po/libalpm.pot 550 -#: ../db.c:53 ../db.c:60 +#: ../db.c:57 ../db.c:64 hunk ./lib/libalpm/po/libalpm.pot 555 -#: ../deps.c:116 +#: ../deps.c:118 hunk ./lib/libalpm/po/libalpm.pot 559 -#: ../deps.c:121 +#: ../deps.c:123 hunk ./lib/libalpm/po/libalpm.pot 563 -#: ../deps.c:164 +#: ../deps.c:166 hunk ./lib/libalpm/po/libalpm.pot 567 -#: ../deps.c:258 ../deps.c:404 +#: ../deps.c:260 ../deps.c:406 hunk ./lib/libalpm/po/libalpm.pot 572 -#: ../deps.c:368 +#: ../deps.c:370 hunk ./lib/libalpm/po/libalpm.pot 577 -#: ../deps.c:492 +#: ../deps.c:494 hunk ./lib/libalpm/po/libalpm.pot 582 -#: ../deps.c:497 +#: ../deps.c:499 hunk ./lib/libalpm/po/libalpm.pot 586 -#: ../deps.c:509 +#: ../deps.c:511 hunk ./lib/libalpm/po/libalpm.pot 592 -#: ../deps.c:526 +#: ../deps.c:528 hunk ./lib/libalpm/po/libalpm.pot 597 -#: ../deps.c:529 +#: ../deps.c:531 hunk ./lib/libalpm/po/libalpm.pot 602 -#: ../deps.c:571 +#: ../deps.c:573 hunk ./lib/libalpm/po/libalpm.pot 607 -#: ../deps.c:595 +#: ../deps.c:597 hunk ./lib/libalpm/po/libalpm.pot 614 -#: ../deps.c:612 +#: ../deps.c:614 hunk ./lib/libalpm/po/libalpm.pot 619 -#: ../deps.c:632 +#: ../deps.c:634 hunk ./lib/libalpm/po/libalpm.pot 624 -#: ../deps.c:636 +#: ../deps.c:638 hunk ./lib/libalpm/po/libalpm.pot 630 -#: ../deps.c:652 +#: ../deps.c:654 hunk ./lib/libalpm/po/libalpm.pot 635 -#: ../error.c:31 +#: ../error.c:34 hunk ./lib/libalpm/po/libalpm.pot 639 -#: ../error.c:33 ../error.c:121 +#: ../error.c:36 ../error.c:135 hunk ./lib/libalpm/po/libalpm.pot 643 -#: ../error.c:35 +#: ../error.c:38 hunk ./lib/libalpm/po/libalpm.pot 647 -#: ../error.c:37 +#: ../error.c:40 hunk ./lib/libalpm/po/libalpm.pot 651 -#: ../error.c:39 +#: ../error.c:42 hunk ./lib/libalpm/po/libalpm.pot 655 -#: ../error.c:42 +#: ../error.c:45 hunk ./lib/libalpm/po/libalpm.pot 659 -#: ../error.c:44 +#: ../error.c:47 hunk ./lib/libalpm/po/libalpm.pot 663 -#: ../error.c:46 +#: ../error.c:49 hunk ./lib/libalpm/po/libalpm.pot 667 -#: ../error.c:49 +#: ../error.c:52 hunk ./lib/libalpm/po/libalpm.pot 671 -#: ../error.c:51 +#: ../error.c:54 hunk ./lib/libalpm/po/libalpm.pot 675 -#: ../error.c:53 +#: ../error.c:56 hunk ./lib/libalpm/po/libalpm.pot 679 -#: ../error.c:55 +#: ../error.c:58 hunk ./lib/libalpm/po/libalpm.pot 683 -#: ../error.c:57 +#: ../error.c:60 hunk ./lib/libalpm/po/libalpm.pot 687 -#: ../error.c:59 +#: ../error.c:62 hunk ./lib/libalpm/po/libalpm.pot 691 -#: ../error.c:61 +#: ../error.c:64 hunk ./lib/libalpm/po/libalpm.pot 695 -#: ../error.c:68 +#: ../error.c:71 hunk ./lib/libalpm/po/libalpm.pot 699 -#: ../error.c:71 ../error.c:77 +#: ../error.c:74 ../error.c:80 hunk ./lib/libalpm/po/libalpm.pot 703 -#: ../error.c:73 +#: ../error.c:76 hunk ./lib/libalpm/po/libalpm.pot 707 -#: ../error.c:75 +#: ../error.c:78 hunk ./lib/libalpm/po/libalpm.pot 711 -#: ../error.c:79 +#: ../error.c:82 hunk ./lib/libalpm/po/libalpm.pot 715 -#: ../error.c:81 +#: ../error.c:84 hunk ./lib/libalpm/po/libalpm.pot 719 -#: ../error.c:83 +#: ../error.c:86 hunk ./lib/libalpm/po/libalpm.pot 723 -#: ../error.c:86 +#: ../error.c:89 hunk ./lib/libalpm/po/libalpm.pot 727 -#: ../error.c:88 +#: ../error.c:91 hunk ./lib/libalpm/po/libalpm.pot 731 -#: ../error.c:90 +#: ../error.c:93 hunk ./lib/libalpm/po/libalpm.pot 735 -#: ../error.c:92 +#: ../error.c:95 hunk ./lib/libalpm/po/libalpm.pot 739 -#: ../error.c:94 +#: ../error.c:97 hunk ./lib/libalpm/po/libalpm.pot 743 -#: ../error.c:96 +#: ../error.c:99 hunk ./lib/libalpm/po/libalpm.pot 747 -#: ../error.c:98 +#: ../error.c:101 hunk ./lib/libalpm/po/libalpm.pot 751 -#: ../error.c:100 +#: ../error.c:103 hunk ./lib/libalpm/po/libalpm.pot 755 -#: ../error.c:103 +#: ../error.c:106 hunk ./lib/libalpm/po/libalpm.pot 759 -#: ../error.c:106 +#: ../error.c:109 hunk ./lib/libalpm/po/libalpm.pot 763 -#: ../error.c:108 +#: ../error.c:111 hunk ./lib/libalpm/po/libalpm.pot 767 -#: ../error.c:110 +#: ../error.c:113 hunk ./lib/libalpm/po/libalpm.pot 771 -#: ../error.c:113 +#: ../error.c:116 hunk ./lib/libalpm/po/libalpm.pot 775 -#: ../error.c:115 +#: ../error.c:118 hunk ./lib/libalpm/po/libalpm.pot 779 -#: ../error.c:117 +#: ../error.c:120 hunk ./lib/libalpm/po/libalpm.pot 783 -#: ../error.c:119 +#: ../error.c:122 hunk ./lib/libalpm/po/libalpm.pot 787 -#: ../handle.c:127 +#: ../error.c:124 +msgid "not confirmed" +msgstr "" + +#: ../error.c:127 +msgid "bad section name" +msgstr "" + +#: ../error.c:129 +msgid "'local' is reserved and cannot be used as a package tree" +msgstr "" + +#: ../error.c:131 +msgid "syntax error" +msgstr "" + +#: ../error.c:133 +msgid "all directives must belong to a section" +msgstr "" + +#: ../handle.c:143 hunk ./lib/libalpm/po/libalpm.pot 812 -#: ../handle.c:134 +#: ../handle.c:150 hunk ./lib/libalpm/po/libalpm.pot 817 -#: ../handle.c:151 +#: ../handle.c:167 hunk ./lib/libalpm/po/libalpm.pot 822 -#: ../handle.c:155 +#: ../handle.c:171 hunk ./lib/libalpm/po/libalpm.pot 827 -#: ../handle.c:160 +#: ../handle.c:176 hunk ./lib/libalpm/po/libalpm.pot 832 -#: ../handle.c:163 +#: ../handle.c:179 hunk ./lib/libalpm/po/libalpm.pot 836 -#: ../handle.c:169 +#: ../handle.c:185 hunk ./lib/libalpm/po/libalpm.pot 841 -#: ../handle.c:172 +#: ../handle.c:188 hunk ./lib/libalpm/po/libalpm.pot 845 -#: ../handle.c:178 +#: ../handle.c:194 hunk ./lib/libalpm/po/libalpm.pot 850 -#: ../handle.c:181 +#: ../handle.c:197 hunk ./lib/libalpm/po/libalpm.pot 854 -#: ../handle.c:197 +#: ../handle.c:203 +#, c-format +msgid "'%s' added to PM_OPT_HOLDPKG" +msgstr "" + +#: ../handle.c:206 +msgid "PM_OPT_HOLDPKG flushed" +msgstr "" + +#: ../handle.c:222 hunk ./lib/libalpm/po/libalpm.pot 868 -#: ../handle.c:207 +#: ../handle.c:262 hunk ./lib/libalpm/po/libalpm.pot 873 +#: ../handle.c:281 +#, c-format +msgid "PM_OPT_PROXYHOST set to '%s'" +msgstr "" + +#: ../handle.c:285 +#, c-format +msgid "PM_OPT_PROXYPORT set to '%d'" +msgstr "" + +#: ../handle.c:296 +#, c-format +msgid "PM_OPT_XFERCOMMAND set to '%s'" +msgstr "" + +#: ../handle.c:300 +#, c-format +msgid "PM_OPT_NOPASSIVEFTP set to '%d'" +msgstr "" + +#: ../handle.c:304 +#, c-format +msgid "PM_OPT_CHOMP set to '%d'" +msgstr "" + hunk ./lib/libalpm/po/libalpm.pot 903 -#: ../package.c:182 +#: ../package.c:185 hunk ./lib/libalpm/po/libalpm.pot 908 -#: ../package.c:199 ../package.c:259 +#: ../package.c:202 ../package.c:262 hunk ./lib/libalpm/po/libalpm.pot 913 -#: ../package.c:316 +#: ../package.c:319 hunk ./lib/libalpm/po/libalpm.pot 917 -#: ../package.c:324 +#: ../package.c:327 hunk ./lib/libalpm/po/libalpm.pot 922 -#: ../package.c:332 +#: ../package.c:335 hunk ./lib/libalpm/po/libalpm.pot 927 -#: ../package.c:371 +#: ../package.c:374 hunk ./lib/libalpm/po/libalpm.pot 932 -#: ../package.c:388 +#: ../package.c:391 hunk ./lib/libalpm/po/libalpm.pot 937 -#: ../package.c:396 +#: ../package.c:399 hunk ./lib/libalpm/po/libalpm.pot 942 -#: ../remove.c:72 +#: ../remove.c:76 hunk ./lib/libalpm/po/libalpm.pot 947 -#: ../remove.c:76 +#: ../remove.c:88 hunk ./lib/libalpm/po/libalpm.pot 952 -#: ../remove.c:102 +#: ../remove.c:114 hunk ./lib/libalpm/po/libalpm.pot 957 -#: ../remove.c:105 +#: ../remove.c:117 hunk ./lib/libalpm/po/libalpm.pot 962 -#: ../remove.c:123 +#: ../remove.c:135 hunk ./lib/libalpm/po/libalpm.pot 966 -#: ../remove.c:167 +#: ../remove.c:180 hunk ./lib/libalpm/po/libalpm.pot 971 -#: ../remove.c:177 +#: ../remove.c:191 hunk ./lib/libalpm/po/libalpm.pot 975 -#: ../remove.c:198 +#: ../remove.c:217 hunk ./lib/libalpm/po/libalpm.pot 981 -#: ../remove.c:204 +#: ../remove.c:223 hunk ./lib/libalpm/po/libalpm.pot 986 -#: ../remove.c:206 +#: ../remove.c:225 hunk ./lib/libalpm/po/libalpm.pot 991 -#: ../remove.c:220 +#: ../remove.c:239 hunk ./lib/libalpm/po/libalpm.pot 996 -#: ../remove.c:232 ../remove.c:233 +#: ../remove.c:251 ../remove.c:252 hunk ./lib/libalpm/po/libalpm.pot 1001 -#: ../remove.c:235 ../remove.c:242 +#: ../remove.c:254 ../remove.c:261 hunk ./lib/libalpm/po/libalpm.pot 1006 -#: ../remove.c:237 ../remove.c:244 +#: ../remove.c:256 ../remove.c:266 hunk ./lib/libalpm/po/libalpm.pot 1011 -#: ../remove.c:263 +#: ../remove.c:285 hunk ./lib/libalpm/po/libalpm.pot 1016 -#: ../remove.c:265 +#: ../remove.c:287 hunk ./lib/libalpm/po/libalpm.pot 1021 -#: ../remove.c:268 +#: ../remove.c:290 hunk ./lib/libalpm/po/libalpm.pot 1026 -#: ../remove.c:308 +#: ../remove.c:330 hunk ./lib/libalpm/po/libalpm.pot 1032 -#: ../sync.c:155 +#: ../sync.c:160 hunk ./lib/libalpm/po/libalpm.pot 1036 -#: ../sync.c:164 +#: ../sync.c:169 hunk ./lib/libalpm/po/libalpm.pot 1041 -#: ../sync.c:166 +#: ../sync.c:171 hunk ./lib/libalpm/po/libalpm.pot 1046 -#: ../sync.c:200 +#: ../sync.c:205 hunk ./lib/libalpm/po/libalpm.pot 1052 -#: ../sync.c:212 +#: ../sync.c:217 hunk ./lib/libalpm/po/libalpm.pot 1056 -#: ../sync.c:224 +#: ../sync.c:229 hunk ./lib/libalpm/po/libalpm.pot 1061 -#: ../sync.c:238 ../sync.c:525 +#: ../sync.c:243 ../sync.c:530 hunk ./lib/libalpm/po/libalpm.pot 1067 -#: ../sync.c:247 +#: ../sync.c:252 hunk ./lib/libalpm/po/libalpm.pot 1073 -#: ../sync.c:253 +#: ../sync.c:258 hunk ./lib/libalpm/po/libalpm.pot 1079 -#: ../sync.c:257 +#: ../sync.c:262 hunk ./lib/libalpm/po/libalpm.pot 1084 -#: ../sync.c:261 +#: ../sync.c:266 hunk ./lib/libalpm/po/libalpm.pot 1090 -#: ../sync.c:312 ../sync.c:331 +#: ../sync.c:317 ../sync.c:336 hunk ./lib/libalpm/po/libalpm.pot 1095 -#: ../sync.c:317 ../sync.c:336 +#: ../sync.c:322 ../sync.c:341 hunk ./lib/libalpm/po/libalpm.pot 1100 -#: ../sync.c:355 +#: ../sync.c:360 hunk ./lib/libalpm/po/libalpm.pot 1105 -#: ../sync.c:363 +#: ../sync.c:368 hunk ./lib/libalpm/po/libalpm.pot 1110 -#: ../sync.c:383 +#: ../sync.c:388 hunk ./lib/libalpm/po/libalpm.pot 1115 -#: ../sync.c:428 +#: ../sync.c:433 hunk ./lib/libalpm/po/libalpm.pot 1119 -#: ../sync.c:448 +#: ../sync.c:453 hunk ./lib/libalpm/po/libalpm.pot 1124 -#: ../sync.c:480 +#: ../sync.c:485 hunk ./lib/libalpm/po/libalpm.pot 1128 -#: ../sync.c:510 +#: ../sync.c:515 hunk ./lib/libalpm/po/libalpm.pot 1133 -#: ../sync.c:532 +#: ../sync.c:537 hunk ./lib/libalpm/po/libalpm.pot 1141 -#: ../sync.c:543 +#: ../sync.c:548 hunk ./lib/libalpm/po/libalpm.pot 1146 -#: ../sync.c:566 ../sync.c:571 +#: ../sync.c:571 ../sync.c:576 hunk ./lib/libalpm/po/libalpm.pot 1151 -#: ../sync.c:583 ../sync.c:620 +#: ../sync.c:588 ../sync.c:625 hunk ./lib/libalpm/po/libalpm.pot 1158 -#: ../sync.c:592 +#: ../sync.c:597 hunk ./lib/libalpm/po/libalpm.pot 1164 -#: ../sync.c:615 +#: ../sync.c:620 hunk ./lib/libalpm/po/libalpm.pot 1170 -#: ../sync.c:626 ../sync.c:642 +#: ../sync.c:631 ../sync.c:647 hunk ./lib/libalpm/po/libalpm.pot 1174 -#: ../sync.c:694 +#: ../sync.c:699 hunk ./lib/libalpm/po/libalpm.pot 1178 -#: ../sync.c:708 +#: ../sync.c:713 hunk ./lib/libalpm/po/libalpm.pot 1183 -#: ../sync.c:727 +#: ../sync.c:732 hunk ./lib/libalpm/po/libalpm.pot 1188 -#: ../sync.c:812 ../sync.c:824 +#: ../sync.c:825 hunk ./lib/libalpm/po/libalpm.pot 1190 -msgid "can't get md5 or sha1 checksum for package %s\n" +msgid "%s-%s-%s%s is already in the cache\n" +msgstr "" + +#. no cache directory.... try creating it +#: ../sync.c:837 +#, c-format +msgid "no %s cache exists. creating...\n" hunk ./lib/libalpm/po/libalpm.pot 1199 +#: ../sync.c:838 +#, c-format +msgid "warning: no %s cache exists. creating..." +msgstr "" + +#. couldn't mkdir the cache directory, so fall back to /tmp and unlink +#. * the package afterwards. +#. hunk ./lib/libalpm/po/libalpm.pot 1208 +msgid "couldn't create package cache, using /tmp instead\n" +msgstr "" + +#: ../sync.c:844 +msgid "warning: couldn't create package cache, using /tmp instead" +msgstr "" + +#: ../sync.c:847 +#, c-format +msgid "failed to set option CACHEDIR (%s)\n" +msgstr "" + +#: ../sync.c:854 +#, c-format +msgid "failed to retrieve some files from %s\n" +msgstr "" + +#: ../sync.c:883 ../sync.c:895 +#, c-format +msgid "can't get md5 or sha1 checksum for package %s\n" +msgstr "" + +#: ../sync.c:914 hunk ./lib/libalpm/po/libalpm.pot 1235 -#: ../sync.c:845 +#: ../sync.c:916 hunk ./lib/libalpm/po/libalpm.pot 1240 -#: ../sync.c:865 +#: ../sync.c:936 hunk ./lib/libalpm/po/libalpm.pot 1244 -#: ../sync.c:871 +#: ../sync.c:942 hunk ./lib/libalpm/po/libalpm.pot 1248 -#: ../sync.c:891 +#: ../sync.c:962 hunk ./lib/libalpm/po/libalpm.pot 1252 -#: ../sync.c:893 +#: ../sync.c:964 hunk ./lib/libalpm/po/libalpm.pot 1256 -#: ../sync.c:899 +#: ../sync.c:970 hunk ./lib/libalpm/po/libalpm.pot 1261 -#: ../sync.c:906 +#: ../sync.c:977 hunk ./lib/libalpm/po/libalpm.pot 1265 -#: ../sync.c:909 +#: ../sync.c:980 hunk ./lib/libalpm/po/libalpm.pot 1269 -#: ../sync.c:914 +#: ../sync.c:985 hunk ./lib/libalpm/po/libalpm.pot 1273 -#: ../sync.c:933 +#: ../sync.c:1004 hunk ./lib/libalpm/po/libalpm.pot 1277 -#: ../sync.c:938 +#: ../sync.c:1009 hunk ./lib/libalpm/po/libalpm.pot 1281 -#: ../sync.c:945 +#: ../sync.c:1016 hunk ./lib/libalpm/po/libalpm.pot 1285 -#: ../sync.c:974 +#: ../sync.c:1045 hunk ./lib/libalpm/po/libalpm.pot 1290 -#: ../sync.c:983 +#: ../sync.c:1054 hunk ./lib/libalpm/po/libalpm.pot 1295 -#: ../util.c:281 +#: ../util.c:285 hunk ./lib/libalpm/po/libalpm.pot 1300 -#: ../util.c:432 +#: ../util.c:436 hunk ./lib/libalpm/po/libalpm.pot 1304 -#: ../util.c:459 +#: ../util.c:463 hunk ./lib/libalpm/po/libalpm.pot 1309 -#: ../util.c:462 +#: ../util.c:466 hunk ./lib/libalpm/po/libalpm.pot 1314 -#: ../util.c:475 +#: ../util.c:479 hunk ./lib/libalpm/po/libalpm.pot 1319 -#: ../util.c:482 +#: ../util.c:486 hunk ./lib/libalpm/po/libalpm.pot 1324 -#: ../util.c:484 +#: ../util.c:488 hunk ./lib/libalpm/po/libalpm.pot 1329 -#: ../util.c:488 +#: ../util.c:492 hunk ./lib/libalpm/po/libalpm.pot 1334 -#: ../util.c:492 +#: ../util.c:496 hunk ./lib/libalpm/po/libalpm.pot 1339 -#: ../util.c:495 +#: ../util.c:499 hunk ./lib/libalpm/po/libalpm.pot 1344 -#: ../util.c:517 +#: ../util.c:521 hunk ./lib/libalpm/po/libalpm.pot 1349 -#: ../util.c:525 +#: ../util.c:529 hunk ./lib/libalpm/po/libalpm.pot 1354 -#: ../util.c:589 +#: ../util.c:593 hunk ./src/pacman/po/de.po 10 -"POT-Creation-Date: 2006-08-26 14:56+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./src/pacman/po/de.po 19 -#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:431 ../sync.c:470 +#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:378 ../sync.c:417 hunk ./src/pacman/po/de.po 33 -#: ../add.c:79 ../remove.c:99 +#: ../add.c:79 ../remove.c:92 hunk ./src/pacman/po/de.po 42 -#: ../add.c:92 ../remove.c:109 ../sync.c:558 +#: ../add.c:92 ../remove.c:102 ../sync.c:505 hunk ./src/pacman/po/de.po 52 -#: ../add.c:111 ../sync.c:579 +#: ../add.c:111 ../sync.c:526 hunk ./src/pacman/po/de.po 57 -#: ../add.c:121 ../sync.c:781 +#: ../add.c:121 ../sync.c:649 hunk ./src/pacman/po/de.po 62 -#: ../add.c:128 ../sync.c:788 +#: ../add.c:128 ../sync.c:656 hunk ./src/pacman/po/de.po 67 -#: ../add.c:136 ../sync.c:796 ../sync.c:803 +#: ../add.c:136 ../sync.c:664 ../sync.c:671 hunk ./src/pacman/po/de.po 75 -#: ../add.c:143 ../sync.c:589 +#: ../add.c:143 ../sync.c:536 hunk ./src/pacman/po/de.po 80 -#: ../add.c:157 ../remove.c:149 ../sync.c:774 +#: ../add.c:157 ../remove.c:142 ../sync.c:642 hunk ./src/pacman/po/de.po 85 -#: ../add.c:164 ../remove.c:159 ../sync.c:463 ../sync.c:823 +#: ../add.c:164 ../remove.c:152 ../sync.c:410 ../sync.c:684 hunk ./src/pacman/po/de.po 90 -#: ../conf.c:102 -#, c-format -msgid "config: new section '%s'\n" -msgstr "Konfiguration: Neuer Abschnitt '%s'\n" - -#: ../conf.c:104 -#, c-format -msgid "config: line %d: bad section name\n" -msgstr "Konfiguration: Zeile %d: Schlechter Abschnittsname\n" - -#: ../conf.c:108 -#, c-format -msgid "" -"config: line %d: '%s' is reserved and cannot be used as a package tree\n" -msgstr "" -"Konfiguration: Zeile %d: '%s' ist reserviert und kann nicht als Paketbaum " -"genutzt werden\n" - -#: ../conf.c:134 ../conf.c:156 ../conf.c:300 ../conf.c:366 -#, c-format -msgid "config: line %d: syntax error\n" -msgstr "Konfiguration: Zeile %d: Syntaxfehler\n" - -#: ../conf.c:140 -#, c-format -msgid "config: line %d: all directives must belong to a section\n" -msgstr "" -"Konfiguration: Zeile %d: Alle Anweisungen mĂŒssen zu einem Abschnitt gehören\n" - -#: ../conf.c:146 -msgid "config: nopassiveftp\n" -msgstr "Konfiguration: nopassiveftp\n" - -#: ../conf.c:149 -#, c-format -msgid "failed to set option USESYSLOG (%s)\n" -msgstr "Konnte Option USESYSLOG nicht setzen (%s)\n" - -#: ../conf.c:152 -msgid "config: usesyslog\n" -msgstr "Konfiguration: usesyslog\n" - -#: ../conf.c:164 -#, c-format -msgid "config: including %s\n" -msgstr "Konfiguration: Schließe %s ein\n" - -#: ../conf.c:173 ../conf.c:181 -#, c-format -msgid "failed to set option NOUPGRADE (%s)\n" -msgstr "Konnte Option NOUPGRADE nicht setzen (%s)\n" - -#: ../conf.c:176 ../conf.c:184 -#, c-format -msgid "config: noupgrade: %s\n" -msgstr "Konfiguration: noupgrade: %s\n" - -#: ../conf.c:191 ../conf.c:199 -#, c-format -msgid "failed to set option NOEXTRACT (%s)\n" -msgstr "Konnte Option NOEXTRACT nicht setzen (%s)\n" - -#: ../conf.c:194 ../conf.c:202 -#, c-format -msgid "config: noextract: %s\n" -msgstr "Konfiguration: noextract: %s\n" - -#: ../conf.c:209 ../conf.c:217 ../pacman.c:552 -#, c-format -msgid "failed to set option IGNOREPKG (%s)\n" -msgstr "Konnte Option IGNOREPKG nicht setzen (%s)\n" - -#: ../conf.c:212 ../conf.c:220 -#, c-format -msgid "config: ignorepkg: %s\n" -msgstr "Konfiguration: ignorepkg: %s\n" - -#: ../conf.c:227 ../conf.c:232 -#, c-format -msgid "config: holdpkg: %s\n" -msgstr "Konfiguration: holdpkg: %s\n" - -#: ../conf.c:240 -#, c-format -msgid "config: dbpath: %s\n" -msgstr "Konfiguration: dbpath: %s\n" - -#: ../conf.c:248 -#, c-format -msgid "config: cachedir: %s\n" -msgstr "Konfiguration: cachedir: %s\n" - -#: ../conf.c:251 -#, c-format -msgid "failed to set option LOGFILE (%s)\n" -msgstr "Konnte Option LOGFILE nicht setzen (%s)\n" - -#: ../conf.c:254 -#, c-format -msgid "config: log file: %s\n" -msgstr "Konfiguration: log file: %s\n" - -#: ../conf.c:262 -#, c-format -msgid "config: xfercommand: %s\n" -msgstr "Konfiguration: xfercommand: %s\n" - -#. The config value is in days, we use seconds -#: ../conf.c:265 -#, c-format -msgid "config: UpgradeDelay: %i\n" -msgstr "Konfiguration: UpgradeDelay: %i\n" - -#: ../conf.c:267 -#, c-format -msgid "failed to set option UPGRADEDELAY (%s)\n" -msgstr "Konnte Option UPGRADEDELAY nicht setzen (%s)\n" - -#: ../conf.c:272 -msgid "" -"Warning: UpgradeDelay is very high.\n" -"If a package is updated often it will never be upgraded.\n" -"Manually update such packages or use a lower value to avoid this problem.\n" -msgstr "" -"Warnung: UpgradeDelay ist sehr hoch.\n" -"Wenn ein Paket oft erneuert wird, wird es niemals aktualisiert.\n" -"Aktualisieren Sie so ein Paket manuell oder benutze Sie einen geringeren " -"Wert um das Problem zu vermeiden.\n" - -#: ../conf.c:285 ../conf.c:315 ../conf.c:321 -#, c-format -msgid "config: line %d: bad server location\n" -msgstr "Konfiguration: Zeile %d: Schlechte Serverangabe\n" - -#: ../conf.c:295 -#, c-format -msgid "config: proxyserver: %s\n" -msgstr "Konfiguration: proxyserver: %s\n" - -#: ../conf.c:298 -#, c-format -msgid "config: proxyport: %u\n" -msgstr "Konfiguration: proxyport: %u\n" - -#: ../conf.c:338 ../conf.c:353 -#, c-format -msgid "could not allocate %d bytes\n" -msgstr "Konnte %d Bytes nicht zuteilen\n" - -#: ../conf.c:359 -#, c-format -msgid "config: line %d: protocol %s is not supported\n" -msgstr "Konfiguration: Zeile %d: Protokoll %s wird nicht unterstĂŒtzt\n" - -#. add to the list -#: ../conf.c:363 -#, c-format -msgid "config: %s: server: %s %s %s\n" -msgstr "Konfiguration: %s: Server: %s %s %s\n" - hunk ./src/pacman/po/de.po 119 -#: ../download.c:211 -#, c-format -msgid "connecting to %s:21\n" -msgstr "Verbinde zu %s:21\n" - -#: ../download.c:213 ../download.c:244 ../download.c:419 -#, c-format -msgid "cannot connect to %s\n" -msgstr "Kann nicht mit %s verbinden\n" - -#: ../download.c:217 -msgid "anonymous login failed\n" -msgstr "" - -#: ../download.c:222 -#, c-format -msgid "could not cwd to %s: %s\n" -msgstr "" - -#: ../download.c:228 -msgid "failed to set passive mode\n" -msgstr "" - -#: ../download.c:231 -msgid "FTP passive mode not set\n" -msgstr "" - -#: ../download.c:239 ../download.c:414 -#, c-format -msgid "connecting to %s\n" -msgstr "Verbinde zu %s\n" - -#: ../download.c:241 ../download.c:416 -#, c-format -msgid "connecting to %s:%u\n" -msgstr "Verbinde zu %s:%u\n" - -#: ../download.c:303 -#, c-format -msgid "could not chdir to %s\n" -msgstr "" - -#. execute the parsed command via /bin/sh -c -#: ../download.c:307 -#, c-format -msgid "running command: %s\n" -msgstr "FĂŒhre Befehl aus: %s\n" - -#: ../download.c:310 -msgid "running XferCommand: fork failed!\n" -msgstr "" - -#. download failed -#: ../download.c:314 -#, c-format -msgid "XferCommand command returned non-zero status code (%d)\n" -msgstr "XferCommand Befehl gab einen Fehler zurĂŒck (%d)\n" - -#: ../download.c:360 -#, c-format -msgid "failed to get filesize for %s\n" -msgstr "Konnte DateigrĂ¶ĂŸe von %s nicht ermitteln\n" - -#: ../download.c:366 ../download.c:479 -#, c-format -msgid "failed to get mtime for %s\n" -msgstr "Konnte mtime fĂŒr %s nicht ermitteln\n" - -#. mtimes are identical, skip this file -#: ../download.c:371 ../download.c:464 -#, c-format -msgid "mtimes are identical, skipping %s\n" -msgstr "mtimes sind nicht identisch, ĂŒberspringe %s\n" - -#: ../download.c:386 -msgid "failed to resume download -- restarting\n" -msgstr "Konnte Download nicht fortsetzen - Starte neu\n" - -#: ../download.c:393 ../download.c:468 -#, c-format -msgid "" -"\n" -"failed downloading %s from %s: %s\n" -msgstr "" -"\n" -"Konnte %s nicht von %s herunterladen: %s\n" - -#: ../download.c:487 -#, c-format -msgid "copying %s to %s/%s\n" -msgstr "Kopiere %s nach %s/%s\n" - -#: ../download.c:490 -#, c-format -msgid "failed copying %s\n" -msgstr "Konnte %s nicht kopieren\n" - -#: ../download.c:506 -msgid "] 100% LOCAL " -msgstr "] 100 % LOKAL " - -#: ../download.c:568 -#, c-format -msgid " %s is already in the current directory\n" -msgstr " %s ist bereits im aktuellen Verzeichnis\n" - -#: ../download.c:582 -#, c-format -msgid "failed to download %s\n" -msgstr "Konnte %s nicht herunterladen\n" - hunk ./src/pacman/po/de.po 379 -#: ../pacman.c:94 +#: ../pacman.c:96 hunk ./src/pacman/po/de.po 384 -#: ../pacman.c:95 +#: ../pacman.c:97 hunk ./src/pacman/po/de.po 389 -#: ../pacman.c:96 +#: ../pacman.c:98 hunk ./src/pacman/po/de.po 394 -#: ../pacman.c:97 +#: ../pacman.c:99 hunk ./src/pacman/po/de.po 399 -#: ../pacman.c:98 +#: ../pacman.c:100 hunk ./src/pacman/po/de.po 404 -#: ../pacman.c:99 +#: ../pacman.c:101 hunk ./src/pacman/po/de.po 409 -#: ../pacman.c:100 +#: ../pacman.c:102 hunk ./src/pacman/po/de.po 414 -#: ../pacman.c:101 +#: ../pacman.c:103 hunk ./src/pacman/po/de.po 419 -#: ../pacman.c:102 +#: ../pacman.c:104 hunk ./src/pacman/po/de.po 428 -#: ../pacman.c:105 +#: ../pacman.c:107 hunk ./src/pacman/po/de.po 433 -#: ../pacman.c:106 ../pacman.c:111 ../pacman.c:123 ../pacman.c:128 -#: ../pacman.c:142 +#: ../pacman.c:108 ../pacman.c:113 ../pacman.c:125 ../pacman.c:130 +#: ../pacman.c:144 hunk ./src/pacman/po/de.po 439 -#: ../pacman.c:107 ../pacman.c:113 ../pacman.c:124 ../pacman.c:144 +#: ../pacman.c:109 ../pacman.c:115 ../pacman.c:126 ../pacman.c:146 hunk ./src/pacman/po/de.po 444 -#: ../pacman.c:108 ../pacman.c:125 ../pacman.c:146 +#: ../pacman.c:110 ../pacman.c:127 ../pacman.c:148 hunk ./src/pacman/po/de.po 450 -#: ../pacman.c:110 +#: ../pacman.c:112 hunk ./src/pacman/po/de.po 455 -#: ../pacman.c:112 +#: ../pacman.c:114 hunk ./src/pacman/po/de.po 462 -#: ../pacman.c:114 +#: ../pacman.c:116 hunk ./src/pacman/po/de.po 467 -#: ../pacman.c:115 +#: ../pacman.c:117 hunk ./src/pacman/po/de.po 472 -#: ../pacman.c:116 +#: ../pacman.c:118 hunk ./src/pacman/po/de.po 480 -#: ../pacman.c:119 +#: ../pacman.c:121 hunk ./src/pacman/po/de.po 485 -#: ../pacman.c:121 +#: ../pacman.c:123 hunk ./src/pacman/po/de.po 490 -#: ../pacman.c:127 +#: ../pacman.c:129 hunk ./src/pacman/po/de.po 495 -#: ../pacman.c:129 +#: ../pacman.c:131 hunk ./src/pacman/po/de.po 500 -#: ../pacman.c:130 +#: ../pacman.c:132 hunk ./src/pacman/po/de.po 508 -#: ../pacman.c:131 +#: ../pacman.c:133 hunk ./src/pacman/po/de.po 514 -#: ../pacman.c:132 ../pacman.c:147 +#: ../pacman.c:134 ../pacman.c:149 hunk ./src/pacman/po/de.po 520 -#: ../pacman.c:133 +#: ../pacman.c:135 hunk ./src/pacman/po/de.po 525 -#: ../pacman.c:134 +#: ../pacman.c:136 hunk ./src/pacman/po/de.po 530 -#: ../pacman.c:135 +#: ../pacman.c:137 hunk ./src/pacman/po/de.po 539 -#: ../pacman.c:136 +#: ../pacman.c:138 hunk ./src/pacman/po/de.po 544 -#: ../pacman.c:137 +#: ../pacman.c:139 hunk ./src/pacman/po/de.po 553 -#: ../pacman.c:138 +#: ../pacman.c:140 hunk ./src/pacman/po/de.po 558 -#: ../pacman.c:139 +#: ../pacman.c:141 hunk ./src/pacman/po/de.po 566 -#: ../pacman.c:141 +#: ../pacman.c:143 hunk ./src/pacman/po/de.po 571 -#: ../pacman.c:143 +#: ../pacman.c:145 hunk ./src/pacman/po/de.po 579 -#: ../pacman.c:145 +#: ../pacman.c:147 hunk ./src/pacman/po/de.po 584 -#: ../pacman.c:148 +#: ../pacman.c:150 hunk ./src/pacman/po/de.po 593 -#: ../pacman.c:149 +#: ../pacman.c:151 hunk ./src/pacman/po/de.po 600 -#: ../pacman.c:150 +#: ../pacman.c:152 hunk ./src/pacman/po/de.po 605 -#: ../pacman.c:151 +#: ../pacman.c:153 hunk ./src/pacman/po/de.po 613 -#: ../pacman.c:152 +#: ../pacman.c:154 hunk ./src/pacman/po/de.po 619 -#: ../pacman.c:153 +#: ../pacman.c:155 hunk ./src/pacman/po/de.po 627 -#: ../pacman.c:155 +#: ../pacman.c:157 hunk ./src/pacman/po/de.po 632 -#: ../pacman.c:156 +#: ../pacman.c:158 hunk ./src/pacman/po/de.po 637 -#: ../pacman.c:157 +#: ../pacman.c:159 hunk ./src/pacman/po/de.po 642 -#: ../pacman.c:158 +#: ../pacman.c:160 hunk ./src/pacman/po/de.po 650 -#: ../pacman.c:159 +#: ../pacman.c:161 hunk ./src/pacman/po/de.po 656 -#: ../pacman.c:160 +#: ../pacman.c:162 hunk ./src/pacman/po/de.po 661 -#: ../pacman.c:161 +#: ../pacman.c:163 hunk ./src/pacman/po/de.po 668 -#: ../pacman.c:162 +#: ../pacman.c:164 hunk ./src/pacman/po/de.po 673 -#: ../pacman.c:175 +#: ../pacman.c:177 hunk ./src/pacman/po/de.po 678 -#: ../pacman.c:176 +#: ../pacman.c:178 hunk ./src/pacman/po/de.po 683 -#: ../pacman.c:369 +#: ../pacman.c:363 hunk ./src/pacman/po/de.po 687 -#: ../pacman.c:396 +#: ../pacman.c:390 hunk ./src/pacman/po/de.po 691 -#: ../pacman.c:492 +#: ../pacman.c:486 hunk ./src/pacman/po/de.po 695 -#: ../pacman.c:516 +#: ../pacman.c:510 hunk ./src/pacman/po/de.po 700 -#: ../pacman.c:529 +#: ../pacman.c:518 +#, fuzzy, c-format +msgid "failed to parse config (%s)\n" +msgstr "Konnte DurchfĂŒhrung nicht vorbereiten (%s)\n" + +#: ../pacman.c:524 hunk ./src/pacman/po/de.po 710 -#: ../pacman.c:533 +#: ../pacman.c:528 hunk ./src/pacman/po/de.po 715 -#: ../pacman.c:541 -#, c-format -msgid "failed to set option DBPATH (%s)\n" +#: ../pacman.c:532 +#, fuzzy, c-format +msgid "failed to set option DLCB (%s)\n" +msgstr "Konnte Option LOGCB nicht setzen (%s)\n" + +#: ../pacman.c:536 +#, fuzzy, c-format +msgid "failed to set option DLFNM (%s)\n" +msgstr "Konnte Option LOGFILE nicht setzen (%s)\n" + +#: ../pacman.c:540 +#, fuzzy, c-format +msgid "failed to set option DLOFFSET (%s)\n" +msgstr "Konnte Option LOGFILE nicht setzen (%s)\n" + +#: ../pacman.c:544 +#, fuzzy, c-format +msgid "failed to set option DLT0 (%s)\n" hunk ./src/pacman/po/de.po 735 -#: ../pacman.c:546 ../sync.c:752 -#, c-format -msgid "failed to set option CACHEDIR (%s)\n" -msgstr "Konnte Option CACHEDIR nicht setzen (%s)\n" +#: ../pacman.c:548 +#, fuzzy, c-format +msgid "failed to set option DLT (%s)\n" +msgstr "Konnte Option DBPATH nicht setzen (%s)\n" + +#: ../pacman.c:552 +#, fuzzy, c-format +msgid "failed to set option DLRATE (%s)\n" +msgstr "Konnte Option DBPATH nicht setzen (%s)\n" + +#: ../pacman.c:556 +#, fuzzy, c-format +msgid "failed to set option DLXFERED1 (%s)\n" +msgstr "Konnte Option LOGFILE nicht setzen (%s)\n" hunk ./src/pacman/po/de.po 751 +#, fuzzy, c-format +msgid "failed to set option DLETA_H (%s)\n" +msgstr "Konnte Option DBPATH nicht setzen (%s)\n" + +#: ../pacman.c:564 +#, fuzzy, c-format +msgid "failed to set option DLETA_M (%s)\n" +msgstr "Konnte Option DBPATH nicht setzen (%s)\n" + +#: ../pacman.c:568 +#, fuzzy, c-format +msgid "failed to set option DLETA_S (%s)\n" +msgstr "Konnte Option LOGMASK nicht setzen (%s)\n" + +#: ../pacman.c:578 +#, c-format +msgid "failed to set option IGNOREPKG (%s)\n" +msgstr "Konnte Option IGNOREPKG nicht setzen (%s)\n" + +#: ../pacman.c:586 hunk ./src/pacman/po/de.po 774 -#: ../pacman.c:566 +#: ../pacman.c:592 hunk ./src/pacman/po/de.po 779 -#: ../pacman.c:573 +#: ../pacman.c:599 hunk ./src/pacman/po/de.po 783 -#: ../pacman.c:586 +#: ../pacman.c:612 hunk ./src/pacman/po/de.po 806 -#: ../query.c:111 ../sync.c:374 +#: ../query.c:111 ../sync.c:340 hunk ./src/pacman/po/de.po 810 -#: ../query.c:160 +#: ../query.c:150 hunk ./src/pacman/po/de.po 815 -#: ../query.c:170 +#: ../query.c:160 hunk ./src/pacman/po/de.po 819 -#: ../query.c:174 +#: ../query.c:164 hunk ./src/pacman/po/de.po 825 -#: ../query.c:212 ../query.c:254 +#: ../query.c:202 ../query.c:244 hunk ./src/pacman/po/de.po 830 -#: ../remove.c:64 ../sync.c:509 +#: ../remove.c:64 ../sync.c:456 hunk ./src/pacman/po/de.po 844 -#: ../remove.c:81 ../sync.c:429 ../sync.c:468 +#: ../remove.c:81 ../sync.c:376 ../sync.c:415 hunk ./src/pacman/po/de.po 849 -#: ../remove.c:94 -#, c-format -msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr ":: %s ist als ein HoldPkg gekennzeichnet. Trotzdem entfernen? [J/n] " - -#: ../remove.c:114 +#: ../remove.c:107 hunk ./src/pacman/po/de.po 854 -#: ../remove.c:136 +#: ../remove.c:129 hunk ./src/pacman/po/de.po 863 -#: ../remove.c:139 +#: ../remove.c:132 hunk ./src/pacman/po/de.po 900 -#: ../sync.c:153 ../trans.c:69 ../trans.c:83 ../trans.c:94 ../trans.c:107 -#: ../trans.c:119 +#: ../sync.c:153 ../trans.c:72 ../trans.c:86 ../trans.c:100 ../trans.c:116 +#: ../trans.c:128 hunk ./src/pacman/po/de.po 905 -#: ../sync.c:177 -#, c-format -msgid "failed to get lastupdate time for %s (no big deal)\n" -msgstr "" - -#: ../sync.c:190 +#: ../sync.c:168 hunk ./src/pacman/po/de.po 910 -#: ../sync.c:193 -#, c-format -msgid " %s is up to date\n" -msgstr " %s ist aktuell\n" - -#: ../sync.c:196 -#, c-format -msgid "sync: new mtime for %s: %s\n" -msgstr "" - -#: ../sync.c:201 +#: ../sync.c:170 hunk ./src/pacman/po/de.po 915 -#: ../sync.c:295 +#: ../sync.c:174 +#, c-format +msgid " %s is up to date\n" +msgstr " %s ist aktuell\n" + +#: ../sync.c:265 hunk ./src/pacman/po/de.po 925 -#: ../sync.c:333 +#: ../sync.c:303 hunk ./src/pacman/po/de.po 931 -#: ../sync.c:403 +#: ../sync.c:350 hunk ./src/pacman/po/de.po 935 -#: ../sync.c:404 +#: ../sync.c:351 hunk ./src/pacman/po/de.po 939 -#: ../sync.c:438 +#: ../sync.c:385 hunk ./src/pacman/po/de.po 943 -#: ../sync.c:439 +#: ../sync.c:386 hunk ./src/pacman/po/de.po 947 -#: ../sync.c:457 +#: ../sync.c:404 hunk ./src/pacman/po/de.po 955 -#: ../sync.c:458 +#: ../sync.c:405 hunk ./src/pacman/po/de.po 959 -#: ../sync.c:459 +#: ../sync.c:406 hunk ./src/pacman/po/de.po 963 -#: ../sync.c:461 +#: ../sync.c:408 hunk ./src/pacman/po/de.po 967 -#: ../sync.c:476 ../sync.c:497 +#: ../sync.c:423 ../sync.c:444 hunk ./src/pacman/po/de.po 972 -#: ../sync.c:515 +#: ../sync.c:462 hunk ./src/pacman/po/de.po 976 -#: ../sync.c:522 +#: ../sync.c:469 hunk ./src/pacman/po/de.po 981 -#: ../sync.c:545 +#: ../sync.c:492 hunk ./src/pacman/po/de.po 986 -#: ../sync.c:564 +#: ../sync.c:511 hunk ./src/pacman/po/de.po 990 -#: ../sync.c:564 +#: ../sync.c:511 hunk ./src/pacman/po/de.po 994 -#: ../sync.c:641 +#: ../sync.c:588 hunk ./src/pacman/po/de.po 1002 -#: ../sync.c:657 +#: ../sync.c:604 hunk ./src/pacman/po/de.po 1010 -#: ../sync.c:660 +#: ../sync.c:607 hunk ./src/pacman/po/de.po 1019 -#: ../sync.c:661 +#: ../sync.c:608 hunk ./src/pacman/po/de.po 1028 -#: ../sync.c:667 +#: ../sync.c:614 hunk ./src/pacman/po/de.po 1036 -#: ../sync.c:671 +#: ../sync.c:618 hunk ./src/pacman/po/de.po 1040 -#: ../sync.c:679 +#: ../sync.c:626 hunk ./src/pacman/po/de.po 1048 -#: ../sync.c:683 +#: ../sync.c:630 hunk ./src/pacman/po/de.po 1052 -#: ../sync.c:730 -#, c-format -msgid "%s-%s-%s%s is already in the cache\n" -msgstr "%s-%s-%s%s ist bereits im Cache\n" - -#: ../sync.c:738 -#, c-format -msgid "" -"\n" -":: Retrieving packages from %s...\n" -msgstr "" -"\n" -":: Empfange Pakete von %s ...\n" - -#. no cache directory.... try creating it -#: ../sync.c:742 -#, c-format -msgid "no %s cache exists. creating...\n" -msgstr "" - -#: ../sync.c:743 -#, c-format -msgid "warning: no %s cache exists. creating..." -msgstr "" - -#. couldn't mkdir the cache directory, so fall back to /tmp and unlink -#. * the package afterwards. -#. -#: ../sync.c:748 -#, fuzzy -msgid "couldn't create package cache, using /tmp instead\n" -msgstr "Konnte Paketcache nicht erstellen, nutze /tmp" - -#: ../sync.c:749 -msgid "warning: couldn't create package cache, using /tmp instead" -msgstr "Warnung: Konnte Paketcache nicht erstellen, nutze /tmp" - -#: ../sync.c:759 -#, c-format -msgid "failed to retrieve some files from %s\n" -msgstr "Konnte manche Dateien nicht von %s empfangen\n" - -#: ../trans.c:54 +#: ../trans.c:57 hunk ./src/pacman/po/de.po 1056 -#: ../trans.c:57 +#: ../trans.c:60 hunk ./src/pacman/po/de.po 1060 -#: ../trans.c:60 +#: ../trans.c:63 hunk ./src/pacman/po/de.po 1064 -#: ../trans.c:63 +#: ../trans.c:66 hunk ./src/pacman/po/de.po 1068 -#: ../trans.c:78 +#: ../trans.c:81 hunk ./src/pacman/po/de.po 1073 -#: ../trans.c:85 +#: ../trans.c:88 hunk ./src/pacman/po/de.po 1078 -#: ../trans.c:91 +#: ../trans.c:95 hunk ./src/pacman/po/de.po 1083 -#: ../trans.c:95 +#: ../trans.c:104 hunk ./src/pacman/po/de.po 1088 -#: ../trans.c:102 +#: ../trans.c:111 hunk ./src/pacman/po/de.po 1093 -#: ../trans.c:109 +#: ../trans.c:118 hunk ./src/pacman/po/de.po 1098 -#: ../trans.c:116 +#: ../trans.c:125 hunk ./src/pacman/po/de.po 1102 -#: ../trans.c:130 +#: ../trans.c:139 hunk ./src/pacman/po/de.po 1107 -#: ../trans.c:132 +#: ../trans.c:141 hunk ./src/pacman/po/de.po 1111 -#: ../trans.c:151 +#: ../trans.c:148 +#, c-format +msgid "" +"\n" +":: Retrieving packages from %s...\n" +msgstr "" +"\n" +":: Empfange Pakete von %s ...\n" + +#: ../trans.c:158 +msgid "] 100% LOCAL " +msgstr "] 100 % LOKAL " + +#: ../trans.c:176 hunk ./src/pacman/po/de.po 1131 -#: ../trans.c:165 +#: ../trans.c:190 +#, c-format +msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " +msgstr ":: %s ist als ein HoldPkg gekennzeichnet. Trotzdem entfernen? [J/n] " + +#: ../trans.c:203 hunk ./src/pacman/po/de.po 1141 -#: ../trans.c:180 +#: ../trans.c:218 hunk ./src/pacman/po/de.po 1146 -#: ../trans.c:196 +#: ../trans.c:234 hunk ./src/pacman/po/de.po 1151 -#: ../trans.c:214 +#: ../trans.c:252 hunk ./src/pacman/po/de.po 1156 -#: ../trans.c:232 +#: ../trans.c:270 hunk ./src/pacman/po/de.po 1161 -#: ../trans.c:248 +#: ../trans.c:286 hunk ./src/pacman/po/de.po 1165 -#: ../trans.c:249 +#: ../trans.c:287 hunk ./src/pacman/po/de.po 1169 +#: ../trans.c:288 +#, fuzzy +msgid "removing" +msgstr "Entferne %s ... " + hunk ./src/pacman/po/de.po 1184 +#~ msgid "config: new section '%s'\n" +#~ msgstr "Konfiguration: Neuer Abschnitt '%s'\n" + +#~ msgid "config: line %d: bad section name\n" +#~ msgstr "Konfiguration: Zeile %d: Schlechter Abschnittsname\n" + +#~ msgid "" +#~ "config: line %d: '%s' is reserved and cannot be used as a package tree\n" +#~ msgstr "" +#~ "Konfiguration: Zeile %d: '%s' ist reserviert und kann nicht als Paketbaum " +#~ "genutzt werden\n" + +#~ msgid "config: line %d: syntax error\n" +#~ msgstr "Konfiguration: Zeile %d: Syntaxfehler\n" + +#~ msgid "config: line %d: all directives must belong to a section\n" +#~ msgstr "" +#~ "Konfiguration: Zeile %d: Alle Anweisungen mĂŒssen zu einem Abschnitt " +#~ "gehören\n" + +#~ msgid "config: nopassiveftp\n" +#~ msgstr "Konfiguration: nopassiveftp\n" + +#~ msgid "failed to set option USESYSLOG (%s)\n" +#~ msgstr "Konnte Option USESYSLOG nicht setzen (%s)\n" + +#~ msgid "config: usesyslog\n" +#~ msgstr "Konfiguration: usesyslog\n" + +#~ msgid "config: including %s\n" +#~ msgstr "Konfiguration: Schließe %s ein\n" + +#~ msgid "failed to set option NOUPGRADE (%s)\n" +#~ msgstr "Konnte Option NOUPGRADE nicht setzen (%s)\n" + +#~ msgid "config: noupgrade: %s\n" +#~ msgstr "Konfiguration: noupgrade: %s\n" + +#~ msgid "failed to set option NOEXTRACT (%s)\n" +#~ msgstr "Konnte Option NOEXTRACT nicht setzen (%s)\n" + +#~ msgid "config: noextract: %s\n" +#~ msgstr "Konfiguration: noextract: %s\n" + +#~ msgid "config: ignorepkg: %s\n" +#~ msgstr "Konfiguration: ignorepkg: %s\n" + +#~ msgid "config: holdpkg: %s\n" +#~ msgstr "Konfiguration: holdpkg: %s\n" + +#~ msgid "config: dbpath: %s\n" +#~ msgstr "Konfiguration: dbpath: %s\n" + +#~ msgid "config: cachedir: %s\n" +#~ msgstr "Konfiguration: cachedir: %s\n" + +#~ msgid "config: log file: %s\n" +#~ msgstr "Konfiguration: log file: %s\n" + +#~ msgid "config: xfercommand: %s\n" +#~ msgstr "Konfiguration: xfercommand: %s\n" + +#~ msgid "config: UpgradeDelay: %i\n" +#~ msgstr "Konfiguration: UpgradeDelay: %i\n" + +#~ msgid "failed to set option UPGRADEDELAY (%s)\n" +#~ msgstr "Konnte Option UPGRADEDELAY nicht setzen (%s)\n" + +#~ msgid "" +#~ "Warning: UpgradeDelay is very high.\n" +#~ "If a package is updated often it will never be upgraded.\n" +#~ "Manually update such packages or use a lower value to avoid this " +#~ "problem.\n" +#~ msgstr "" +#~ "Warnung: UpgradeDelay ist sehr hoch.\n" +#~ "Wenn ein Paket oft erneuert wird, wird es niemals aktualisiert.\n" +#~ "Aktualisieren Sie so ein Paket manuell oder benutze Sie einen geringeren " +#~ "Wert um das Problem zu vermeiden.\n" + +#~ msgid "config: line %d: bad server location\n" +#~ msgstr "Konfiguration: Zeile %d: Schlechte Serverangabe\n" + +#~ msgid "config: proxyserver: %s\n" +#~ msgstr "Konfiguration: proxyserver: %s\n" + +#~ msgid "config: proxyport: %u\n" +#~ msgstr "Konfiguration: proxyport: %u\n" + +#~ msgid "could not allocate %d bytes\n" +#~ msgstr "Konnte %d Bytes nicht zuteilen\n" + +#~ msgid "config: line %d: protocol %s is not supported\n" +#~ msgstr "Konfiguration: Zeile %d: Protokoll %s wird nicht unterstĂŒtzt\n" + +#~ msgid "config: %s: server: %s %s %s\n" +#~ msgstr "Konfiguration: %s: Server: %s %s %s\n" + +#~ msgid "connecting to %s:21\n" +#~ msgstr "Verbinde zu %s:21\n" + +#~ msgid "cannot connect to %s\n" +#~ msgstr "Kann nicht mit %s verbinden\n" + +#~ msgid "connecting to %s\n" +#~ msgstr "Verbinde zu %s\n" + +#~ msgid "connecting to %s:%u\n" +#~ msgstr "Verbinde zu %s:%u\n" + +#~ msgid "running command: %s\n" +#~ msgstr "FĂŒhre Befehl aus: %s\n" + +#~ msgid "XferCommand command returned non-zero status code (%d)\n" +#~ msgstr "XferCommand Befehl gab einen Fehler zurĂŒck (%d)\n" + +#~ msgid "failed to get filesize for %s\n" +#~ msgstr "Konnte DateigrĂ¶ĂŸe von %s nicht ermitteln\n" + +#~ msgid "failed to get mtime for %s\n" +#~ msgstr "Konnte mtime fĂŒr %s nicht ermitteln\n" + +#~ msgid "mtimes are identical, skipping %s\n" +#~ msgstr "mtimes sind nicht identisch, ĂŒberspringe %s\n" + +#~ msgid "failed to resume download -- restarting\n" +#~ msgstr "Konnte Download nicht fortsetzen - Starte neu\n" + +#~ msgid "" +#~ "\n" +#~ "failed downloading %s from %s: %s\n" +#~ msgstr "" +#~ "\n" +#~ "Konnte %s nicht von %s herunterladen: %s\n" + +#~ msgid "copying %s to %s/%s\n" +#~ msgstr "Kopiere %s nach %s/%s\n" + +#~ msgid "failed copying %s\n" +#~ msgstr "Konnte %s nicht kopieren\n" + +#~ msgid " %s is already in the current directory\n" +#~ msgstr " %s ist bereits im aktuellen Verzeichnis\n" + +#~ msgid "failed to download %s\n" +#~ msgstr "Konnte %s nicht herunterladen\n" + +#~ msgid "failed to set option CACHEDIR (%s)\n" +#~ msgstr "Konnte Option CACHEDIR nicht setzen (%s)\n" + +#~ msgid "%s-%s-%s%s is already in the cache\n" +#~ msgstr "%s-%s-%s%s ist bereits im Cache\n" + +#, fuzzy +#~ msgid "couldn't create package cache, using /tmp instead\n" +#~ msgstr "Konnte Paketcache nicht erstellen, nutze /tmp" + +#~ msgid "warning: couldn't create package cache, using /tmp instead" +#~ msgstr "Warnung: Konnte Paketcache nicht erstellen, nutze /tmp" + +#~ msgid "failed to retrieve some files from %s\n" +#~ msgstr "Konnte manche Dateien nicht von %s empfangen\n" + hunk ./src/pacman/po/fr.po 10 -"POT-Creation-Date: 2006-08-26 14:56+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./src/pacman/po/fr.po 20 -#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:431 ../sync.c:470 +#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:378 ../sync.c:417 hunk ./src/pacman/po/fr.po 35 -#: ../add.c:79 ../remove.c:99 +#: ../add.c:79 ../remove.c:92 hunk ./src/pacman/po/fr.po 44 -#: ../add.c:92 ../remove.c:109 ../sync.c:558 +#: ../add.c:92 ../remove.c:102 ../sync.c:505 hunk ./src/pacman/po/fr.po 54 -#: ../add.c:111 ../sync.c:579 +#: ../add.c:111 ../sync.c:526 hunk ./src/pacman/po/fr.po 59 -#: ../add.c:121 ../sync.c:781 +#: ../add.c:121 ../sync.c:649 hunk ./src/pacman/po/fr.po 64 -#: ../add.c:128 ../sync.c:788 +#: ../add.c:128 ../sync.c:656 hunk ./src/pacman/po/fr.po 69 -#: ../add.c:136 ../sync.c:796 ../sync.c:803 +#: ../add.c:136 ../sync.c:664 ../sync.c:671 hunk ./src/pacman/po/fr.po 77 -#: ../add.c:143 ../sync.c:589 +#: ../add.c:143 ../sync.c:536 hunk ./src/pacman/po/fr.po 82 -#: ../add.c:157 ../remove.c:149 ../sync.c:774 +#: ../add.c:157 ../remove.c:142 ../sync.c:642 hunk ./src/pacman/po/fr.po 87 -#: ../add.c:164 ../remove.c:159 ../sync.c:463 ../sync.c:823 +#: ../add.c:164 ../remove.c:152 ../sync.c:410 ../sync.c:684 hunk ./src/pacman/po/fr.po 92 -#: ../conf.c:102 -#, c-format -msgid "config: new section '%s'\n" -msgstr "config: nouvelle section '%s'\n" - -#: ../conf.c:104 -#, c-format -msgid "config: line %d: bad section name\n" -msgstr "config: ligne %d: mauvais nom de section\n" - -#: ../conf.c:108 -#, c-format -msgid "" -"config: line %d: '%s' is reserved and cannot be used as a package tree\n" -msgstr "" -"config: ligne %d: '%s' est réservé et ne peut être utilisé comme " -"arborescence de paquet\n" - -#: ../conf.c:134 ../conf.c:156 ../conf.c:300 ../conf.c:366 -#, c-format -msgid "config: line %d: syntax error\n" -msgstr "config: ligne %d: erreur de syntaxe\n" - -#: ../conf.c:140 -#, c-format -msgid "config: line %d: all directives must belong to a section\n" -msgstr "" -"config: ligne %d: toutes les instructions doivent être relatives à la " -"section\n" - -#: ../conf.c:146 -msgid "config: nopassiveftp\n" -msgstr "" - -#: ../conf.c:149 -#, c-format -msgid "failed to set option USESYSLOG (%s)\n" -msgstr "échec d'affection de l'option USESYSLOG (%s)\n" - -#: ../conf.c:152 -msgid "config: usesyslog\n" -msgstr "" - -#: ../conf.c:164 -#, c-format -msgid "config: including %s\n" -msgstr "config: inclusion de %s\n" - -#: ../conf.c:173 ../conf.c:181 -#, c-format -msgid "failed to set option NOUPGRADE (%s)\n" -msgstr "échec d'affectation de l'option NOUPGRADE (%s)\n" - -#: ../conf.c:176 ../conf.c:184 -#, c-format -msgid "config: noupgrade: %s\n" -msgstr "" - -#: ../conf.c:191 ../conf.c:199 -#, c-format -msgid "failed to set option NOEXTRACT (%s)\n" -msgstr "échec d'affectation de l'option NOEXTRACT (%s)\n" - -#: ../conf.c:194 ../conf.c:202 -#, c-format -msgid "config: noextract: %s\n" -msgstr "" - -#: ../conf.c:209 ../conf.c:217 ../pacman.c:552 -#, c-format -msgid "failed to set option IGNOREPKG (%s)\n" -msgstr "échec d'affectation de l'option IGNOREPKG (%s)\n" - -#: ../conf.c:212 ../conf.c:220 -#, c-format -msgid "config: ignorepkg: %s\n" -msgstr "" - -#: ../conf.c:227 ../conf.c:232 -#, c-format -msgid "config: holdpkg: %s\n" -msgstr "" - -#: ../conf.c:240 -#, c-format -msgid "config: dbpath: %s\n" -msgstr "" - -#: ../conf.c:248 -#, c-format -msgid "config: cachedir: %s\n" -msgstr "" - -#: ../conf.c:251 -#, c-format -msgid "failed to set option LOGFILE (%s)\n" -msgstr "échec d'affectation de l'option LOGFILE (%s)\n" - -#: ../conf.c:254 -#, c-format -msgid "config: log file: %s\n" -msgstr "config: fichier de log: %s\n" - -#: ../conf.c:262 -#, c-format -msgid "config: xfercommand: %s\n" -msgstr "" - -#. The config value is in days, we use seconds -#: ../conf.c:265 -#, c-format -msgid "config: UpgradeDelay: %i\n" -msgstr "" - -#: ../conf.c:267 -#, c-format -msgid "failed to set option UPGRADEDELAY (%s)\n" -msgstr "échec d'affectation de l'option UPGRADEDELAY (%s)\n" - -#: ../conf.c:272 -msgid "" -"Warning: UpgradeDelay is very high.\n" -"If a package is updated often it will never be upgraded.\n" -"Manually update such packages or use a lower value to avoid this problem.\n" -msgstr "" -"Avertissement: UpgradeDelay est très élevé.\n" -"Si un paquet est mis à jour souvent, ces mise à jour ne seront jamais " -"appliquée.\n" -"Mettez à jour ces paquets manuellement ou utilisez une valeur plus basse " -"pour résoudre ce problème.\n" - -#: ../conf.c:285 ../conf.c:315 ../conf.c:321 -#, c-format -msgid "config: line %d: bad server location\n" -msgstr "config: ligne %d: mauvais adressage de serveur\n" - -#: ../conf.c:295 -#, c-format -msgid "config: proxyserver: %s\n" -msgstr "" - -#: ../conf.c:298 -#, c-format -msgid "config: proxyport: %u\n" -msgstr "" - -#: ../conf.c:338 ../conf.c:353 -#, c-format -msgid "could not allocate %d bytes\n" -msgstr "n'a pas pu allouer %d bytes\n" - -#: ../conf.c:359 -#, c-format -msgid "config: line %d: protocol %s is not supported\n" -msgstr "config: ligne %d: le protocole %s n'est pas supporté\n" - -#. add to the list -#: ../conf.c:363 -#, c-format -msgid "config: %s: server: %s %s %s\n" -msgstr "" - hunk ./src/pacman/po/fr.po 121 -#: ../download.c:211 -#, c-format -msgid "connecting to %s:21\n" -msgstr "connexion à %s:21\n" - -#: ../download.c:213 ../download.c:244 ../download.c:419 -#, c-format -msgid "cannot connect to %s\n" -msgstr "n'a pas pu se connecter à %s\n" - -#: ../download.c:217 -msgid "anonymous login failed\n" -msgstr "la connexion en utilisateur anonyme à échouée\n" - -#: ../download.c:222 -#, c-format -msgid "could not cwd to %s: %s\n" -msgstr "n'a pas pu exécuter cwd pour %s: %s\n" - -#: ../download.c:228 -msgid "failed to set passive mode\n" -msgstr "échec d'application mode passif\n" - -#: ../download.c:231 -msgid "FTP passive mode not set\n" -msgstr "mode FTP passif non défini\n" - -#: ../download.c:239 ../download.c:414 -#, c-format -msgid "connecting to %s\n" -msgstr "connexion à %s\n" - -#: ../download.c:241 ../download.c:416 -#, c-format -msgid "connecting to %s:%u\n" -msgstr "connexion à %s:%u\n" - -#: ../download.c:303 -#, c-format -msgid "could not chdir to %s\n" -msgstr "n'a pas pu exécuter chdir vers %s\n" - -#. execute the parsed command via /bin/sh -c -#: ../download.c:307 -#, c-format -msgid "running command: %s\n" -msgstr "exécution de la commande: %s\n" - -#: ../download.c:310 -msgid "running XferCommand: fork failed!\n" -msgstr "exécution de XferCommand: échec du fork!\n" - -#. download failed -#: ../download.c:314 -#, c-format -msgid "XferCommand command returned non-zero status code (%d)\n" -msgstr "" -"la commande XferCommand à retourné un code de statut différent de zéro (%d)\n" - -#: ../download.c:360 -#, c-format -msgid "failed to get filesize for %s\n" -msgstr "échec de récupération de la taille de fichier pour %s\n" - -#: ../download.c:366 ../download.c:479 -#, c-format -msgid "failed to get mtime for %s\n" -msgstr "échec de récupération de la date de modification pour %s\n" - -#. mtimes are identical, skip this file -#: ../download.c:371 ../download.c:464 -#, c-format -msgid "mtimes are identical, skipping %s\n" -msgstr "le dates de modifications sont identiques, ignoré %s\n" - -#: ../download.c:386 -msgid "failed to resume download -- restarting\n" -msgstr "échec de reprise du téléchargement -- redémarrage\n" - -#: ../download.c:393 ../download.c:468 -#, c-format -msgid "" -"\n" -"failed downloading %s from %s: %s\n" -msgstr "" -"\n" -"échec du téléchargement de %s depuis %s: %s\n" - -#: ../download.c:487 -#, c-format -msgid "copying %s to %s/%s\n" -msgstr "copie %s vers %s/%s\n" - -#: ../download.c:490 -#, c-format -msgid "failed copying %s\n" -msgstr "échec de copie de %s\n" - -#: ../download.c:506 -msgid "] 100% LOCAL " -msgstr "" - -#: ../download.c:568 -#, c-format -msgid " %s is already in the current directory\n" -msgstr " %s est déjà dans le répertoire courant\n" - -#: ../download.c:582 -#, c-format -msgid "failed to download %s\n" -msgstr "échec lors du téléchargement de %s\n" - hunk ./src/pacman/po/fr.po 381 -#: ../pacman.c:94 +#: ../pacman.c:96 hunk ./src/pacman/po/fr.po 386 -#: ../pacman.c:95 +#: ../pacman.c:97 hunk ./src/pacman/po/fr.po 391 -#: ../pacman.c:96 +#: ../pacman.c:98 hunk ./src/pacman/po/fr.po 396 -#: ../pacman.c:97 +#: ../pacman.c:99 hunk ./src/pacman/po/fr.po 401 -#: ../pacman.c:98 +#: ../pacman.c:100 hunk ./src/pacman/po/fr.po 406 -#: ../pacman.c:99 +#: ../pacman.c:101 hunk ./src/pacman/po/fr.po 411 -#: ../pacman.c:100 +#: ../pacman.c:102 hunk ./src/pacman/po/fr.po 416 -#: ../pacman.c:101 +#: ../pacman.c:103 hunk ./src/pacman/po/fr.po 421 -#: ../pacman.c:102 +#: ../pacman.c:104 hunk ./src/pacman/po/fr.po 430 -#: ../pacman.c:105 +#: ../pacman.c:107 hunk ./src/pacman/po/fr.po 435 -#: ../pacman.c:106 ../pacman.c:111 ../pacman.c:123 ../pacman.c:128 -#: ../pacman.c:142 +#: ../pacman.c:108 ../pacman.c:113 ../pacman.c:125 ../pacman.c:130 +#: ../pacman.c:144 hunk ./src/pacman/po/fr.po 441 -#: ../pacman.c:107 ../pacman.c:113 ../pacman.c:124 ../pacman.c:144 +#: ../pacman.c:109 ../pacman.c:115 ../pacman.c:126 ../pacman.c:146 hunk ./src/pacman/po/fr.po 446 -#: ../pacman.c:108 ../pacman.c:125 ../pacman.c:146 +#: ../pacman.c:110 ../pacman.c:127 ../pacman.c:148 hunk ./src/pacman/po/fr.po 453 -#: ../pacman.c:110 +#: ../pacman.c:112 hunk ./src/pacman/po/fr.po 458 -#: ../pacman.c:112 +#: ../pacman.c:114 hunk ./src/pacman/po/fr.po 465 -#: ../pacman.c:114 +#: ../pacman.c:116 hunk ./src/pacman/po/fr.po 472 -#: ../pacman.c:115 +#: ../pacman.c:117 hunk ./src/pacman/po/fr.po 477 -#: ../pacman.c:116 +#: ../pacman.c:118 hunk ./src/pacman/po/fr.po 485 -#: ../pacman.c:119 +#: ../pacman.c:121 hunk ./src/pacman/po/fr.po 490 -#: ../pacman.c:121 +#: ../pacman.c:123 hunk ./src/pacman/po/fr.po 495 -#: ../pacman.c:127 +#: ../pacman.c:129 hunk ./src/pacman/po/fr.po 500 -#: ../pacman.c:129 +#: ../pacman.c:131 hunk ./src/pacman/po/fr.po 505 -#: ../pacman.c:130 +#: ../pacman.c:132 hunk ./src/pacman/po/fr.po 513 -#: ../pacman.c:131 +#: ../pacman.c:133 hunk ./src/pacman/po/fr.po 518 -#: ../pacman.c:132 ../pacman.c:147 +#: ../pacman.c:134 ../pacman.c:149 hunk ./src/pacman/po/fr.po 524 -#: ../pacman.c:133 +#: ../pacman.c:135 hunk ./src/pacman/po/fr.po 529 -#: ../pacman.c:134 +#: ../pacman.c:136 hunk ./src/pacman/po/fr.po 534 -#: ../pacman.c:135 +#: ../pacman.c:137 hunk ./src/pacman/po/fr.po 543 -#: ../pacman.c:136 +#: ../pacman.c:138 hunk ./src/pacman/po/fr.po 550 -#: ../pacman.c:137 +#: ../pacman.c:139 hunk ./src/pacman/po/fr.po 558 -#: ../pacman.c:138 +#: ../pacman.c:140 hunk ./src/pacman/po/fr.po 563 -#: ../pacman.c:139 +#: ../pacman.c:141 hunk ./src/pacman/po/fr.po 572 -#: ../pacman.c:141 +#: ../pacman.c:143 hunk ./src/pacman/po/fr.po 577 -#: ../pacman.c:143 +#: ../pacman.c:145 hunk ./src/pacman/po/fr.po 586 -#: ../pacman.c:145 +#: ../pacman.c:147 hunk ./src/pacman/po/fr.po 591 -#: ../pacman.c:148 +#: ../pacman.c:150 hunk ./src/pacman/po/fr.po 600 -#: ../pacman.c:149 +#: ../pacman.c:151 hunk ./src/pacman/po/fr.po 605 -#: ../pacman.c:150 +#: ../pacman.c:152 hunk ./src/pacman/po/fr.po 610 -#: ../pacman.c:151 +#: ../pacman.c:153 hunk ./src/pacman/po/fr.po 618 -#: ../pacman.c:152 +#: ../pacman.c:154 hunk ./src/pacman/po/fr.po 626 -#: ../pacman.c:153 +#: ../pacman.c:155 hunk ./src/pacman/po/fr.po 634 -#: ../pacman.c:155 +#: ../pacman.c:157 hunk ./src/pacman/po/fr.po 639 -#: ../pacman.c:156 +#: ../pacman.c:158 hunk ./src/pacman/po/fr.po 644 -#: ../pacman.c:157 +#: ../pacman.c:159 hunk ./src/pacman/po/fr.po 649 -#: ../pacman.c:158 +#: ../pacman.c:160 hunk ./src/pacman/po/fr.po 657 -#: ../pacman.c:159 +#: ../pacman.c:161 hunk ./src/pacman/po/fr.po 664 -#: ../pacman.c:160 +#: ../pacman.c:162 hunk ./src/pacman/po/fr.po 669 -#: ../pacman.c:161 +#: ../pacman.c:163 hunk ./src/pacman/po/fr.po 674 -#: ../pacman.c:162 +#: ../pacman.c:164 hunk ./src/pacman/po/fr.po 681 -#: ../pacman.c:175 +#: ../pacman.c:177 hunk ./src/pacman/po/fr.po 687 -#: ../pacman.c:176 +#: ../pacman.c:178 hunk ./src/pacman/po/fr.po 692 -#: ../pacman.c:369 +#: ../pacman.c:363 hunk ./src/pacman/po/fr.po 696 -#: ../pacman.c:396 +#: ../pacman.c:390 hunk ./src/pacman/po/fr.po 700 -#: ../pacman.c:492 +#: ../pacman.c:486 hunk ./src/pacman/po/fr.po 704 -#: ../pacman.c:516 +#: ../pacman.c:510 hunk ./src/pacman/po/fr.po 709 -#: ../pacman.c:529 +#: ../pacman.c:518 +#, fuzzy, c-format +msgid "failed to parse config (%s)\n" +msgstr "échec de préparation de la transaction (%s)\n" + +#: ../pacman.c:524 hunk ./src/pacman/po/fr.po 719 -#: ../pacman.c:533 +#: ../pacman.c:528 hunk ./src/pacman/po/fr.po 724 -#: ../pacman.c:541 -#, c-format -msgid "failed to set option DBPATH (%s)\n" +#: ../pacman.c:532 +#, fuzzy, c-format +msgid "failed to set option DLCB (%s)\n" +msgstr "échec d'affectation de l'option LOGCB (%s)\n" + +#: ../pacman.c:536 +#, fuzzy, c-format +msgid "failed to set option DLFNM (%s)\n" +msgstr "échec d'affectation de l'option LOGFILE (%s)\n" + +#: ../pacman.c:540 +#, fuzzy, c-format +msgid "failed to set option DLOFFSET (%s)\n" +msgstr "échec d'affectation de l'option LOGFILE (%s)\n" + +#: ../pacman.c:544 +#, fuzzy, c-format +msgid "failed to set option DLT0 (%s)\n" hunk ./src/pacman/po/fr.po 744 -#: ../pacman.c:546 ../sync.c:752 -#, c-format -msgid "failed to set option CACHEDIR (%s)\n" -msgstr "échec d'affectation de l'option CACHEDIR (%s)\n" +#: ../pacman.c:548 +#, fuzzy, c-format +msgid "failed to set option DLT (%s)\n" +msgstr "échec d'affectation de l'option DBPATH (%s)\n" + +#: ../pacman.c:552 +#, fuzzy, c-format +msgid "failed to set option DLRATE (%s)\n" +msgstr "échec d'affectation de l'option DBPATH (%s)\n" + +#: ../pacman.c:556 +#, fuzzy, c-format +msgid "failed to set option DLXFERED1 (%s)\n" +msgstr "échec d'affectation de l'option LOGFILE (%s)\n" hunk ./src/pacman/po/fr.po 760 +#, fuzzy, c-format +msgid "failed to set option DLETA_H (%s)\n" +msgstr "échec d'affectation de l'option DBPATH (%s)\n" + +#: ../pacman.c:564 +#, fuzzy, c-format +msgid "failed to set option DLETA_M (%s)\n" +msgstr "échec d'affectation de l'option DBPATH (%s)\n" + +#: ../pacman.c:568 +#, fuzzy, c-format +msgid "failed to set option DLETA_S (%s)\n" +msgstr "échec d'affectation de l'option LOGMASK (%s)\n" + +#: ../pacman.c:578 +#, c-format +msgid "failed to set option IGNOREPKG (%s)\n" +msgstr "échec d'affectation de l'option IGNOREPKG (%s)\n" + +#: ../pacman.c:586 hunk ./src/pacman/po/fr.po 783 -#: ../pacman.c:566 +#: ../pacman.c:592 hunk ./src/pacman/po/fr.po 788 -#: ../pacman.c:573 +#: ../pacman.c:599 hunk ./src/pacman/po/fr.po 792 -#: ../pacman.c:586 +#: ../pacman.c:612 hunk ./src/pacman/po/fr.po 815 -#: ../query.c:111 ../sync.c:374 +#: ../query.c:111 ../sync.c:340 hunk ./src/pacman/po/fr.po 819 -#: ../query.c:160 +#: ../query.c:150 hunk ./src/pacman/po/fr.po 824 -#: ../query.c:170 +#: ../query.c:160 hunk ./src/pacman/po/fr.po 828 -#: ../query.c:174 +#: ../query.c:164 hunk ./src/pacman/po/fr.po 834 -#: ../query.c:212 ../query.c:254 +#: ../query.c:202 ../query.c:244 hunk ./src/pacman/po/fr.po 839 -#: ../remove.c:64 ../sync.c:509 +#: ../remove.c:64 ../sync.c:456 hunk ./src/pacman/po/fr.po 853 -#: ../remove.c:81 ../sync.c:429 ../sync.c:468 +#: ../remove.c:81 ../sync.c:376 ../sync.c:415 hunk ./src/pacman/po/fr.po 858 -#: ../remove.c:94 -#, c-format -msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr ":: %s est indiqué comme \"HoldPkg\". Supprimer tout de même? [Y/n] " - -#: ../remove.c:114 +#: ../remove.c:107 hunk ./src/pacman/po/fr.po 863 -#: ../remove.c:136 +#: ../remove.c:129 hunk ./src/pacman/po/fr.po 872 -#: ../remove.c:139 +#: ../remove.c:132 hunk ./src/pacman/po/fr.po 909 -#: ../sync.c:153 ../trans.c:69 ../trans.c:83 ../trans.c:94 ../trans.c:107 -#: ../trans.c:119 +#: ../sync.c:153 ../trans.c:72 ../trans.c:86 ../trans.c:100 ../trans.c:116 +#: ../trans.c:128 hunk ./src/pacman/po/fr.po 914 -#: ../sync.c:177 -#, c-format -msgid "failed to get lastupdate time for %s (no big deal)\n" -msgstr "" -"echec d'obtention de la dernière mise à jour pour %s (ce n'est pas un gros " -"problème)\n" - -#: ../sync.c:190 +#: ../sync.c:168 hunk ./src/pacman/po/fr.po 919 -#: ../sync.c:193 -#, c-format -msgid " %s is up to date\n" -msgstr " %s est à jour\n" - -#: ../sync.c:196 -#, c-format -msgid "sync: new mtime for %s: %s\n" -msgstr "sync: nouvelle valeur mtime pour %s: %s\n" - -#: ../sync.c:201 +#: ../sync.c:170 hunk ./src/pacman/po/fr.po 924 -#: ../sync.c:295 +#: ../sync.c:174 +#, c-format +msgid " %s is up to date\n" +msgstr " %s est à jour\n" + +#: ../sync.c:265 hunk ./src/pacman/po/fr.po 934 -#: ../sync.c:333 +#: ../sync.c:303 hunk ./src/pacman/po/fr.po 940 -#: ../sync.c:403 +#: ../sync.c:350 hunk ./src/pacman/po/fr.po 944 -#: ../sync.c:404 +#: ../sync.c:351 hunk ./src/pacman/po/fr.po 948 -#: ../sync.c:438 +#: ../sync.c:385 hunk ./src/pacman/po/fr.po 952 -#: ../sync.c:439 +#: ../sync.c:386 hunk ./src/pacman/po/fr.po 956 -#: ../sync.c:457 +#: ../sync.c:404 hunk ./src/pacman/po/fr.po 964 -#: ../sync.c:458 +#: ../sync.c:405 hunk ./src/pacman/po/fr.po 968 -#: ../sync.c:459 +#: ../sync.c:406 hunk ./src/pacman/po/fr.po 973 -#: ../sync.c:461 +#: ../sync.c:408 hunk ./src/pacman/po/fr.po 977 -#: ../sync.c:476 ../sync.c:497 +#: ../sync.c:423 ../sync.c:444 hunk ./src/pacman/po/fr.po 982 -#: ../sync.c:515 +#: ../sync.c:462 hunk ./src/pacman/po/fr.po 986 -#: ../sync.c:522 +#: ../sync.c:469 hunk ./src/pacman/po/fr.po 991 -#: ../sync.c:545 +#: ../sync.c:492 hunk ./src/pacman/po/fr.po 998 -#: ../sync.c:564 +#: ../sync.c:511 hunk ./src/pacman/po/fr.po 1002 -#: ../sync.c:564 +#: ../sync.c:511 hunk ./src/pacman/po/fr.po 1006 -#: ../sync.c:641 +#: ../sync.c:588 hunk ./src/pacman/po/fr.po 1014 -#: ../sync.c:657 +#: ../sync.c:604 hunk ./src/pacman/po/fr.po 1022 -#: ../sync.c:660 +#: ../sync.c:607 hunk ./src/pacman/po/fr.po 1031 -#: ../sync.c:661 +#: ../sync.c:608 hunk ./src/pacman/po/fr.po 1040 -#: ../sync.c:667 +#: ../sync.c:614 hunk ./src/pacman/po/fr.po 1048 -#: ../sync.c:671 +#: ../sync.c:618 hunk ./src/pacman/po/fr.po 1052 -#: ../sync.c:679 +#: ../sync.c:626 hunk ./src/pacman/po/fr.po 1060 -#: ../sync.c:683 +#: ../sync.c:630 hunk ./src/pacman/po/fr.po 1064 -#: ../sync.c:730 -#, c-format -msgid "%s-%s-%s%s is already in the cache\n" -msgstr "%s-%s-%s%s est déjà en cache\n" - -#: ../sync.c:738 -#, c-format -msgid "" -"\n" -":: Retrieving packages from %s...\n" -msgstr "" -"\n" -":: Récupération des paquets depuis %s...\n" - -#. no cache directory.... try creating it -#: ../sync.c:742 -#, c-format -msgid "no %s cache exists. creating...\n" -msgstr "aucun cache %s existant. Création...\n" - -#: ../sync.c:743 -#, c-format -msgid "warning: no %s cache exists. creating..." -msgstr "avertissement: aucun cache %s existant, création..." - -#. couldn't mkdir the cache directory, so fall back to /tmp and unlink -#. * the package afterwards. -#. -#: ../sync.c:748 -msgid "couldn't create package cache, using /tmp instead\n" -msgstr "n'a pas pu créer le cache de paquets, utilisation de /tmp à la place\n" - -#: ../sync.c:749 -msgid "warning: couldn't create package cache, using /tmp instead" -msgstr "" -"avertissement: n'a pas pu créer le cache de paquets, utilisation de /tmp à " -"la place" - -#: ../sync.c:759 -#, c-format -msgid "failed to retrieve some files from %s\n" -msgstr "echec de récupération de certains fichiers depuis %s\n" - -#: ../trans.c:54 +#: ../trans.c:57 hunk ./src/pacman/po/fr.po 1068 -#: ../trans.c:57 +#: ../trans.c:60 hunk ./src/pacman/po/fr.po 1072 -#: ../trans.c:60 +#: ../trans.c:63 hunk ./src/pacman/po/fr.po 1076 -#: ../trans.c:63 +#: ../trans.c:66 hunk ./src/pacman/po/fr.po 1080 -#: ../trans.c:78 +#: ../trans.c:81 hunk ./src/pacman/po/fr.po 1085 -#: ../trans.c:85 +#: ../trans.c:88 hunk ./src/pacman/po/fr.po 1090 -#: ../trans.c:91 +#: ../trans.c:95 hunk ./src/pacman/po/fr.po 1095 -#: ../trans.c:95 +#: ../trans.c:104 hunk ./src/pacman/po/fr.po 1100 -#: ../trans.c:102 +#: ../trans.c:111 hunk ./src/pacman/po/fr.po 1105 -#: ../trans.c:109 +#: ../trans.c:118 hunk ./src/pacman/po/fr.po 1110 -#: ../trans.c:116 +#: ../trans.c:125 hunk ./src/pacman/po/fr.po 1114 -#: ../trans.c:130 +#: ../trans.c:139 hunk ./src/pacman/po/fr.po 1119 -#: ../trans.c:132 +#: ../trans.c:141 hunk ./src/pacman/po/fr.po 1123 -#: ../trans.c:151 +#: ../trans.c:148 +#, c-format +msgid "" +"\n" +":: Retrieving packages from %s...\n" +msgstr "" +"\n" +":: Récupération des paquets depuis %s...\n" + +#: ../trans.c:158 +msgid "] 100% LOCAL " +msgstr "" + +#: ../trans.c:176 hunk ./src/pacman/po/fr.po 1143 -#: ../trans.c:165 +#: ../trans.c:190 +#, c-format +msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " +msgstr ":: %s est indiqué comme \"HoldPkg\". Supprimer tout de même? [Y/n] " + +#: ../trans.c:203 hunk ./src/pacman/po/fr.po 1153 -#: ../trans.c:180 +#: ../trans.c:218 hunk ./src/pacman/po/fr.po 1158 -#: ../trans.c:196 +#: ../trans.c:234 hunk ./src/pacman/po/fr.po 1165 -#: ../trans.c:214 +#: ../trans.c:252 hunk ./src/pacman/po/fr.po 1171 -#: ../trans.c:232 +#: ../trans.c:270 hunk ./src/pacman/po/fr.po 1176 -#: ../trans.c:248 +#: ../trans.c:286 hunk ./src/pacman/po/fr.po 1180 -#: ../trans.c:249 +#: ../trans.c:287 hunk ./src/pacman/po/fr.po 1184 +#: ../trans.c:288 +#, fuzzy +msgid "removing" +msgstr "désinstallation de %s... " + hunk ./src/pacman/po/fr.po 1199 +#~ msgid "config: new section '%s'\n" +#~ msgstr "config: nouvelle section '%s'\n" + +#~ msgid "config: line %d: bad section name\n" +#~ msgstr "config: ligne %d: mauvais nom de section\n" + +#~ msgid "" +#~ "config: line %d: '%s' is reserved and cannot be used as a package tree\n" +#~ msgstr "" +#~ "config: ligne %d: '%s' est réservé et ne peut être utilisé comme " +#~ "arborescence de paquet\n" + +#~ msgid "config: line %d: syntax error\n" +#~ msgstr "config: ligne %d: erreur de syntaxe\n" + +#~ msgid "config: line %d: all directives must belong to a section\n" +#~ msgstr "" +#~ "config: ligne %d: toutes les instructions doivent être relatives à la " +#~ "section\n" + +#~ msgid "failed to set option USESYSLOG (%s)\n" +#~ msgstr "échec d'affection de l'option USESYSLOG (%s)\n" + +#~ msgid "config: including %s\n" +#~ msgstr "config: inclusion de %s\n" + +#~ msgid "failed to set option NOUPGRADE (%s)\n" +#~ msgstr "échec d'affectation de l'option NOUPGRADE (%s)\n" + +#~ msgid "failed to set option NOEXTRACT (%s)\n" +#~ msgstr "échec d'affectation de l'option NOEXTRACT (%s)\n" + +#~ msgid "config: log file: %s\n" +#~ msgstr "config: fichier de log: %s\n" + +#~ msgid "failed to set option UPGRADEDELAY (%s)\n" +#~ msgstr "échec d'affectation de l'option UPGRADEDELAY (%s)\n" + +#~ msgid "" +#~ "Warning: UpgradeDelay is very high.\n" +#~ "If a package is updated often it will never be upgraded.\n" +#~ "Manually update such packages or use a lower value to avoid this " +#~ "problem.\n" +#~ msgstr "" +#~ "Avertissement: UpgradeDelay est très élevé.\n" +#~ "Si un paquet est mis à jour souvent, ces mise à jour ne seront jamais " +#~ "appliquée.\n" +#~ "Mettez à jour ces paquets manuellement ou utilisez une valeur plus basse " +#~ "pour résoudre ce problème.\n" + +#~ msgid "config: line %d: bad server location\n" +#~ msgstr "config: ligne %d: mauvais adressage de serveur\n" + +#~ msgid "could not allocate %d bytes\n" +#~ msgstr "n'a pas pu allouer %d bytes\n" + +#~ msgid "config: line %d: protocol %s is not supported\n" +#~ msgstr "config: ligne %d: le protocole %s n'est pas supporté\n" + +#~ msgid "connecting to %s:21\n" +#~ msgstr "connexion à %s:21\n" + +#~ msgid "cannot connect to %s\n" +#~ msgstr "n'a pas pu se connecter à %s\n" + +#~ msgid "anonymous login failed\n" +#~ msgstr "la connexion en utilisateur anonyme à échouée\n" + +#~ msgid "could not cwd to %s: %s\n" +#~ msgstr "n'a pas pu exécuter cwd pour %s: %s\n" + +#~ msgid "failed to set passive mode\n" +#~ msgstr "échec d'application mode passif\n" + +#~ msgid "FTP passive mode not set\n" +#~ msgstr "mode FTP passif non défini\n" + +#~ msgid "connecting to %s\n" +#~ msgstr "connexion à %s\n" + +#~ msgid "connecting to %s:%u\n" +#~ msgstr "connexion à %s:%u\n" + +#~ msgid "could not chdir to %s\n" +#~ msgstr "n'a pas pu exécuter chdir vers %s\n" + +#~ msgid "running command: %s\n" +#~ msgstr "exécution de la commande: %s\n" + +#~ msgid "running XferCommand: fork failed!\n" +#~ msgstr "exécution de XferCommand: échec du fork!\n" + +#~ msgid "XferCommand command returned non-zero status code (%d)\n" +#~ msgstr "" +#~ "la commande XferCommand à retourné un code de statut différent de zéro (%" +#~ "d)\n" + +#~ msgid "failed to get filesize for %s\n" +#~ msgstr "échec de récupération de la taille de fichier pour %s\n" + +#~ msgid "failed to get mtime for %s\n" +#~ msgstr "échec de récupération de la date de modification pour %s\n" + +#~ msgid "mtimes are identical, skipping %s\n" +#~ msgstr "le dates de modifications sont identiques, ignoré %s\n" + +#~ msgid "failed to resume download -- restarting\n" +#~ msgstr "échec de reprise du téléchargement -- redémarrage\n" + +#~ msgid "" +#~ "\n" +#~ "failed downloading %s from %s: %s\n" +#~ msgstr "" +#~ "\n" +#~ "échec du téléchargement de %s depuis %s: %s\n" + +#~ msgid "copying %s to %s/%s\n" +#~ msgstr "copie %s vers %s/%s\n" + +#~ msgid "failed copying %s\n" +#~ msgstr "échec de copie de %s\n" + +#~ msgid " %s is already in the current directory\n" +#~ msgstr " %s est déjà dans le répertoire courant\n" + +#~ msgid "failed to download %s\n" +#~ msgstr "échec lors du téléchargement de %s\n" + +#~ msgid "failed to set option CACHEDIR (%s)\n" +#~ msgstr "échec d'affectation de l'option CACHEDIR (%s)\n" + +#~ msgid "failed to get lastupdate time for %s (no big deal)\n" +#~ msgstr "" +#~ "echec d'obtention de la dernière mise à jour pour %s (ce n'est pas un " +#~ "gros problème)\n" + +#~ msgid "sync: new mtime for %s: %s\n" +#~ msgstr "sync: nouvelle valeur mtime pour %s: %s\n" + +#~ msgid "%s-%s-%s%s is already in the cache\n" +#~ msgstr "%s-%s-%s%s est déjà en cache\n" + +#~ msgid "no %s cache exists. creating...\n" +#~ msgstr "aucun cache %s existant. Création...\n" + +#~ msgid "warning: no %s cache exists. creating..." +#~ msgstr "avertissement: aucun cache %s existant, création..." + +#~ msgid "couldn't create package cache, using /tmp instead\n" +#~ msgstr "" +#~ "n'a pas pu créer le cache de paquets, utilisation de /tmp à la place\n" + +#~ msgid "warning: couldn't create package cache, using /tmp instead" +#~ msgstr "" +#~ "avertissement: n'a pas pu créer le cache de paquets, utilisation de /tmp " +#~ "à la place" + +#~ msgid "failed to retrieve some files from %s\n" +#~ msgstr "echec de récupération de certains fichiers depuis %s\n" + hunk ./src/pacman/po/hu.po 11 -"POT-Creation-Date: 2006-08-26 14:56+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./src/pacman/po/hu.po 20 -#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:431 ../sync.c:470 +#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:378 ../sync.c:417 hunk ./src/pacman/po/hu.po 34 -#: ../add.c:79 ../remove.c:99 +#: ../add.c:79 ../remove.c:92 hunk ./src/pacman/po/hu.po 43 -#: ../add.c:92 ../remove.c:109 ../sync.c:558 +#: ../add.c:92 ../remove.c:102 ../sync.c:505 hunk ./src/pacman/po/hu.po 53 -#: ../add.c:111 ../sync.c:579 +#: ../add.c:111 ../sync.c:526 hunk ./src/pacman/po/hu.po 58 -#: ../add.c:121 ../sync.c:781 +#: ../add.c:121 ../sync.c:649 hunk ./src/pacman/po/hu.po 63 -#: ../add.c:128 ../sync.c:788 +#: ../add.c:128 ../sync.c:656 hunk ./src/pacman/po/hu.po 68 -#: ../add.c:136 ../sync.c:796 ../sync.c:803 +#: ../add.c:136 ../sync.c:664 ../sync.c:671 hunk ./src/pacman/po/hu.po 76 -#: ../add.c:143 ../sync.c:589 +#: ../add.c:143 ../sync.c:536 hunk ./src/pacman/po/hu.po 81 -#: ../add.c:157 ../remove.c:149 ../sync.c:774 +#: ../add.c:157 ../remove.c:142 ../sync.c:642 hunk ./src/pacman/po/hu.po 86 -#: ../add.c:164 ../remove.c:159 ../sync.c:463 ../sync.c:823 +#: ../add.c:164 ../remove.c:152 ../sync.c:410 ../sync.c:684 hunk ./src/pacman/po/hu.po 91 -#: ../conf.c:102 -#, c-format -msgid "config: new section '%s'\n" -msgstr "beállítások: új szekció '%s'\n" - -#: ../conf.c:104 -#, c-format -msgid "config: line %d: bad section name\n" -msgstr "beállítások: %d. sor: rossz szekciónév\n" - -#: ../conf.c:108 -#, c-format -msgid "" -"config: line %d: '%s' is reserved and cannot be used as a package tree\n" -msgstr "" -"beállítások: %d. sor: a '%s' név fenntartott és nem használható csomagfa " -"névként\n" - -#: ../conf.c:134 ../conf.c:156 ../conf.c:300 ../conf.c:366 -#, c-format -msgid "config: line %d: syntax error\n" -msgstr "beállítások: %d. sor: szintaktikai hiba\n" - -#: ../conf.c:140 -#, c-format -msgid "config: line %d: all directives must belong to a section\n" -msgstr "" -"beállítások: %d. sor: minden direktívának egy szekcióhoz kell tartoznia\n" - -#: ../conf.c:146 -msgid "config: nopassiveftp\n" -msgstr "beállítások: nem lesz passzív ftp\n" - -#: ../conf.c:149 -#, c-format -msgid "failed to set option USESYSLOG (%s)\n" -msgstr "nem sikerült beállítani a USESYSLOG opciót (%s)\n" - -#: ../conf.c:152 -msgid "config: usesyslog\n" -msgstr "beállítások: syslog használata\n" - -#: ../conf.c:164 -#, c-format -msgid "config: including %s\n" -msgstr "beállítások: a %s beolvasása\n" - -#: ../conf.c:173 ../conf.c:181 -#, c-format -msgid "failed to set option NOUPGRADE (%s)\n" -msgstr "nem sikerült beállítani a NOUPGRADE opciót (%s)\n" - -#: ../conf.c:176 ../conf.c:184 -#, c-format -msgid "config: noupgrade: %s\n" -msgstr "beállítások: nem fog frissülni: %s\n" - -#: ../conf.c:191 ../conf.c:199 -#, c-format -msgid "failed to set option NOEXTRACT (%s)\n" -msgstr "nem sikerült beállítani a NOEXTRACT opciót (%s)\n" - -#: ../conf.c:194 ../conf.c:202 -#, c-format -msgid "config: noextract: %s\n" -msgstr "beállítások: nem lesz kifejtve: %s\n" - -#: ../conf.c:209 ../conf.c:217 ../pacman.c:552 -#, c-format -msgid "failed to set option IGNOREPKG (%s)\n" -msgstr "nem sikerült beállítani az IGNOREPKG opciót (%s)\n" - -#: ../conf.c:212 ../conf.c:220 -#, c-format -msgid "config: ignorepkg: %s\n" -msgstr "beállítások: a %s csomag figyelmen kívül hagyása\n" - -#: ../conf.c:227 ../conf.c:232 -#, c-format -msgid "config: holdpkg: %s\n" -msgstr "beállítások: ez a csomag mindenképp meg lesz tartva: %s\n" - -#: ../conf.c:240 -#, c-format -msgid "config: dbpath: %s\n" -msgstr "beállítások: adatbázis útvonala: %s\n" - -#: ../conf.c:248 -#, c-format -msgid "config: cachedir: %s\n" -msgstr "beállítások: gyorsítótár könyvtára: %s\n" - -#: ../conf.c:251 -#, c-format -msgid "failed to set option LOGFILE (%s)\n" -msgstr "nem sikerült beállítani a LOGFILE opciót (%s)\n" - -#: ../conf.c:254 -#, c-format -msgid "config: log file: %s\n" -msgstr "beállítások: naplófájl: %s\n" - -#: ../conf.c:262 -#, c-format -msgid "config: xfercommand: %s\n" -msgstr "beállítások: átviteli parancs: %s\n" - -#. The config value is in days, we use seconds -#: ../conf.c:265 -#, c-format -msgid "config: UpgradeDelay: %i\n" -msgstr "beállítások: frissítés késleltetése: %i\n" - -#: ../conf.c:267 -#, c-format -msgid "failed to set option UPGRADEDELAY (%s)\n" -msgstr "nem sikerült beállítani az UPGRADEDELAY opciót (%s)\n" - -#: ../conf.c:272 -msgid "" -"Warning: UpgradeDelay is very high.\n" -"If a package is updated often it will never be upgraded.\n" -"Manually update such packages or use a lower value to avoid this problem.\n" -msgstr "" -"Figyelmeztetés: az UpgradeDelay opció túl nagy értéken van.\n" -"Ha egy csomag gyakran frissül, soha nem lesz frissítve.\n" -"Frissítse kézzel ezeket a csomagokat vagy használjon egy kisebb értéket, " -"hogy elkerülje ezt a problémát.\n" - -#: ../conf.c:285 ../conf.c:315 ../conf.c:321 -#, c-format -msgid "config: line %d: bad server location\n" -msgstr "beállítások: %d. sor: rossz szerver hely\n" - -#: ../conf.c:295 -#, c-format -msgid "config: proxyserver: %s\n" -msgstr "beállítások: proxyszerver: %s\n" - -#: ../conf.c:298 -#, c-format -msgid "config: proxyport: %u\n" -msgstr "beállítások: proxyport: %u\n" - -#: ../conf.c:338 ../conf.c:353 -#, c-format -msgid "could not allocate %d bytes\n" -msgstr "nem sikerült allokálni %d bájtot\n" - -#: ../conf.c:359 -#, c-format -msgid "config: line %d: protocol %s is not supported\n" -msgstr "beállítások: %d. sor: a %s protokoll nem támogatott\n" - -#. add to the list -#: ../conf.c:363 -#, c-format -msgid "config: %s: server: %s %s %s\n" -msgstr "beállítások: %s: szerver: %s %s %s\n" - hunk ./src/pacman/po/hu.po 120 -#: ../download.c:211 -#, c-format -msgid "connecting to %s:21\n" -msgstr "kapcsolódás a %s:21-hez\n" - -#: ../download.c:213 ../download.c:244 ../download.c:419 -#, c-format -msgid "cannot connect to %s\n" -msgstr "nem sikerült kapcsolódni ide: %s\n" - -#: ../download.c:217 -msgid "anonymous login failed\n" -msgstr "a névtelen bejelentkezés sikertelen\n" - -#: ../download.c:222 -#, c-format -msgid "could not cwd to %s: %s\n" -msgstr "nem sikerült könyvtárt váltani a %s címe: %s\n" - -#: ../download.c:228 -msgid "failed to set passive mode\n" -msgstr "nem sikerült beállítani a passzív módot\n" - -#: ../download.c:231 -msgid "FTP passive mode not set\n" -msgstr "az FTP passív mód nem lett beállítva\n" - -#: ../download.c:239 ../download.c:414 -#, c-format -msgid "connecting to %s\n" -msgstr "kapcsolódás ide: %s\n" - -#: ../download.c:241 ../download.c:416 -#, c-format -msgid "connecting to %s:%u\n" -msgstr "kapcsolódás ide: %s:%u\n" - -#: ../download.c:303 -#, c-format -msgid "could not chdir to %s\n" -msgstr "nem sikerült könyvtárat váltani ide: %s\n" - -#. execute the parsed command via /bin/sh -c -#: ../download.c:307 -#, c-format -msgid "running command: %s\n" -msgstr "parancs futtatása: %s\n" - -#: ../download.c:310 -msgid "running XferCommand: fork failed!\n" -msgstr "XferCommand futtatása: a fork nem sikerült!\n" - -#. download failed -#: ../download.c:314 -#, c-format -msgid "XferCommand command returned non-zero status code (%d)\n" -msgstr "az XferCommand parancs nem-0 státuszkóddal tért vissza (%d)\n" - -#: ../download.c:360 -#, c-format -msgid "failed to get filesize for %s\n" -msgstr "nem sikerült megkapni a %s fájlméretét\n" - -#: ../download.c:366 ../download.c:479 -#, c-format -msgid "failed to get mtime for %s\n" -msgstr "nem sikerült megkapni a %s módosítási dátumát\n" - -#. mtimes are identical, skip this file -#: ../download.c:371 ../download.c:464 -#, c-format -msgid "mtimes are identical, skipping %s\n" -msgstr "a módosítási dátumok egyeznek, a %s kihagyása\n" - -#: ../download.c:386 -msgid "failed to resume download -- restarting\n" -msgstr "nem sikerült folytatni a letöltést -- újrakezdés\n" - -#: ../download.c:393 ../download.c:468 -#, c-format -msgid "" -"\n" -"failed downloading %s from %s: %s\n" -msgstr "" -"\n" -"nem sikerült letölteni a %s-et a %s-ról: %s\n" - -#: ../download.c:487 -#, c-format -msgid "copying %s to %s/%s\n" -msgstr "a %s másolása ide: %s/%s\n" - -#: ../download.c:490 -#, c-format -msgid "failed copying %s\n" -msgstr "nem sikerült másolni a következőt: %s\n" - -#: ../download.c:506 -msgid "] 100% LOCAL " -msgstr "] 100% HELYI " - -#: ../download.c:568 -#, c-format -msgid " %s is already in the current directory\n" -msgstr " %s már a jelenlegi könyvtárban van\n" - -#: ../download.c:582 -#, c-format -msgid "failed to download %s\n" -msgstr "nem sikerült letölteni: %s\n" - hunk ./src/pacman/po/hu.po 377 -#: ../pacman.c:94 +#: ../pacman.c:96 hunk ./src/pacman/po/hu.po 382 -#: ../pacman.c:95 +#: ../pacman.c:97 hunk ./src/pacman/po/hu.po 387 -#: ../pacman.c:96 +#: ../pacman.c:98 hunk ./src/pacman/po/hu.po 392 -#: ../pacman.c:97 +#: ../pacman.c:99 hunk ./src/pacman/po/hu.po 397 -#: ../pacman.c:98 +#: ../pacman.c:100 hunk ./src/pacman/po/hu.po 402 -#: ../pacman.c:99 +#: ../pacman.c:101 hunk ./src/pacman/po/hu.po 407 -#: ../pacman.c:100 +#: ../pacman.c:102 hunk ./src/pacman/po/hu.po 412 -#: ../pacman.c:101 +#: ../pacman.c:103 hunk ./src/pacman/po/hu.po 417 -#: ../pacman.c:102 +#: ../pacman.c:104 hunk ./src/pacman/po/hu.po 426 -#: ../pacman.c:105 +#: ../pacman.c:107 hunk ./src/pacman/po/hu.po 431 -#: ../pacman.c:106 ../pacman.c:111 ../pacman.c:123 ../pacman.c:128 -#: ../pacman.c:142 +#: ../pacman.c:108 ../pacman.c:113 ../pacman.c:125 ../pacman.c:130 +#: ../pacman.c:144 hunk ./src/pacman/po/hu.po 437 -#: ../pacman.c:107 ../pacman.c:113 ../pacman.c:124 ../pacman.c:144 +#: ../pacman.c:109 ../pacman.c:115 ../pacman.c:126 ../pacman.c:146 hunk ./src/pacman/po/hu.po 442 -#: ../pacman.c:108 ../pacman.c:125 ../pacman.c:146 +#: ../pacman.c:110 ../pacman.c:127 ../pacman.c:148 hunk ./src/pacman/po/hu.po 448 -#: ../pacman.c:110 +#: ../pacman.c:112 hunk ./src/pacman/po/hu.po 453 -#: ../pacman.c:112 +#: ../pacman.c:114 hunk ./src/pacman/po/hu.po 460 -#: ../pacman.c:114 +#: ../pacman.c:116 hunk ./src/pacman/po/hu.po 467 -#: ../pacman.c:115 +#: ../pacman.c:117 hunk ./src/pacman/po/hu.po 472 -#: ../pacman.c:116 +#: ../pacman.c:118 hunk ./src/pacman/po/hu.po 480 -#: ../pacman.c:119 +#: ../pacman.c:121 hunk ./src/pacman/po/hu.po 485 -#: ../pacman.c:121 +#: ../pacman.c:123 hunk ./src/pacman/po/hu.po 490 -#: ../pacman.c:127 +#: ../pacman.c:129 hunk ./src/pacman/po/hu.po 495 -#: ../pacman.c:129 +#: ../pacman.c:131 hunk ./src/pacman/po/hu.po 500 -#: ../pacman.c:130 +#: ../pacman.c:132 hunk ./src/pacman/po/hu.po 508 -#: ../pacman.c:131 +#: ../pacman.c:133 hunk ./src/pacman/po/hu.po 513 -#: ../pacman.c:132 ../pacman.c:147 +#: ../pacman.c:134 ../pacman.c:149 hunk ./src/pacman/po/hu.po 518 -#: ../pacman.c:133 +#: ../pacman.c:135 hunk ./src/pacman/po/hu.po 523 -#: ../pacman.c:134 +#: ../pacman.c:136 hunk ./src/pacman/po/hu.po 528 -#: ../pacman.c:135 +#: ../pacman.c:137 hunk ./src/pacman/po/hu.po 537 -#: ../pacman.c:136 +#: ../pacman.c:138 hunk ./src/pacman/po/hu.po 542 -#: ../pacman.c:137 +#: ../pacman.c:139 hunk ./src/pacman/po/hu.po 550 -#: ../pacman.c:138 +#: ../pacman.c:140 hunk ./src/pacman/po/hu.po 555 -#: ../pacman.c:139 +#: ../pacman.c:141 hunk ./src/pacman/po/hu.po 562 -#: ../pacman.c:141 +#: ../pacman.c:143 hunk ./src/pacman/po/hu.po 567 -#: ../pacman.c:143 +#: ../pacman.c:145 hunk ./src/pacman/po/hu.po 576 -#: ../pacman.c:145 +#: ../pacman.c:147 hunk ./src/pacman/po/hu.po 581 -#: ../pacman.c:148 +#: ../pacman.c:150 hunk ./src/pacman/po/hu.po 589 -#: ../pacman.c:149 +#: ../pacman.c:151 hunk ./src/pacman/po/hu.po 594 -#: ../pacman.c:150 +#: ../pacman.c:152 hunk ./src/pacman/po/hu.po 599 -#: ../pacman.c:151 +#: ../pacman.c:153 hunk ./src/pacman/po/hu.po 605 -#: ../pacman.c:152 +#: ../pacman.c:154 hunk ./src/pacman/po/hu.po 611 -#: ../pacman.c:153 +#: ../pacman.c:155 hunk ./src/pacman/po/hu.po 619 -#: ../pacman.c:155 +#: ../pacman.c:157 hunk ./src/pacman/po/hu.po 624 -#: ../pacman.c:156 +#: ../pacman.c:158 hunk ./src/pacman/po/hu.po 629 -#: ../pacman.c:157 +#: ../pacman.c:159 hunk ./src/pacman/po/hu.po 635 -#: ../pacman.c:158 +#: ../pacman.c:160 hunk ./src/pacman/po/hu.po 642 -#: ../pacman.c:159 +#: ../pacman.c:161 hunk ./src/pacman/po/hu.po 649 -#: ../pacman.c:160 +#: ../pacman.c:162 hunk ./src/pacman/po/hu.po 654 -#: ../pacman.c:161 +#: ../pacman.c:163 hunk ./src/pacman/po/hu.po 660 -#: ../pacman.c:162 +#: ../pacman.c:164 hunk ./src/pacman/po/hu.po 665 -#: ../pacman.c:175 +#: ../pacman.c:177 hunk ./src/pacman/po/hu.po 671 -#: ../pacman.c:176 +#: ../pacman.c:178 hunk ./src/pacman/po/hu.po 676 -#: ../pacman.c:369 +#: ../pacman.c:363 hunk ./src/pacman/po/hu.po 680 -#: ../pacman.c:396 +#: ../pacman.c:390 hunk ./src/pacman/po/hu.po 684 -#: ../pacman.c:492 +#: ../pacman.c:486 hunk ./src/pacman/po/hu.po 688 -#: ../pacman.c:516 +#: ../pacman.c:510 hunk ./src/pacman/po/hu.po 693 -#: ../pacman.c:529 +#: ../pacman.c:518 +#, fuzzy, c-format +msgid "failed to parse config (%s)\n" +msgstr "nem sikerült előkészíteni a tranzakciót (%s)\n" + +#: ../pacman.c:524 hunk ./src/pacman/po/hu.po 703 -#: ../pacman.c:533 +#: ../pacman.c:528 hunk ./src/pacman/po/hu.po 708 -#: ../pacman.c:541 -#, c-format -msgid "failed to set option DBPATH (%s)\n" +#: ../pacman.c:532 +#, fuzzy, c-format +msgid "failed to set option DLCB (%s)\n" +msgstr "nem sikerült beállítani a LOGCB opciót (%s)\n" + +#: ../pacman.c:536 +#, fuzzy, c-format +msgid "failed to set option DLFNM (%s)\n" +msgstr "nem sikerült beállítani a LOGFILE opciót (%s)\n" + +#: ../pacman.c:540 +#, fuzzy, c-format +msgid "failed to set option DLOFFSET (%s)\n" +msgstr "nem sikerült beállítani a LOGFILE opciót (%s)\n" + +#: ../pacman.c:544 +#, fuzzy, c-format +msgid "failed to set option DLT0 (%s)\n" hunk ./src/pacman/po/hu.po 728 -#: ../pacman.c:546 ../sync.c:752 -#, c-format -msgid "failed to set option CACHEDIR (%s)\n" -msgstr "nem sikerült beállítani a CACHEDIR opciót (%s)\n" +#: ../pacman.c:548 +#, fuzzy, c-format +msgid "failed to set option DLT (%s)\n" +msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" + +#: ../pacman.c:552 +#, fuzzy, c-format +msgid "failed to set option DLRATE (%s)\n" +msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" + +#: ../pacman.c:556 +#, fuzzy, c-format +msgid "failed to set option DLXFERED1 (%s)\n" +msgstr "nem sikerült beállítani a LOGFILE opciót (%s)\n" hunk ./src/pacman/po/hu.po 744 +#, fuzzy, c-format +msgid "failed to set option DLETA_H (%s)\n" +msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" + +#: ../pacman.c:564 +#, fuzzy, c-format +msgid "failed to set option DLETA_M (%s)\n" +msgstr "nem sikerült beállítani a DBPATH opciót (%s)\n" + +#: ../pacman.c:568 +#, fuzzy, c-format +msgid "failed to set option DLETA_S (%s)\n" +msgstr "nem sikerült beállítani a LOGMASK opciót (%s)\n" + +#: ../pacman.c:578 +#, c-format +msgid "failed to set option IGNOREPKG (%s)\n" +msgstr "nem sikerült beállítani az IGNOREPKG opciót (%s)\n" + +#: ../pacman.c:586 hunk ./src/pacman/po/hu.po 767 -#: ../pacman.c:566 +#: ../pacman.c:592 hunk ./src/pacman/po/hu.po 772 -#: ../pacman.c:573 +#: ../pacman.c:599 hunk ./src/pacman/po/hu.po 776 -#: ../pacman.c:586 +#: ../pacman.c:612 hunk ./src/pacman/po/hu.po 799 -#: ../query.c:111 ../sync.c:374 +#: ../query.c:111 ../sync.c:340 hunk ./src/pacman/po/hu.po 803 -#: ../query.c:160 +#: ../query.c:150 hunk ./src/pacman/po/hu.po 808 -#: ../query.c:170 +#: ../query.c:160 hunk ./src/pacman/po/hu.po 812 -#: ../query.c:174 +#: ../query.c:164 hunk ./src/pacman/po/hu.po 818 -#: ../query.c:212 ../query.c:254 +#: ../query.c:202 ../query.c:244 hunk ./src/pacman/po/hu.po 823 -#: ../remove.c:64 ../sync.c:509 +#: ../remove.c:64 ../sync.c:456 hunk ./src/pacman/po/hu.po 837 -#: ../remove.c:81 ../sync.c:429 ../sync.c:468 +#: ../remove.c:81 ../sync.c:376 ../sync.c:415 hunk ./src/pacman/po/hu.po 842 -#: ../remove.c:94 -#, c-format -msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr ":: a %s HoldPkgnak lett jelölve. Biztosan eltávolítja? [I/n] " - -#: ../remove.c:114 +#: ../remove.c:107 hunk ./src/pacman/po/hu.po 847 -#: ../remove.c:136 +#: ../remove.c:129 hunk ./src/pacman/po/hu.po 856 -#: ../remove.c:139 +#: ../remove.c:132 hunk ./src/pacman/po/hu.po 893 -#: ../sync.c:153 ../trans.c:69 ../trans.c:83 ../trans.c:94 ../trans.c:107 -#: ../trans.c:119 +#: ../sync.c:153 ../trans.c:72 ../trans.c:86 ../trans.c:100 ../trans.c:116 +#: ../trans.c:128 hunk ./src/pacman/po/hu.po 898 -#: ../sync.c:177 -#, c-format -msgid "failed to get lastupdate time for %s (no big deal)\n" -msgstr "" -"nem sikerült megkapni az utolsó módosítási időpontját a következőnek: %s " -"(nincs sok esély)\n" - -#: ../sync.c:190 +#: ../sync.c:168 hunk ./src/pacman/po/hu.po 903 -#: ../sync.c:193 -#, c-format -msgid " %s is up to date\n" -msgstr " a %s naprakész\n" - -#: ../sync.c:196 -#, c-format -msgid "sync: new mtime for %s: %s\n" -msgstr "szinkronizálás: új módosítási dátum a %s számára: %s\n" - -#: ../sync.c:201 +#: ../sync.c:170 hunk ./src/pacman/po/hu.po 908 -#: ../sync.c:295 +#: ../sync.c:174 +#, c-format +msgid " %s is up to date\n" +msgstr " a %s naprakész\n" + +#: ../sync.c:265 hunk ./src/pacman/po/hu.po 918 -#: ../sync.c:333 +#: ../sync.c:303 hunk ./src/pacman/po/hu.po 924 -#: ../sync.c:403 +#: ../sync.c:350 hunk ./src/pacman/po/hu.po 928 -#: ../sync.c:404 +#: ../sync.c:351 hunk ./src/pacman/po/hu.po 932 -#: ../sync.c:438 +#: ../sync.c:385 hunk ./src/pacman/po/hu.po 936 -#: ../sync.c:439 +#: ../sync.c:386 hunk ./src/pacman/po/hu.po 940 -#: ../sync.c:457 +#: ../sync.c:404 hunk ./src/pacman/po/hu.po 948 -#: ../sync.c:458 +#: ../sync.c:405 hunk ./src/pacman/po/hu.po 952 -#: ../sync.c:459 +#: ../sync.c:406 hunk ./src/pacman/po/hu.po 956 -#: ../sync.c:461 +#: ../sync.c:408 hunk ./src/pacman/po/hu.po 960 -#: ../sync.c:476 ../sync.c:497 +#: ../sync.c:423 ../sync.c:444 hunk ./src/pacman/po/hu.po 965 -#: ../sync.c:515 +#: ../sync.c:462 hunk ./src/pacman/po/hu.po 969 -#: ../sync.c:522 +#: ../sync.c:469 hunk ./src/pacman/po/hu.po 974 -#: ../sync.c:545 +#: ../sync.c:492 hunk ./src/pacman/po/hu.po 980 -#: ../sync.c:564 +#: ../sync.c:511 hunk ./src/pacman/po/hu.po 984 -#: ../sync.c:564 +#: ../sync.c:511 hunk ./src/pacman/po/hu.po 988 -#: ../sync.c:641 +#: ../sync.c:588 hunk ./src/pacman/po/hu.po 996 -#: ../sync.c:657 +#: ../sync.c:604 hunk ./src/pacman/po/hu.po 1004 -#: ../sync.c:660 +#: ../sync.c:607 hunk ./src/pacman/po/hu.po 1013 -#: ../sync.c:661 +#: ../sync.c:608 hunk ./src/pacman/po/hu.po 1022 -#: ../sync.c:667 +#: ../sync.c:614 hunk ./src/pacman/po/hu.po 1030 -#: ../sync.c:671 +#: ../sync.c:618 hunk ./src/pacman/po/hu.po 1034 -#: ../sync.c:679 +#: ../sync.c:626 hunk ./src/pacman/po/hu.po 1042 -#: ../sync.c:683 +#: ../sync.c:630 hunk ./src/pacman/po/hu.po 1046 -#: ../sync.c:730 -#, c-format -msgid "%s-%s-%s%s is already in the cache\n" -msgstr "%s-%s-%s%s már a gyorsítótárban\n" - -#: ../sync.c:738 -#, c-format -msgid "" -"\n" -":: Retrieving packages from %s...\n" -msgstr "" -"\n" -":: Csomagok letöltése a %s-ből...\n" - -#. no cache directory.... try creating it -#: ../sync.c:742 -#, c-format -msgid "no %s cache exists. creating...\n" -msgstr "nem létezik a %s gyorsítótár. létrehozás...\n" - -#: ../sync.c:743 -#, c-format -msgid "warning: no %s cache exists. creating..." -msgstr "figyelmeztetés: nem létezik a %s gyorsítótár. létrehozás..." - -#. couldn't mkdir the cache directory, so fall back to /tmp and unlink -#. * the package afterwards. -#. -#: ../sync.c:748 -msgid "couldn't create package cache, using /tmp instead\n" -msgstr "nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp használata\n" - -#: ../sync.c:749 -msgid "warning: couldn't create package cache, using /tmp instead" -msgstr "" -"figyelmeztetés: nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp " -"használata" - -#: ../sync.c:759 -#, c-format -msgid "failed to retrieve some files from %s\n" -msgstr "nem sikerült letölteni néhány fájlt a %s repóból\n" - -#: ../trans.c:54 +#: ../trans.c:57 hunk ./src/pacman/po/hu.po 1050 -#: ../trans.c:57 +#: ../trans.c:60 hunk ./src/pacman/po/hu.po 1054 -#: ../trans.c:60 +#: ../trans.c:63 hunk ./src/pacman/po/hu.po 1058 -#: ../trans.c:63 +#: ../trans.c:66 hunk ./src/pacman/po/hu.po 1062 -#: ../trans.c:78 +#: ../trans.c:81 hunk ./src/pacman/po/hu.po 1067 -#: ../trans.c:85 +#: ../trans.c:88 hunk ./src/pacman/po/hu.po 1072 -#: ../trans.c:91 +#: ../trans.c:95 hunk ./src/pacman/po/hu.po 1077 -#: ../trans.c:95 +#: ../trans.c:104 hunk ./src/pacman/po/hu.po 1082 -#: ../trans.c:102 +#: ../trans.c:111 hunk ./src/pacman/po/hu.po 1087 -#: ../trans.c:109 +#: ../trans.c:118 hunk ./src/pacman/po/hu.po 1092 -#: ../trans.c:116 +#: ../trans.c:125 hunk ./src/pacman/po/hu.po 1096 -#: ../trans.c:130 +#: ../trans.c:139 hunk ./src/pacman/po/hu.po 1100 -#: ../trans.c:132 +#: ../trans.c:141 hunk ./src/pacman/po/hu.po 1104 -#: ../trans.c:151 +#: ../trans.c:148 +#, c-format +msgid "" +"\n" +":: Retrieving packages from %s...\n" +msgstr "" +"\n" +":: Csomagok letöltése a %s-ből...\n" + +#: ../trans.c:158 +msgid "] 100% LOCAL " +msgstr "] 100% HELYI " + +#: ../trans.c:176 hunk ./src/pacman/po/hu.po 1123 -#: ../trans.c:165 +#: ../trans.c:190 +#, c-format +msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " +msgstr ":: a %s HoldPkgnak lett jelölve. Biztosan eltávolítja? [I/n] " + +#: ../trans.c:203 hunk ./src/pacman/po/hu.po 1133 -#: ../trans.c:180 +#: ../trans.c:218 hunk ./src/pacman/po/hu.po 1138 -#: ../trans.c:196 +#: ../trans.c:234 hunk ./src/pacman/po/hu.po 1143 -#: ../trans.c:214 +#: ../trans.c:252 hunk ./src/pacman/po/hu.po 1148 -#: ../trans.c:232 +#: ../trans.c:270 hunk ./src/pacman/po/hu.po 1153 -#: ../trans.c:248 +#: ../trans.c:286 hunk ./src/pacman/po/hu.po 1157 -#: ../trans.c:249 +#: ../trans.c:287 hunk ./src/pacman/po/hu.po 1161 +#: ../trans.c:288 +#, fuzzy +msgid "removing" +msgstr "%s eltávolítása... " + hunk ./src/pacman/po/hu.po 1176 +#~ msgid "config: new section '%s'\n" +#~ msgstr "beállítások: új szekció '%s'\n" + +#~ msgid "config: line %d: bad section name\n" +#~ msgstr "beállítások: %d. sor: rossz szekciónév\n" + +#~ msgid "" +#~ "config: line %d: '%s' is reserved and cannot be used as a package tree\n" +#~ msgstr "" +#~ "beállítások: %d. sor: a '%s' név fenntartott és nem használható csomagfa " +#~ "névként\n" + +#~ msgid "config: line %d: syntax error\n" +#~ msgstr "beállítások: %d. sor: szintaktikai hiba\n" + +#~ msgid "config: line %d: all directives must belong to a section\n" +#~ msgstr "" +#~ "beállítások: %d. sor: minden direktívának egy szekcióhoz kell tartoznia\n" + +#~ msgid "config: nopassiveftp\n" +#~ msgstr "beállítások: nem lesz passzív ftp\n" + +#~ msgid "failed to set option USESYSLOG (%s)\n" +#~ msgstr "nem sikerült beállítani a USESYSLOG opciót (%s)\n" + +#~ msgid "config: usesyslog\n" +#~ msgstr "beállítások: syslog használata\n" + +#~ msgid "config: including %s\n" +#~ msgstr "beállítások: a %s beolvasása\n" + +#~ msgid "failed to set option NOUPGRADE (%s)\n" +#~ msgstr "nem sikerült beállítani a NOUPGRADE opciót (%s)\n" + +#~ msgid "config: noupgrade: %s\n" +#~ msgstr "beállítások: nem fog frissülni: %s\n" + +#~ msgid "failed to set option NOEXTRACT (%s)\n" +#~ msgstr "nem sikerült beállítani a NOEXTRACT opciót (%s)\n" + +#~ msgid "config: noextract: %s\n" +#~ msgstr "beállítások: nem lesz kifejtve: %s\n" + +#~ msgid "config: ignorepkg: %s\n" +#~ msgstr "beállítások: a %s csomag figyelmen kívül hagyása\n" + +#~ msgid "config: holdpkg: %s\n" +#~ msgstr "beállítások: ez a csomag mindenképp meg lesz tartva: %s\n" + +#~ msgid "config: dbpath: %s\n" +#~ msgstr "beállítások: adatbázis útvonala: %s\n" + +#~ msgid "config: cachedir: %s\n" +#~ msgstr "beállítások: gyorsítótár könyvtára: %s\n" + +#~ msgid "config: log file: %s\n" +#~ msgstr "beállítások: naplófájl: %s\n" + +#~ msgid "config: xfercommand: %s\n" +#~ msgstr "beállítások: átviteli parancs: %s\n" + +#~ msgid "config: UpgradeDelay: %i\n" +#~ msgstr "beállítások: frissítés késleltetése: %i\n" + +#~ msgid "failed to set option UPGRADEDELAY (%s)\n" +#~ msgstr "nem sikerült beállítani az UPGRADEDELAY opciót (%s)\n" + +#~ msgid "" +#~ "Warning: UpgradeDelay is very high.\n" +#~ "If a package is updated often it will never be upgraded.\n" +#~ "Manually update such packages or use a lower value to avoid this " +#~ "problem.\n" +#~ msgstr "" +#~ "Figyelmeztetés: az UpgradeDelay opció túl nagy értéken van.\n" +#~ "Ha egy csomag gyakran frissül, soha nem lesz frissítve.\n" +#~ "Frissítse kézzel ezeket a csomagokat vagy használjon egy kisebb értéket, " +#~ "hogy elkerülje ezt a problémát.\n" + +#~ msgid "config: line %d: bad server location\n" +#~ msgstr "beállítások: %d. sor: rossz szerver hely\n" + +#~ msgid "config: proxyserver: %s\n" +#~ msgstr "beállítások: proxyszerver: %s\n" + +#~ msgid "config: proxyport: %u\n" +#~ msgstr "beállítások: proxyport: %u\n" + +#~ msgid "could not allocate %d bytes\n" +#~ msgstr "nem sikerült allokálni %d bájtot\n" + +#~ msgid "config: line %d: protocol %s is not supported\n" +#~ msgstr "beállítások: %d. sor: a %s protokoll nem támogatott\n" + +#~ msgid "config: %s: server: %s %s %s\n" +#~ msgstr "beállítások: %s: szerver: %s %s %s\n" + +#~ msgid "connecting to %s:21\n" +#~ msgstr "kapcsolódás a %s:21-hez\n" + +#~ msgid "cannot connect to %s\n" +#~ msgstr "nem sikerült kapcsolódni ide: %s\n" + +#~ msgid "anonymous login failed\n" +#~ msgstr "a névtelen bejelentkezés sikertelen\n" + +#~ msgid "could not cwd to %s: %s\n" +#~ msgstr "nem sikerült könyvtárt váltani a %s címe: %s\n" + +#~ msgid "failed to set passive mode\n" +#~ msgstr "nem sikerült beállítani a passzív módot\n" + +#~ msgid "FTP passive mode not set\n" +#~ msgstr "az FTP passív mód nem lett beállítva\n" + +#~ msgid "connecting to %s\n" +#~ msgstr "kapcsolódás ide: %s\n" + +#~ msgid "connecting to %s:%u\n" +#~ msgstr "kapcsolódás ide: %s:%u\n" + +#~ msgid "could not chdir to %s\n" +#~ msgstr "nem sikerült könyvtárat váltani ide: %s\n" + +#~ msgid "running command: %s\n" +#~ msgstr "parancs futtatása: %s\n" + +#~ msgid "running XferCommand: fork failed!\n" +#~ msgstr "XferCommand futtatása: a fork nem sikerült!\n" + +#~ msgid "XferCommand command returned non-zero status code (%d)\n" +#~ msgstr "az XferCommand parancs nem-0 státuszkóddal tért vissza (%d)\n" + +#~ msgid "failed to get filesize for %s\n" +#~ msgstr "nem sikerült megkapni a %s fájlméretét\n" + +#~ msgid "failed to get mtime for %s\n" +#~ msgstr "nem sikerült megkapni a %s módosítási dátumát\n" + +#~ msgid "mtimes are identical, skipping %s\n" +#~ msgstr "a módosítási dátumok egyeznek, a %s kihagyása\n" + +#~ msgid "failed to resume download -- restarting\n" +#~ msgstr "nem sikerült folytatni a letöltést -- újrakezdés\n" + +#~ msgid "" +#~ "\n" +#~ "failed downloading %s from %s: %s\n" +#~ msgstr "" +#~ "\n" +#~ "nem sikerült letölteni a %s-et a %s-ról: %s\n" + +#~ msgid "copying %s to %s/%s\n" +#~ msgstr "a %s másolása ide: %s/%s\n" + +#~ msgid "failed copying %s\n" +#~ msgstr "nem sikerült másolni a következőt: %s\n" + +#~ msgid " %s is already in the current directory\n" +#~ msgstr " %s már a jelenlegi könyvtárban van\n" + +#~ msgid "failed to download %s\n" +#~ msgstr "nem sikerült letölteni: %s\n" + +#~ msgid "failed to set option CACHEDIR (%s)\n" +#~ msgstr "nem sikerült beállítani a CACHEDIR opciót (%s)\n" + +#~ msgid "failed to get lastupdate time for %s (no big deal)\n" +#~ msgstr "" +#~ "nem sikerült megkapni az utolsó módosítási időpontját a következőnek: %s " +#~ "(nincs sok esély)\n" + +#~ msgid "sync: new mtime for %s: %s\n" +#~ msgstr "szinkronizálás: új módosítási dátum a %s számára: %s\n" + +#~ msgid "%s-%s-%s%s is already in the cache\n" +#~ msgstr "%s-%s-%s%s már a gyorsítótárban\n" + +#~ msgid "no %s cache exists. creating...\n" +#~ msgstr "nem létezik a %s gyorsítótár. létrehozás...\n" + +#~ msgid "warning: no %s cache exists. creating..." +#~ msgstr "figyelmeztetés: nem létezik a %s gyorsítótár. létrehozás..." + +#~ msgid "couldn't create package cache, using /tmp instead\n" +#~ msgstr "nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp használata\n" + +#~ msgid "warning: couldn't create package cache, using /tmp instead" +#~ msgstr "" +#~ "figyelmeztetés: nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp " +#~ "használata" + +#~ msgid "failed to retrieve some files from %s\n" +#~ msgstr "nem sikerült letölteni néhány fájlt a %s repóból\n" + hunk ./src/pacman/po/pacman.pot 11 -"POT-Creation-Date: 2006-08-26 14:56+0200\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" hunk ./src/pacman/po/pacman.pot 19 -#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:431 ../sync.c:470 +#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:378 ../sync.c:417 hunk ./src/pacman/po/pacman.pot 31 -#: ../add.c:79 ../remove.c:99 +#: ../add.c:79 ../remove.c:92 hunk ./src/pacman/po/pacman.pot 40 -#: ../add.c:92 ../remove.c:109 ../sync.c:558 +#: ../add.c:92 ../remove.c:102 ../sync.c:505 hunk ./src/pacman/po/pacman.pot 50 -#: ../add.c:111 ../sync.c:579 +#: ../add.c:111 ../sync.c:526 hunk ./src/pacman/po/pacman.pot 55 -#: ../add.c:121 ../sync.c:781 +#: ../add.c:121 ../sync.c:649 hunk ./src/pacman/po/pacman.pot 60 -#: ../add.c:128 ../sync.c:788 +#: ../add.c:128 ../sync.c:656 hunk ./src/pacman/po/pacman.pot 65 -#: ../add.c:136 ../sync.c:796 ../sync.c:803 +#: ../add.c:136 ../sync.c:664 ../sync.c:671 hunk ./src/pacman/po/pacman.pot 71 -#: ../add.c:143 ../sync.c:589 +#: ../add.c:143 ../sync.c:536 hunk ./src/pacman/po/pacman.pot 76 -#: ../add.c:157 ../remove.c:149 ../sync.c:774 +#: ../add.c:157 ../remove.c:142 ../sync.c:642 hunk ./src/pacman/po/pacman.pot 81 -#: ../add.c:164 ../remove.c:159 ../sync.c:463 ../sync.c:823 +#: ../add.c:164 ../remove.c:152 ../sync.c:410 ../sync.c:684 hunk ./src/pacman/po/pacman.pot 86 -#: ../conf.c:102 -#, c-format -msgid "config: new section '%s'\n" -msgstr "" - -#: ../conf.c:104 -#, c-format -msgid "config: line %d: bad section name\n" -msgstr "" - -#: ../conf.c:108 -#, c-format -msgid "" -"config: line %d: '%s' is reserved and cannot be used as a package tree\n" -msgstr "" - -#: ../conf.c:134 ../conf.c:156 ../conf.c:300 ../conf.c:366 -#, c-format -msgid "config: line %d: syntax error\n" -msgstr "" - -#: ../conf.c:140 -#, c-format -msgid "config: line %d: all directives must belong to a section\n" -msgstr "" - -#: ../conf.c:146 -msgid "config: nopassiveftp\n" -msgstr "" - -#: ../conf.c:149 -#, c-format -msgid "failed to set option USESYSLOG (%s)\n" -msgstr "" - -#: ../conf.c:152 -msgid "config: usesyslog\n" -msgstr "" - -#: ../conf.c:164 -#, c-format -msgid "config: including %s\n" -msgstr "" - -#: ../conf.c:173 ../conf.c:181 -#, c-format -msgid "failed to set option NOUPGRADE (%s)\n" -msgstr "" - -#: ../conf.c:176 ../conf.c:184 -#, c-format -msgid "config: noupgrade: %s\n" -msgstr "" - -#: ../conf.c:191 ../conf.c:199 -#, c-format -msgid "failed to set option NOEXTRACT (%s)\n" -msgstr "" - -#: ../conf.c:194 ../conf.c:202 -#, c-format -msgid "config: noextract: %s\n" -msgstr "" - -#: ../conf.c:209 ../conf.c:217 ../pacman.c:552 -#, c-format -msgid "failed to set option IGNOREPKG (%s)\n" -msgstr "" - -#: ../conf.c:212 ../conf.c:220 -#, c-format -msgid "config: ignorepkg: %s\n" -msgstr "" - -#: ../conf.c:227 ../conf.c:232 -#, c-format -msgid "config: holdpkg: %s\n" -msgstr "" - -#: ../conf.c:240 -#, c-format -msgid "config: dbpath: %s\n" -msgstr "" - -#: ../conf.c:248 -#, c-format -msgid "config: cachedir: %s\n" -msgstr "" - -#: ../conf.c:251 -#, c-format -msgid "failed to set option LOGFILE (%s)\n" -msgstr "" - -#: ../conf.c:254 -#, c-format -msgid "config: log file: %s\n" -msgstr "" - -#: ../conf.c:262 -#, c-format -msgid "config: xfercommand: %s\n" -msgstr "" - -#. The config value is in days, we use seconds -#: ../conf.c:265 -#, c-format -msgid "config: UpgradeDelay: %i\n" -msgstr "" - -#: ../conf.c:267 -#, c-format -msgid "failed to set option UPGRADEDELAY (%s)\n" -msgstr "" - -#: ../conf.c:272 -msgid "" -"Warning: UpgradeDelay is very high.\n" -"If a package is updated often it will never be upgraded.\n" -"Manually update such packages or use a lower value to avoid this problem.\n" -msgstr "" - -#: ../conf.c:285 ../conf.c:315 ../conf.c:321 -#, c-format -msgid "config: line %d: bad server location\n" -msgstr "" - -#: ../conf.c:295 -#, c-format -msgid "config: proxyserver: %s\n" -msgstr "" - -#: ../conf.c:298 -#, c-format -msgid "config: proxyport: %u\n" -msgstr "" - -#: ../conf.c:338 ../conf.c:353 -#, c-format -msgid "could not allocate %d bytes\n" -msgstr "" - -#: ../conf.c:359 -#, c-format -msgid "config: line %d: protocol %s is not supported\n" -msgstr "" - -#. add to the list -#: ../conf.c:363 -#, c-format -msgid "config: %s: server: %s %s %s\n" -msgstr "" - hunk ./src/pacman/po/pacman.pot 115 -#: ../download.c:211 -#, c-format -msgid "connecting to %s:21\n" -msgstr "" - -#: ../download.c:213 ../download.c:244 ../download.c:419 -#, c-format -msgid "cannot connect to %s\n" -msgstr "" - -#: ../download.c:217 -msgid "anonymous login failed\n" -msgstr "" - -#: ../download.c:222 -#, c-format -msgid "could not cwd to %s: %s\n" -msgstr "" - -#: ../download.c:228 -msgid "failed to set passive mode\n" -msgstr "" - -#: ../download.c:231 -msgid "FTP passive mode not set\n" -msgstr "" - -#: ../download.c:239 ../download.c:414 -#, c-format -msgid "connecting to %s\n" -msgstr "" - -#: ../download.c:241 ../download.c:416 -#, c-format -msgid "connecting to %s:%u\n" -msgstr "" - -#: ../download.c:303 -#, c-format -msgid "could not chdir to %s\n" -msgstr "" - -#. execute the parsed command via /bin/sh -c -#: ../download.c:307 -#, c-format -msgid "running command: %s\n" -msgstr "" - -#: ../download.c:310 -msgid "running XferCommand: fork failed!\n" -msgstr "" - -#. download failed -#: ../download.c:314 -#, c-format -msgid "XferCommand command returned non-zero status code (%d)\n" -msgstr "" - -#: ../download.c:360 -#, c-format -msgid "failed to get filesize for %s\n" -msgstr "" - -#: ../download.c:366 ../download.c:479 -#, c-format -msgid "failed to get mtime for %s\n" -msgstr "" - -#. mtimes are identical, skip this file -#: ../download.c:371 ../download.c:464 -#, c-format -msgid "mtimes are identical, skipping %s\n" -msgstr "" - -#: ../download.c:386 -msgid "failed to resume download -- restarting\n" -msgstr "" - -#: ../download.c:393 ../download.c:468 -#, c-format -msgid "" -"\n" -"failed downloading %s from %s: %s\n" -msgstr "" - -#: ../download.c:487 -#, c-format -msgid "copying %s to %s/%s\n" -msgstr "" - -#: ../download.c:490 -#, c-format -msgid "failed copying %s\n" -msgstr "" - -#: ../download.c:506 -msgid "] 100% LOCAL " -msgstr "" - -#: ../download.c:568 -#, c-format -msgid " %s is already in the current directory\n" -msgstr "" - -#: ../download.c:582 -#, c-format -msgid "failed to download %s\n" -msgstr "" - hunk ./src/pacman/po/pacman.pot 368 -#: ../pacman.c:94 +#: ../pacman.c:96 hunk ./src/pacman/po/pacman.pot 373 -#: ../pacman.c:95 +#: ../pacman.c:97 hunk ./src/pacman/po/pacman.pot 378 -#: ../pacman.c:96 +#: ../pacman.c:98 hunk ./src/pacman/po/pacman.pot 383 -#: ../pacman.c:97 +#: ../pacman.c:99 hunk ./src/pacman/po/pacman.pot 388 -#: ../pacman.c:98 +#: ../pacman.c:100 hunk ./src/pacman/po/pacman.pot 393 -#: ../pacman.c:99 +#: ../pacman.c:101 hunk ./src/pacman/po/pacman.pot 398 -#: ../pacman.c:100 +#: ../pacman.c:102 hunk ./src/pacman/po/pacman.pot 403 -#: ../pacman.c:101 +#: ../pacman.c:103 hunk ./src/pacman/po/pacman.pot 408 -#: ../pacman.c:102 +#: ../pacman.c:104 hunk ./src/pacman/po/pacman.pot 415 -#: ../pacman.c:105 +#: ../pacman.c:107 hunk ./src/pacman/po/pacman.pot 420 -#: ../pacman.c:106 ../pacman.c:111 ../pacman.c:123 ../pacman.c:128 -#: ../pacman.c:142 +#: ../pacman.c:108 ../pacman.c:113 ../pacman.c:125 ../pacman.c:130 +#: ../pacman.c:144 hunk ./src/pacman/po/pacman.pot 426 -#: ../pacman.c:107 ../pacman.c:113 ../pacman.c:124 ../pacman.c:144 +#: ../pacman.c:109 ../pacman.c:115 ../pacman.c:126 ../pacman.c:146 hunk ./src/pacman/po/pacman.pot 431 -#: ../pacman.c:108 ../pacman.c:125 ../pacman.c:146 +#: ../pacman.c:110 ../pacman.c:127 ../pacman.c:148 hunk ./src/pacman/po/pacman.pot 436 -#: ../pacman.c:110 +#: ../pacman.c:112 hunk ./src/pacman/po/pacman.pot 441 -#: ../pacman.c:112 +#: ../pacman.c:114 hunk ./src/pacman/po/pacman.pot 447 -#: ../pacman.c:114 +#: ../pacman.c:116 hunk ./src/pacman/po/pacman.pot 452 -#: ../pacman.c:115 +#: ../pacman.c:117 hunk ./src/pacman/po/pacman.pot 457 -#: ../pacman.c:116 +#: ../pacman.c:118 hunk ./src/pacman/po/pacman.pot 463 -#: ../pacman.c:119 +#: ../pacman.c:121 hunk ./src/pacman/po/pacman.pot 468 -#: ../pacman.c:121 +#: ../pacman.c:123 hunk ./src/pacman/po/pacman.pot 473 -#: ../pacman.c:127 +#: ../pacman.c:129 hunk ./src/pacman/po/pacman.pot 478 -#: ../pacman.c:129 +#: ../pacman.c:131 hunk ./src/pacman/po/pacman.pot 483 -#: ../pacman.c:130 +#: ../pacman.c:132 hunk ./src/pacman/po/pacman.pot 489 -#: ../pacman.c:131 +#: ../pacman.c:133 hunk ./src/pacman/po/pacman.pot 494 -#: ../pacman.c:132 ../pacman.c:147 +#: ../pacman.c:134 ../pacman.c:149 hunk ./src/pacman/po/pacman.pot 499 -#: ../pacman.c:133 +#: ../pacman.c:135 hunk ./src/pacman/po/pacman.pot 504 -#: ../pacman.c:134 +#: ../pacman.c:136 hunk ./src/pacman/po/pacman.pot 509 -#: ../pacman.c:135 +#: ../pacman.c:137 hunk ./src/pacman/po/pacman.pot 516 -#: ../pacman.c:136 +#: ../pacman.c:138 hunk ./src/pacman/po/pacman.pot 521 -#: ../pacman.c:137 +#: ../pacman.c:139 hunk ./src/pacman/po/pacman.pot 528 -#: ../pacman.c:138 +#: ../pacman.c:140 hunk ./src/pacman/po/pacman.pot 533 -#: ../pacman.c:139 +#: ../pacman.c:141 hunk ./src/pacman/po/pacman.pot 540 -#: ../pacman.c:141 +#: ../pacman.c:143 hunk ./src/pacman/po/pacman.pot 545 -#: ../pacman.c:143 +#: ../pacman.c:145 hunk ./src/pacman/po/pacman.pot 552 -#: ../pacman.c:145 +#: ../pacman.c:147 hunk ./src/pacman/po/pacman.pot 557 -#: ../pacman.c:148 +#: ../pacman.c:150 hunk ./src/pacman/po/pacman.pot 564 -#: ../pacman.c:149 +#: ../pacman.c:151 hunk ./src/pacman/po/pacman.pot 569 -#: ../pacman.c:150 +#: ../pacman.c:152 hunk ./src/pacman/po/pacman.pot 574 -#: ../pacman.c:151 +#: ../pacman.c:153 hunk ./src/pacman/po/pacman.pot 580 -#: ../pacman.c:152 +#: ../pacman.c:154 hunk ./src/pacman/po/pacman.pot 586 -#: ../pacman.c:153 +#: ../pacman.c:155 hunk ./src/pacman/po/pacman.pot 592 -#: ../pacman.c:155 +#: ../pacman.c:157 hunk ./src/pacman/po/pacman.pot 597 -#: ../pacman.c:156 +#: ../pacman.c:158 hunk ./src/pacman/po/pacman.pot 602 -#: ../pacman.c:157 +#: ../pacman.c:159 hunk ./src/pacman/po/pacman.pot 607 -#: ../pacman.c:158 +#: ../pacman.c:160 hunk ./src/pacman/po/pacman.pot 613 -#: ../pacman.c:159 +#: ../pacman.c:161 hunk ./src/pacman/po/pacman.pot 619 -#: ../pacman.c:160 +#: ../pacman.c:162 hunk ./src/pacman/po/pacman.pot 624 -#: ../pacman.c:161 +#: ../pacman.c:163 hunk ./src/pacman/po/pacman.pot 629 -#: ../pacman.c:162 +#: ../pacman.c:164 hunk ./src/pacman/po/pacman.pot 634 -#: ../pacman.c:175 +#: ../pacman.c:177 hunk ./src/pacman/po/pacman.pot 639 -#: ../pacman.c:176 +#: ../pacman.c:178 hunk ./src/pacman/po/pacman.pot 644 -#: ../pacman.c:369 +#: ../pacman.c:363 hunk ./src/pacman/po/pacman.pot 648 -#: ../pacman.c:396 +#: ../pacman.c:390 hunk ./src/pacman/po/pacman.pot 652 -#: ../pacman.c:492 +#: ../pacman.c:486 hunk ./src/pacman/po/pacman.pot 656 -#: ../pacman.c:516 +#: ../pacman.c:510 hunk ./src/pacman/po/pacman.pot 661 -#: ../pacman.c:529 +#: ../pacman.c:518 +#, c-format +msgid "failed to parse config (%s)\n" +msgstr "" + +#: ../pacman.c:524 hunk ./src/pacman/po/pacman.pot 671 -#: ../pacman.c:533 +#: ../pacman.c:528 hunk ./src/pacman/po/pacman.pot 676 -#: ../pacman.c:541 +#: ../pacman.c:532 +#, c-format +msgid "failed to set option DLCB (%s)\n" +msgstr "" + +#: ../pacman.c:536 +#, c-format +msgid "failed to set option DLFNM (%s)\n" +msgstr "" + +#: ../pacman.c:540 +#, c-format +msgid "failed to set option DLOFFSET (%s)\n" +msgstr "" + +#: ../pacman.c:544 +#, c-format +msgid "failed to set option DLT0 (%s)\n" +msgstr "" + +#: ../pacman.c:548 +#, c-format +msgid "failed to set option DLT (%s)\n" +msgstr "" + +#: ../pacman.c:552 hunk ./src/pacman/po/pacman.pot 703 -msgid "failed to set option DBPATH (%s)\n" +msgid "failed to set option DLRATE (%s)\n" hunk ./src/pacman/po/pacman.pot 706 -#: ../pacman.c:546 ../sync.c:752 +#: ../pacman.c:556 hunk ./src/pacman/po/pacman.pot 708 -msgid "failed to set option CACHEDIR (%s)\n" +msgid "failed to set option DLXFERED1 (%s)\n" hunk ./src/pacman/po/pacman.pot 712 +#, c-format +msgid "failed to set option DLETA_H (%s)\n" +msgstr "" + +#: ../pacman.c:564 +#, c-format +msgid "failed to set option DLETA_M (%s)\n" +msgstr "" + +#: ../pacman.c:568 +#, c-format +msgid "failed to set option DLETA_S (%s)\n" +msgstr "" + +#: ../pacman.c:578 +#, c-format +msgid "failed to set option IGNOREPKG (%s)\n" +msgstr "" + +#: ../pacman.c:586 hunk ./src/pacman/po/pacman.pot 735 -#: ../pacman.c:566 +#: ../pacman.c:592 hunk ./src/pacman/po/pacman.pot 740 -#: ../pacman.c:573 +#: ../pacman.c:599 hunk ./src/pacman/po/pacman.pot 744 -#: ../pacman.c:586 +#: ../pacman.c:612 hunk ./src/pacman/po/pacman.pot 767 -#: ../query.c:111 ../sync.c:374 +#: ../query.c:111 ../sync.c:340 hunk ./src/pacman/po/pacman.pot 771 -#: ../query.c:160 +#: ../query.c:150 hunk ./src/pacman/po/pacman.pot 776 -#: ../query.c:170 +#: ../query.c:160 hunk ./src/pacman/po/pacman.pot 780 -#: ../query.c:174 +#: ../query.c:164 hunk ./src/pacman/po/pacman.pot 786 -#: ../query.c:212 ../query.c:254 +#: ../query.c:202 ../query.c:244 hunk ./src/pacman/po/pacman.pot 791 -#: ../remove.c:64 ../sync.c:509 +#: ../remove.c:64 ../sync.c:456 hunk ./src/pacman/po/pacman.pot 805 -#: ../remove.c:81 ../sync.c:429 ../sync.c:468 +#: ../remove.c:81 ../sync.c:376 ../sync.c:415 hunk ./src/pacman/po/pacman.pot 810 -#: ../remove.c:94 -#, c-format -msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr "" - -#: ../remove.c:114 +#: ../remove.c:107 hunk ./src/pacman/po/pacman.pot 815 -#: ../remove.c:136 +#: ../remove.c:129 hunk ./src/pacman/po/pacman.pot 822 -#: ../remove.c:139 +#: ../remove.c:132 hunk ./src/pacman/po/pacman.pot 857 -#: ../sync.c:153 ../trans.c:69 ../trans.c:83 ../trans.c:94 ../trans.c:107 -#: ../trans.c:119 +#: ../sync.c:153 ../trans.c:72 ../trans.c:86 ../trans.c:100 ../trans.c:116 +#: ../trans.c:128 hunk ./src/pacman/po/pacman.pot 862 -#: ../sync.c:177 -#, c-format -msgid "failed to get lastupdate time for %s (no big deal)\n" -msgstr "" - -#: ../sync.c:190 +#: ../sync.c:168 hunk ./src/pacman/po/pacman.pot 867 -#: ../sync.c:193 -#, c-format -msgid " %s is up to date\n" -msgstr "" - -#: ../sync.c:196 +#: ../sync.c:170 hunk ./src/pacman/po/pacman.pot 869 -msgid "sync: new mtime for %s: %s\n" +msgid "failed to update %s (%s)\n" hunk ./src/pacman/po/pacman.pot 872 -#: ../sync.c:201 +#: ../sync.c:174 hunk ./src/pacman/po/pacman.pot 874 -msgid "failed to update %s (%s)\n" +msgid " %s is up to date\n" hunk ./src/pacman/po/pacman.pot 877 -#: ../sync.c:295 +#: ../sync.c:265 hunk ./src/pacman/po/pacman.pot 882 -#: ../sync.c:333 +#: ../sync.c:303 hunk ./src/pacman/po/pacman.pot 888 -#: ../sync.c:403 +#: ../sync.c:350 hunk ./src/pacman/po/pacman.pot 892 -#: ../sync.c:404 +#: ../sync.c:351 hunk ./src/pacman/po/pacman.pot 896 -#: ../sync.c:438 +#: ../sync.c:385 hunk ./src/pacman/po/pacman.pot 900 -#: ../sync.c:439 +#: ../sync.c:386 hunk ./src/pacman/po/pacman.pot 904 -#: ../sync.c:457 +#: ../sync.c:404 hunk ./src/pacman/po/pacman.pot 910 -#: ../sync.c:458 +#: ../sync.c:405 hunk ./src/pacman/po/pacman.pot 914 -#: ../sync.c:459 +#: ../sync.c:406 hunk ./src/pacman/po/pacman.pot 918 -#: ../sync.c:461 +#: ../sync.c:408 hunk ./src/pacman/po/pacman.pot 922 -#: ../sync.c:476 ../sync.c:497 +#: ../sync.c:423 ../sync.c:444 hunk ./src/pacman/po/pacman.pot 927 -#: ../sync.c:515 +#: ../sync.c:462 hunk ./src/pacman/po/pacman.pot 931 -#: ../sync.c:522 +#: ../sync.c:469 hunk ./src/pacman/po/pacman.pot 936 -#: ../sync.c:545 +#: ../sync.c:492 hunk ./src/pacman/po/pacman.pot 941 -#: ../sync.c:564 +#: ../sync.c:511 hunk ./src/pacman/po/pacman.pot 945 -#: ../sync.c:564 +#: ../sync.c:511 hunk ./src/pacman/po/pacman.pot 949 -#: ../sync.c:641 +#: ../sync.c:588 hunk ./src/pacman/po/pacman.pot 955 -#: ../sync.c:657 +#: ../sync.c:604 hunk ./src/pacman/po/pacman.pot 961 -#: ../sync.c:660 +#: ../sync.c:607 hunk ./src/pacman/po/pacman.pot 968 -#: ../sync.c:661 +#: ../sync.c:608 hunk ./src/pacman/po/pacman.pot 975 -#: ../sync.c:667 +#: ../sync.c:614 hunk ./src/pacman/po/pacman.pot 981 -#: ../sync.c:671 +#: ../sync.c:618 hunk ./src/pacman/po/pacman.pot 985 -#: ../sync.c:679 +#: ../sync.c:626 hunk ./src/pacman/po/pacman.pot 991 -#: ../sync.c:683 +#: ../sync.c:630 hunk ./src/pacman/po/pacman.pot 995 -#: ../sync.c:730 -#, c-format -msgid "%s-%s-%s%s is already in the cache\n" -msgstr "" - -#: ../sync.c:738 -#, c-format -msgid "" -"\n" -":: Retrieving packages from %s...\n" -msgstr "" - -#. no cache directory.... try creating it -#: ../sync.c:742 -#, c-format -msgid "no %s cache exists. creating...\n" -msgstr "" - -#: ../sync.c:743 -#, c-format -msgid "warning: no %s cache exists. creating..." -msgstr "" - -#. couldn't mkdir the cache directory, so fall back to /tmp and unlink -#. * the package afterwards. -#. -#: ../sync.c:748 -msgid "couldn't create package cache, using /tmp instead\n" -msgstr "" - -#: ../sync.c:749 -msgid "warning: couldn't create package cache, using /tmp instead" -msgstr "" - -#: ../sync.c:759 -#, c-format -msgid "failed to retrieve some files from %s\n" -msgstr "" - -#: ../trans.c:54 +#: ../trans.c:57 hunk ./src/pacman/po/pacman.pot 999 -#: ../trans.c:57 +#: ../trans.c:60 hunk ./src/pacman/po/pacman.pot 1003 -#: ../trans.c:60 +#: ../trans.c:63 hunk ./src/pacman/po/pacman.pot 1007 -#: ../trans.c:63 +#: ../trans.c:66 hunk ./src/pacman/po/pacman.pot 1011 -#: ../trans.c:78 +#: ../trans.c:81 hunk ./src/pacman/po/pacman.pot 1016 -#: ../trans.c:85 +#: ../trans.c:88 hunk ./src/pacman/po/pacman.pot 1021 -#: ../trans.c:91 +#: ../trans.c:95 hunk ./src/pacman/po/pacman.pot 1026 -#: ../trans.c:95 +#: ../trans.c:104 hunk ./src/pacman/po/pacman.pot 1031 -#: ../trans.c:102 +#: ../trans.c:111 hunk ./src/pacman/po/pacman.pot 1036 -#: ../trans.c:109 +#: ../trans.c:118 hunk ./src/pacman/po/pacman.pot 1041 -#: ../trans.c:116 +#: ../trans.c:125 hunk ./src/pacman/po/pacman.pot 1045 -#: ../trans.c:130 +#: ../trans.c:139 hunk ./src/pacman/po/pacman.pot 1049 -#: ../trans.c:132 +#: ../trans.c:141 hunk ./src/pacman/po/pacman.pot 1053 -#: ../trans.c:151 +#: ../trans.c:148 +#, c-format +msgid "" +"\n" +":: Retrieving packages from %s...\n" +msgstr "" + +#: ../trans.c:158 +msgid "] 100% LOCAL " +msgstr "" + +#: ../trans.c:176 hunk ./src/pacman/po/pacman.pot 1069 -#: ../trans.c:165 +#: ../trans.c:190 +#, c-format +msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " +msgstr "" + +#: ../trans.c:203 hunk ./src/pacman/po/pacman.pot 1079 -#: ../trans.c:180 +#: ../trans.c:218 hunk ./src/pacman/po/pacman.pot 1084 -#: ../trans.c:196 +#: ../trans.c:234 hunk ./src/pacman/po/pacman.pot 1089 -#: ../trans.c:214 +#: ../trans.c:252 hunk ./src/pacman/po/pacman.pot 1094 -#: ../trans.c:232 +#: ../trans.c:270 hunk ./src/pacman/po/pacman.pot 1099 -#: ../trans.c:248 +#: ../trans.c:286 hunk ./src/pacman/po/pacman.pot 1103 -#: ../trans.c:249 +#: ../trans.c:287 hunk ./src/pacman/po/pacman.pot 1106 + +#: ../trans.c:288 +msgid "removing" +msgstr "" } From vmiklos at frugalware.org Sun Sep 3 14:18:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 14:18:25 2006 Subject: [Frugalware-darcs] homepage-ng: frugalware/xml/security.xml: initial import Message-ID: <20060903121824.1F7944E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903121644-e2957-03f54c39b2d755047fe4a738843fc875ca2e78bf.gz; [frugalware/xml/security.xml: initial import VMiklos **20060903121644 atm it only contains one fake fsa ] { addfile ./frugalware/xml/security.xml hunk ./frugalware/xml/security.xml 1 + + + + + + + + +]> + + + + + + 1 + 2006-09-03 + zlib + 1.2.3-1 + 1.2.3-2wanda1 + http://bugs.frugalware.org/983 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2002-0059 + zlib is a compression/decompression library.
+ This is just a fake FSA for testing purposes + + } From vmiklos at frugalware.org Sun Sep 3 14:44:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 14:44:42 2006 Subject: [Frugalware-darcs] homepage-ng: frugalware/xml/security.xml: added author field, validity fixes Message-ID: <20060903124440.97D244E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903123707-e2957-e7ab034cb74be3213dea8ccffbbbf1f634fa0472.gz; [frugalware/xml/security.xml: added author field, validity fixes VMiklos **20060903123707] { hunk ./frugalware/xml/security.xml 4 - + + hunk ./frugalware/xml/security.xml 7 - - - - + + + + + + + hunk ./frugalware/xml/security.xml 23 + vmiklos hunk ./frugalware/xml/security.xml 29 - zlib is a compression/decompression library.
- This is just a fake FSA for testing purposes + + This is just a fake FSA for testing purposes.
+ ]]> + } From vmiklos at frugalware.org Sun Sep 3 14:44:41 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 14:44:48 2006 Subject: [Frugalware-darcs] homepage-ng: frugalware/xml/security.xml: added a few comments Message-ID: <20060903124442.2DC384E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903124009-e2957-ef0a5f2f6158bc758733d1847a891a935cf070f5.gz; [frugalware/xml/security.xml: added a few comments VMiklos **20060903124009] { hunk ./frugalware/xml/security.xml 5 + hunk ./frugalware/xml/security.xml 7 + hunk ./frugalware/xml/security.xml 9 + hunk ./frugalware/xml/security.xml 11 + hunk ./frugalware/xml/security.xml 13 + hunk ./frugalware/xml/security.xml 15 + hunk ./frugalware/xml/security.xml 17 + hunk ./frugalware/xml/security.xml 19 + hunk ./frugalware/xml/security.xml 21 + } From vmiklos at frugalware.org Sun Sep 3 15:02:19 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 15:02:21 2006 Subject: [Frugalware-darcs] homepage-ng: frugalware/xml/security.xml: no longer allow html in Message-ID: <20060903130219.AEF6B4E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903124939-e2957-f427ec31e3ec30766d8335bf1e71411f7b49e0e9.gz; [frugalware/xml/security.xml: no longer allow html in VMiklos **20060903124939] { hunk ./frugalware/xml/security.xml 38 - - This is just a fake FSA for testing purposes.
- ]]> - + zlib is a compression/decompression library. + This is just a fake FSA for testing purposes. } From crazy at frugalware.org Sun Sep 3 15:28:24 2006 From: crazy at frugalware.org (crazy) Date: Sun Sep 3 15:28:26 2006 Subject: [Frugalware-darcs] frugalware-current: efltk-2.0.6-1-i686 Message-ID: <20060903132824.5E3934E88D7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903132138-f6986-9e2832a9c505b3a235fcc6545fe31944a7c37ca2.gz; [efltk-2.0.6-1-i686 crazy **20060903132138 * Version bump ( new m8r ) * fixed depends() * reworked the FrugalBuild * added 4 patches to fix: C|XXFLAG, compile errors,building in chroot * droped gcc3* makedepends(), compiles now with gcc4.1* ( anyway the example programs are all working ) * depends() fixes * I'll try soon make it work on x86_64 but for now just won't work :| ] { addfile ./source/xlib-extra/efltk/01-fix-cflags.patch addfile ./source/xlib-extra/efltk/02-fix-Fl_Text_Buffer.h-extra_qualification.patch addfile ./source/xlib-extra/efltk/03-fix-Fl_Combo_Box.h-extra_qualification.patch addfile ./source/xlib-extra/efltk/04-no-test.patch hunk ./source/xlib-extra/efltk/01-fix-cflags.patch 1 +diff -Naur efltk/makeinclude.in efltk-p/makeinclude.in +--- efltk/makeinclude.in 2006-09-02 22:55:56.000000000 +0200 ++++ efltk-p/makeinclude.in 2006-09-03 13:20:03.735015208 +0200 +@@ -55,8 +55,8 @@ + # flags for compiler: + # WALL = -Wcomment -Wformat -Wimplicit-int -Werror-implicit-function-declaration -Wmain -Wmultichar -Wparentheses -Wreturn-type -Wswitch -Wunused + WALL = -Wall +-CFLAGS = -DHAVE_CONFIG_H -I$(EFLTK_BUILDDIR) $(WALL) @CFLAGS@ @DEBUGFLAG@ +-CXXFLAGS = -DHAVE_CONFIG_H -I$(EFLTK_BUILDDIR) $(WALL) @CXXFLAGS@ @DEBUGFLAG@ ++CFLAGS += -DHAVE_CONFIG_H -I$(EFLTK_BUILDDIR) @CFLAGS@ ++CXXFLAGS += -DHAVE_CONFIG_H -I$(EFLTK_BUILDDIR) @CXXFLAGS@ + + # static libs: + LIBEXT =@LIBEXT@ hunk ./source/xlib-extra/efltk/02-fix-Fl_Text_Buffer.h-extra_qualification.patch 1 +diff -Naur efltk/efltk/Fl_Text_Buffer.h efltk-p/efltk/Fl_Text_Buffer.h +--- efltk/efltk/Fl_Text_Buffer.h 2006-09-02 22:55:52.000000000 +0200 ++++ efltk-p/efltk/Fl_Text_Buffer.h 2006-09-03 13:25:26.391963896 +0200 +@@ -78,7 +78,7 @@ + Fl_Text_Buffer(int requestedSize = 0); + ~Fl_Text_Buffer(); + +- char *Fl_Text_Buffer::static_buffer(); ++ char *static_buffer(); + + // Undo stack size: (default 50) + int undo_size(); hunk ./source/xlib-extra/efltk/03-fix-Fl_Combo_Box.h-extra_qualification.patch 1 +diff -Naur efltk/efltk/Fl_Combo_Box.h efltk-p/efltk/Fl_Combo_Box.h +--- efltk/efltk/Fl_Combo_Box.h 2006-09-02 22:55:52.000000000 +0200 ++++ efltk-p/efltk/Fl_Combo_Box.h 2006-09-03 13:40:32.269249616 +0200 +@@ -23,8 +23,8 @@ + + void ctor_init(); + protected: +- static void Fl_Combo_Box::cb_browse(Fl_Widget *w, void *data); +- static void Fl_Combo_Box::cb_button(Fl_Widget *w, void *data); ++ static void cb_browse(Fl_Widget *w, void *data); ++ static void cb_button(Fl_Widget *w, void *data); + public: + static Fl_Named_Style* default_style; + hunk ./source/xlib-extra/efltk/04-no-test.patch 1 +diff -Naur efltk/Makefile efltk-p/Makefile +--- efltk/Makefile 2006-09-02 22:55:49.000000000 +0200 ++++ efltk-p/Makefile 2006-09-03 15:12:11.974167384 +0200 +@@ -25,7 +25,7 @@ + SHELL=/bin/sh + OS_NAME := $(shell uname -s | sed "s/\//-/" | sed "s/_/-/" | sed "s/-.*//g") + +-DIRS = src tools themes efltk locale test ++DIRS = src tools themes efltk locale + + GENERATED = makeinclude efltk-config + hunk ./source/xlib-extra/efltk/FrugalBuild 1 -# Last Modified: Sun, 12 Mar 2006 22:38:40 +0100 +# Last Modified: Sun, 03 Sep 2006 15:18:31 +0200 hunk ./source/xlib-extra/efltk/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 hunk ./source/xlib-extra/efltk/FrugalBuild 7 -pkgver=2.0.5 +pkgver=2.0.6 hunk ./source/xlib-extra/efltk/FrugalBuild 12 -depends=('libxext' 'libjpeg' 'libstdc++' 'libpng') -makedepends=('gcc-3.3') +depends=('libjpeg' 'libstdc++' 'libpng' 'mesa' 'libxrender' 'freetype2' 'fontconfig' 'unixodbc' 'libxft') hunk ./source/xlib-extra/efltk/FrugalBuild 15 -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=49891&package_id=58021'|grep -m1 'efltk-'|sed 's/.*k-\(.*\).tar.bz2 .*/\1/'" -sha1sums=('26f7124b384d0bfe3d28a73cbdf0111432b08d99') +up2date="lynx -dump http://ede.sourceforge.net/page/download|grep -m1 eFLTK|sed 's/.*TK \(.*\) .*/\1/'" +source=(http://heanet.dl.sourceforge.net/sourceforge/ede/$pkgname-$pkgver.tar.bz2 \ + 01-fix-cflags.patch 02-fix-Fl_Text_Buffer.h-extra_qualification.patch \ + 03-fix-Fl_Combo_Box.h-extra_qualification.patch 04-no-test.patch) +sha1sums=('314b749d9ee8f2723fe8127b6f0533252102009c' \ + '0c8f452f9b3234f8e1694b149bc649ee01569f5b' \ + '0945594a6968fc1cefca7c1810a4157c41863cea' \ + 'b0c2b44e11118b022a12fdee89a4d0a215c11bf9' \ + '745cc08458254b73077d0ef16c729cc2de77620a') hunk ./source/xlib-extra/efltk/FrugalBuild 28 + Fpatchall + rm configure + autoconf || Fdie hunk ./source/xlib-extra/efltk/FrugalBuild 32 - CC=gcc-3.3 CXX=g++-3.3 Fbuild --enable-opengl --enable-utf8 \ - --disable-xft --enable-plugins + Fconf \ + --enable-opengl --enable-utf8 \ + --enable-xft --enable-plugins \ + --enable-xdbe --disable-debug \ + --disable-mysql + make || return 1 + Fmakeinstall hunk ./source/xlib-extra/efltk/FrugalBuild 41 +# optimization OK } From alex at alex-smith.me.uk Sun Sep 3 16:16:35 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 16:16:37 2006 Subject: [Frugalware-darcs] homepage-ng: removed unneeded stuff in paste sidebar Message-ID: <20060903141635.6A7FE4E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903151620-46e39-79c17b7f0ac141561c6e732311f34a4c38b06848.gz; [removed unneeded stuff in paste sidebar AlexExtreme **20060903151620] { hunk ./frugalware/paste/layout.php 1 -\n"; -?> - - - - -<?php echo $page['title'] ?> - - - -'; - echo $page['post']['codecss']; - echo ''; -} -?> - - - - - -
-

pastebin - collaborative debugging

-

pastebin is a collaborative debugging tool allowing you to share -and modify code snippets while chatting on IRC, IM or a message board.

-

This site is developed to XHTML and CSS2 W3C standards. -If you see this paragraph, your browser does not support those standards and you -need to upgrade. Visit WaSP -for a variety of options.

-
- -
View Help"; - } - else - { - echo " What's a private pastebin?"; - } -?> -
- - - - - - -
- - - - -
-
-errors)) -{ - echo "

Errors

    "; - foreach($pastebin->errors as $err) - { - echo "
  • $err
    • "; - } - echo "
"; - echo "
"; -} - - -if (isset($_REQUEST["diff"])) -{ - - $newpid=intval($_REQUEST['diff']); - - $newpost=$pastebin->getPost($newpid); - if (count($newpost)) - { - $oldpost=$pastebin->getPost($newpost['parent_pid']); - if (count($oldpost)) - { - $page['pid']=$newpid; - $page['current_format']=$newpost['format']; - $page['editcode']=$newpost['code']; - $page['posttitle']=''; - - //echo "
Diff feature is in BETA! If you have feedback, send it to lordelph at gmail.com
"; - echo "

Difference between
modified post getPostUrl($newpost['pid'])."\">{$newpost['pid']} by {$newpost['poster']} on {$newpost['postdate']} and
". - "original post getPostUrl($oldpost['pid'])."\">{$oldpost['pid']} by {$oldpost['poster']} on {$oldpost['postdate']}
"; - - echo "Show "; - echo "old version | "; - echo "new version | "; - echo "both versions "; - echo "

"; - - $newpost['code']=preg_replace('/^'.$CONF['highlight_prefix'].'/m', '', $newpost['code']); - $oldpost['code']=preg_replace('/^'.$CONF['highlight_prefix'].'/m', '', $oldpost['code']); - - $a1=explode("\n", $newpost['code']); - $a2=explode("\n", $oldpost['code']); - - $diff=new Diff($a2,$a1, 1); - - echo ""; - echo ""; - echo $diff->output; - echo "
    
"; - } - - } - - -} - -/////////////////////////////////////////////////////////////////////////////// -// show a post -// - -if (isset($_GET['help'])) - $page['posttitle']=""; - -if (strlen($page['post']['posttitle'])) -{ - echo "

{$page['post']['posttitle']}"; - if ($page['post']['parent_pid']>0) - { - echo " (modification of post by {$page['post']['parent_poster']} "; - echo "view diff)"; - } - - echo "
"; - - $followups=count($page['post']['followups']); - if ($followups) - { - echo "View followups from "; - $sep=""; - foreach($page['post']['followups'] as $idx=>$followup) - { - echo $sep."{$followup['poster']}"; - $sep=($idx<($followups-2))?", ":" and "; - } - - echo " | "; - } - - if ($page['post']['parent_pid']>0) - { - echo "diff | "; - } - - echo "download | "; - - echo ""; - - echo "new post"; - - echo "

"; -} -if (isset($page['post']['pid'])) -{ - echo "
".$page['post']['codefmt']."
"; - echo "
Submit a correction or amendment below. (click here to make a fresh posting)
"; - echo "After submitting an amendment, you'll be able to view the differences between the old and new posts easily."; -} - - - -if (isset($_GET['help'])) -{ - ?> -

What is pastebin?

-

pastebin is here to help you collaborate on debugging code snippets. If you're - not familiar with the idea, most people use it like this:

-
    -
  • submit a code fragment to pastebin, getting a url like http://pastebin.com/1234
    • -
  • paste the url into an IRC or IM conversation
    • -
  • someone responds by reading and perhaps submitting a modification of your code
    • -
  • you then view the modification, maybe using the built in diff tool to help locate the changes
    • -
- -

How can I view the differences between two posts?

-

When you view a post, you have the opportunity of editing the text - - this creates a new post, but when you view it, you'll be given a - 'diff' link which allows you to compare the changes between the old and the new version

-

This is a powerful feature, great for seeing exactly what lines someone changed.

- - -

What's a private pastebin and how do I get one?

-

You get a private pastebin simply by thinking up a domain name no-one else is using, - e.g. http://private.pastebin.com or http://this-is-my.pastebin.com. Posts made into a - subdomain only show up on that domain, making it easy for you to collaborate without the - 'noise' of the regular service at http://pastebin.com.

- -

All you need to do is change the web address in your browser to access a private pastebin, - or you can simply enter the domain you'd like below

- -
- -

Go to http://.pastebin.com -

- Please use only characters a-z,0-9, dash '-' and period '.'. Your name must start and end with a letter or number.

"; } ?> -
- -

Please note that there is no password protection - subdomains are accessible to anyone - who knows the domain name you've chosen, but we do not publish a list of domains used.

- -

Subdomains for your language...

- -

If a subdomain matches a language name, the required syntax highlighting is selected - for you, so ruby.pastebin.com will preselect Ruby automatically.

- -

$langname) - { - if ($langcode=='text') - $langname="Plain Text"; - echo "{$sep}{$langname}"; - $sep=", "; - } - - - ?>

- -

And this is all free?

-

It will always be free, our hosting and maintenance costs are paid for through advertising.

- -

Can I get the source?

-

The source code to this site is available under a GPL licence. You can download it here

- -

More news available on my blog.

- - -

I have some feedback, who do I contact?

-

Use the feedback box in the sidebar or email -

- - - -
- - -
Use syntax highlighting
-
- -To highlight particular lines, prefix each line with
- - -
- -
- - -
-/>Remember my settings - -
- - -
- - -
-
- - /> - - - /> - - - /> - -
- -
- -
- -
- -
- - -
- - +\n"; +?> + + + + +<?php echo $page['title'] ?> + + + +'; + echo $page['post']['codecss']; + echo ''; +} +?> + + + + + +
+

pastebin - collaborative debugging

+

pastebin is a collaborative debugging tool allowing you to share +and modify code snippets while chatting on IRC, IM or a message board.

+

This site is developed to XHTML and CSS2 W3C standards. +If you see this paragraph, your browser does not support those standards and you +need to upgrade. Visit WaSP +for a variety of options.

+
+ +
View Help"; + } + else + { + echo " What's a private pastebin?"; + } +?> +
+ + + + Message-ID: <20060903141804.7F21F4E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903151806-46e39-c22a7ea5263bf7614a3fe0377998147b1828a3bb.gz; [paste: duh, helps not to remove the AlexExtreme **20060903151806] { hunk ./frugalware/paste/layout.php 99 + } From vmiklos at frugalware.org Sun Sep 3 16:27:15 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 16:27:16 2006 Subject: [Frugalware-darcs] homepage-ng: paste: add missing RewriteCond Message-ID: <20060903142715.3C6FB4E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903142700-e2957-c7e4bec0cea4ee7968184d58c4d2e2530683ec00.gz; [paste: add missing RewriteCond VMiklos **20060903142700] { hunk ./frugalware/paste/.htaccess 2 -RewriteRule /paste/([0-9]+) /paste/index.php?show=$1 +RewriteCond %{REQUEST_URI} ^/paste/([0-9]+) +RewriteRule (.*) /paste/index.php?show=$1 } From alex at alex-smith.me.uk Sun Sep 3 16:36:14 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 16:36:15 2006 Subject: [Frugalware-darcs] homepage-ng: paste: removed some pastebin.com specific parts Message-ID: <20060903143614.422654E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903153448-46e39-648505d37e14ebcccae46fe793593aeaa4043ec0.gz; [paste: removed some pastebin.com specific parts AlexExtreme **20060903153448] { hunk ./frugalware/paste/index.php 1 -doGarbageCollection(); - - -/////////////////////////////////////////////////////////////////////////////// -// process new posting -// -$errors=array(); -if (isset($_POST['paste'])) -{ - //process posting and redirect - $id=$pastebin->doPost($_POST); - if ($id) - { - $pastebin->redirectToPost($id); - exit; - } - -} - - -/////////////////////////////////////////////////////////////////////////////// -// process download -// -if (isset($_GET['dl'])) -{ - $pid=intval($_GET['dl']); - - if (!$pastebin->doDownload($pid)) - { - //not fount - echo "Pastebin entry $pid is not available"; - } - exit; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// if we get this far, we're going to be displaying some HTML, so let's kick -// off here... -$page=array(); - -//figure out some nice defaults -$page['current_format']=$CONF['default_highlighter']; -$page['expiry']=$CONF['default_expiry']; -$page['remember']=''; - -//see if we can come up with a better default using the subdomain -if (strlen($CONF['subdomain']) && isset($CONF['all_syntax'][$CONF['subdomain']])) -{ - //cool, domain is something like ruby.pastebin.com, so lets go with that - //as a default - $page['current_format']=$CONF['subdomain']; -} - -//are we remembering the user? -$cookie=$pastebin->extractCookie(); -if ($cookie) -{ - //initialise bits of page with cookie data - $page['remember']='checked="checked"'; - $page['current_format']=$cookie['last_format']; - $page['poster']=$cookie['poster']; - $page['expiry']=$cookie['last_expiry']; -} - - -//add list of recent posts -$list=isset($_REQUEST["list"]) ? intval($_REQUEST["list"]) : 10; -$page['recent']=$pastebin->getRecentPosts($list); - -//send feedback mail? -if (isset($_POST['feedback']) && strlen($_POST['msg'])) -{ - $matches=array(); - $spam=false; - - //more than two links? - preg_match_all('{http://}', $_POST['msg'], $matches); - $spam=$spam || count($matches[0])>2; - - //[url=][/url] ? - $spam=$spam || preg_match('{\[url=}i', $_POST['msg']); - $spam=$spam || preg_match('{getPost($pid); - - //ensure corrent format is selected - $page['current_format']=$page['post']['format']; -} -else -{ - $page['posttitle']='New Posting'; -} - -//use configured title -$page['title']= $CONF['title']; - -//on a subdomain, label it as private... -if (strlen($CONF['subdomain'])) -{ - $page['title']=$CONF['subdomain']. ' private pastebin - collaborative debugging tool'; -} -elseif ($page['current_format']!='text') -{ - //give the page a title which features the syntax used.. - $page['title']=$CONF['all_syntax'][$page['current_format']] . " ".$page['title']; -} - - -/////////////////////////////////////////////////////////////////////////////// -// HTML page output -// -include("layout.php"); - - - - - - - +doGarbageCollection(); + + +/////////////////////////////////////////////////////////////////////////////// +// process new posting +// +$errors=array(); +if (isset($_POST['paste'])) +{ + //process posting and redirect + $id=$pastebin->doPost($_POST); + if ($id) + { + $pastebin->redirectToPost($id); + exit; + } + +} + + +/////////////////////////////////////////////////////////////////////////////// +// process download +// +if (isset($_GET['dl'])) +{ + $pid=intval($_GET['dl']); + + if (!$pastebin->doDownload($pid)) + { + //not fount + echo "Pastebin entry $pid is not available"; + } + exit; +} + + + +/////////////////////////////////////////////////////////////////////////////// +// if we get this far, we're going to be displaying some HTML, so let's kick +// off here... +$page=array(); + +//figure out some nice defaults +$page['current_format']=$CONF['default_highlighter']; +$page['expiry']=$CONF['default_expiry']; +$page['remember']=''; + +//see if we can come up with a better default using the subdomain +if (strlen($CONF['subdomain']) && isset($CONF['all_syntax'][$CONF['subdomain']])) +{ + //cool, domain is something like ruby.pastebin.com, so lets go with that + //as a default + $page['current_format']=$CONF['subdomain']; +} + +//are we remembering the user? +$cookie=$pastebin->extractCookie(); +if ($cookie) +{ + //initialise bits of page with cookie data + $page['remember']='checked="checked"'; + $page['current_format']=$cookie['last_format']; + $page['poster']=$cookie['poster']; + $page['expiry']=$cookie['last_expiry']; +} + + +//add list of recent posts +$list=isset($_REQUEST["list"]) ? intval($_REQUEST["list"]) : 10; +$page['recent']=$pastebin->getRecentPosts($list); + +//send feedback mail? +if (isset($_POST['feedback']) && strlen($_POST['msg'])) +{ + $matches=array(); + $spam=false; + + //more than two links? + preg_match_all('{http://}', $_POST['msg'], $matches); + $spam=$spam || count($matches[0])>2; + + //[url=][/url] ? + $spam=$spam || preg_match('{\[url=}i', $_POST['msg']); + $spam=$spam || preg_match('{getPost($pid); + + //ensure corrent format is selected + $page['current_format']=$page['post']['format']; +} +else +{ + $page['posttitle']='New Posting'; +} + +//use configured title +$page['title']= $CONF['title']; + +//on a subdomain, label it as private... +if (strlen($CONF['subdomain'])) +{ + $page['title']=$CONF['subdomain']. ' private pastebin - collaborative debugging tool'; +} +elseif ($page['current_format']!='text') +{ + //give the page a title which features the syntax used.. + $page['title']=$CONF['all_syntax'][$page['current_format']] . " ".$page['title']; +} + + +/////////////////////////////////////////////////////////////////////////////// +// HTML page output +// +include("layout.php"); + hunk ./frugalware/paste/layout.php 248 -

What is pastebin?

-

pastebin is here to help you collaborate on debugging code snippets. If you're +

What is Frugalware Pastebin?

+

Frugalware Pastebin is here to help you collaborate on debugging code snippets. If you're hunk ./frugalware/paste/layout.php 252 -

  • submit a code fragment to pastebin, getting a url like http://pastebin.com/1234
    • +
  • submit a code fragment to pastebin, getting a url like http://frugalware.org/paste/1234
    • hunk ./frugalware/paste/layout.php 264 - -

    What's a private pastebin and how do I get one?

    -

    You get a private pastebin simply by thinking up a domain name no-one else is using, - e.g. http://private.pastebin.com or http://this-is-my.pastebin.com. Posts made into a - subdomain only show up on that domain, making it easy for you to collaborate without the - 'noise' of the regular service at http://pastebin.com.

    - -

    All you need to do is change the web address in your browser to access a private pastebin, - or you can simply enter the domain you'd like below

    - -
    - -

    Go to http://.pastebin.com -

    - Please use only characters a-z,0-9, dash '-' and period '.'. Your name must start and end with a letter or number.

    "; } ?> -
    - -

    Please note that there is no password protection - subdomains are accessible to anyone - who knows the domain name you've chosen, but we do not publish a list of domains used.

    - -

    Subdomains for your language...

    - -

    If a subdomain matches a language name, the required syntax highlighting is selected - for you, so ruby.pastebin.com will preselect Ruby automatically.

    - -

    $langname) - { - if ($langcode=='text') - $langname="Plain Text"; - echo "{$sep}{$langname}"; - $sep=", "; - } - - - ?>

    - -

    And this is all free?

    -

    It will always be free, our hosting and maintenance costs are paid for through advertising.

    - -

    Can I get the source?

    -

    The source code to this site is available under a GPL licence. You can download it here

    - -

    More news available on my blog.

    - - -

    I have some feedback, who do I contact?

    -

    Use the feedback box in the sidebar or email -

    - - } From alex at alex-smith.me.uk Sun Sep 3 16:38:13 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Sep 3 16:38:15 2006 Subject: [Frugalware-darcs] homepage-ng: homepage: added pastebin link in menu Message-ID: <20060903143813.3005B4E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903153816-46e39-b8b9b1d03b332a76ce4f56eabd6de026e1e8dd05.gz; [homepage: added pastebin link in menu AlexExtreme **20060903153816] { hunk ./frugalware/config.inc.php 55 +$menucontent .= ' ' . gettext('Pastebin') . "\n"; } From voroskoi at frugalware.org Sun Sep 3 21:20:59 2006 From: voroskoi at frugalware.org (voroskoi) Date: Sun Sep 3 21:21:04 2006 Subject: [Frugalware-darcs] frugalware-current: ktorrent-2.0.2-1-i686 Message-ID: <20060903192100.E58AF4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903191712-dd049-694e20fd23b3f4c88b5ac3f5abc41c8ff178da09.gz; [ktorrent-2.0.2-1-i686 voroskoi **20060903191712 version bump ] { hunk ./source/kde-extra/ktorrent/FrugalBuild 1 -# Last Modified: Tue, 22 Aug 2006 13:13:59 +0200 +# Last Modified: Sun, 03 Sep 2006 21:05:43 +0200 hunk ./source/kde-extra/ktorrent/FrugalBuild 6 -pkgver=2.0.1 +pkgver=2.0.2 hunk ./source/kde-extra/ktorrent/FrugalBuild 16 -sha1sums=('df14e10e2f95717ef9c1e7bd813b1f76699d6fbc') +sha1sums=('0d58c2743b0e82f0cc61d0b6ffe12ac739063684') } From desco at frugalware.org Sun Sep 3 21:26:42 2006 From: desco at frugalware.org (Miklos Nemeth) Date: Sun Sep 3 21:26:44 2006 Subject: [Frugalware-darcs] gfpm: package treeview changed Message-ID: <20060903192642.4DE3F4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=gfpm;a=darcs_commitdiff;h=20060903192559-3083d-3250c980a40aba6c6ad9f3f00d2763617d241ffb.gz; [package treeview changed Miklos Nemeth **20060903192559 added a new column for installed version ] { hunk ./src/widgets.c 90 - store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + store = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); hunk ./src/widgets.c 101 - "Version", renderer, "text", 1, + "Available", renderer, "text", 1, hunk ./src/widgets.c 107 - "Description", renderer, "text", 2, + "Installed", renderer, "text", 2, + NULL); + + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(pkgs_treeview), + -1, + "Description", renderer, "text", 3, hunk ./src/widgets.c 242 - 2, (char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), + 3, (char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), } From vmiklos at frugalware.org Sun Sep 3 21:31:11 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 21:31:13 2006 Subject: [Frugalware-darcs] homepage-ng: frugalware/darcs-posthook-security.py: initial import Message-ID: <20060903193111.D26C34E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903193038-e2957-cbd1d95bc2e7d5a04e50f571b0de0c0d85aea385.gz; [frugalware/darcs-posthook-security.py: initial import VMiklos **20060903193038] { addfile ./frugalware/darcs-posthook-security.py hunk ./frugalware/darcs-posthook-security.py 1 +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License v2 as published by + the Free Software Foundation + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the + GNU General Public License for more details. + + Frugalware Linux Homepage - New Generation + @author Miklos Vajna + @copyright Copyright (C) 2006 Miklos Vajna + +""" +from xml.dom import minidom +import sys, re, popen2 + +class fsa: + def __init__(self, xmldoc): + self.lines = [] + self.id = xmldoc.getElementsByTagName('id')[0].firstChild.toxml() + self.date = xmldoc.getElementsByTagName('date')[0].firstChild.toxml() + self.author = xmldoc.getElementsByTagName('author')[0].firstChild.toxml() + self.package = xmldoc.getElementsByTagName('package')[0].firstChild.toxml() + self.vulnerable = xmldoc.getElementsByTagName('vulnerable')[0].firstChild.toxml() + self.unaffected = xmldoc.getElementsByTagName('unaffected')[0].firstChild.toxml() + self.bts = xmldoc.getElementsByTagName('bts')[0].firstChild.toxml() + self.cve = xmldoc.getElementsByTagName('cve')[0].firstChild.toxml() + self.desc = re.sub(r'\n\t+', r'\n', xmldoc.getElementsByTagName('desc')[0].firstChild.toxml()) + self.subject = "[ FSA-%s ] %s" % (self.id, self.package) + self.comment = "See http://ftp.frugalware.org/pub/README.GPG for info" + + # now generate the mail + self.lines.append("Frugalware Security Advisory FSA-%s\n\n" % self.id) + self.lines.append("Date: %s\n" % self.date) + self.lines.append("Package: %s\n" % self.package) + self.lines.append("Vulnerable versions: <= %s\n" % self.vulnerable) + self.lines.append("Unaffected versions: >= %s\n" % self.unaffected) + self.lines.append("Related bugreport: %s\n" % self.bts) + self.lines.append("CVE: %s\n" % self.cve) + self.lines.append(""" +Description +=========== + +%s +""" % self.desc) + self.lines.append(""" +Updated Packages +================ + +Check if you have %s installed: + + # pacman -Q %s + +If found, then you should upgrade to the latest version: + + # pacman -Sy %s + +""" % (self.package, self.package, self.package)) + + def output(self): + pout, pin = popen2.popen2('gpg --comment "%s" --clearsign' % self.comment) #TODO: -u id + pin.write("".join(self.lines)) + pin.close() + ret = "".join(pout.readlines()) + pout.close() + return ret + + +if __name__ == "__main__": + sock = open("_darcs/third_party/latest-security", "r") + latest = sock.read().strip() + sock.close() + f = fsa(minidom.parse('frugalware/xml/security.xml')) + if f.id > latest: + import smtplib + fro = f.author + " " + to = "frugalware-security@gmail.com" + msg = "From: %s \r\nTo: %s\r\nSubject: %s\r\n\r\n" \ + % (fro, to, f.subject) + msg += f.output() + server = smtplib.SMTP('localhost') + server.set_debuglevel(1) + server.sendmail(fro, to, msg) + server.quit() + sock = open("_darcs/third_party/latest-security", "w") + sock.write(f.id + "\n") + sock.close() hunk ./frugalware/xml/security.xml 9 - + hunk ./frugalware/xml/security.xml 32 - vmiklos + VMiklos } From desco at frugalware.org Sun Sep 3 21:31:13 2006 From: desco at frugalware.org (Miklos Nemeth) Date: Sun Sep 3 21:31:20 2006 Subject: [Frugalware-darcs] gfpm: beauty spaces Message-ID: <20060903193113.E150D4E88F9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=gfpm;a=darcs_commitdiff;h=20060903193013-3083d-eda4fff28b0fa0d8b755dbfa7b414ebeb0fc76af.gz; [beauty spaces Miklos Nemeth **20060903193013 added some space for frames looking better isn't it ] { hunk ./glade/gfpm.glade 5 - Date: Sat Sep 2 21:25:46 2006 - User: krics - Host: frugal64 + Date: Sun Sep 3 21:29:30 2006 + User: desco + Host: blfw hunk ./glade/gfpm.glade 12 - 5 hunk ./glade/gfpm.glade 58 + 3 hunk ./glade/gfpm.glade 88 + 4 hunk ./glade/gfpm.glade 136 + 5 hunk ./glade/gfpm.glade 179 + 5 hunk ./glade/gfpm.glade 276 - 1 + 5 } From vmiklos at frugalware.org Sun Sep 3 21:32:51 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 21:32:52 2006 Subject: [Frugalware-darcs] homepage-ng: frugalware/darcs-posthook-security.py: typo fix (to: address) Message-ID: <20060903193251.926744E88F8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903193223-e2957-908680a8b99fdac81baae48b7f28d944d348ee22.gz; [frugalware/darcs-posthook-security.py: typo fix (to: address) VMiklos **20060903193223] { hunk ./frugalware/darcs-posthook-security.py 79 - to = "frugalware-security@gmail.com" + to = "frugalware-security@frugalware.org" } From crazy at frugalware.org Sun Sep 3 21:33:47 2006 From: crazy at frugalware.org (crazy) Date: Sun Sep 3 21:33:52 2006 Subject: [Frugalware-darcs] frugalware-current: ede-1.1-1-i686 Message-ID: <20060903193349.053F44E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903192831-f6986-4914f20b5c124abf78e43f2768b34dd658276c13.gz; [ede-1.1-1-i686 crazy **20060903192831 * Version bump * new m8r * fixed depends()|rodepneds() * added patches for fw-defaults and other small fixes ( still needs some work ) * add an default theme and fw05 wallpaper * killed gcc3* compiled with gcc4.1* now * reworked FB ] { addfile ./source/x11-extra/ede/fw-defaults.patch hunk ./source/x11-extra/ede/FrugalBuild 1 -# Last Modified: Sun, 12 Mar 2006 23:11:31 +0100 +# Last Modified: Sun, 03 Sep 2006 21:27:39 +0200 hunk ./source/x11-extra/ede/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 hunk ./source/x11-extra/ede/FrugalBuild 7 -pkgver=1.0.4 +pkgver=1.1 hunk ./source/x11-extra/ede/FrugalBuild 11 -license="GPL2" -up2date="lynx -dump http://ede.sourceforge.net/page/download|grep -m1 'EDE'|sed 's/.*DE \(.*\) .*/\1/'|tr -d [:blank:]" -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - $pkgname.desktop xinitrc.$pkgname) -sha1sums=('22dfcb972ceef00fa4c79b971708b317095c612c' \ - 'd542ecc734fd30669e557fecc3026045cd469b09' \ - '21809e574d9b9ec838707dc31ecf879f9793ff6b') +depends=('efltk>=2.0.6') +makedepends=('imagemagick') +rodepends=('xorg-server' 'xsetroot' 'xscreensaver' 'xrdb' 'xmms' 'firefox') hunk ./source/x11-extra/ede/FrugalBuild 16 -makedepends=('gcc-3.3') -depends=('efltk') +license="GPL2" +up2date="lynx -dump http://ede.sourceforge.net/page/download|grep -m1 'EDE'|sed 's/.*DE \(.*\) .*/\1/'|tr -d [:blank:]" +source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \ + http://ede.sourceforge.net/themes/EdeAirlock/EdeAirlock.tar.bz2 \ + http://frugalware.org/~nadfoka/0.5/siwenna_boot.jpg \ + $pkgname.desktop xinitrc.$pkgname startede.patch fw-defaults.patch) +sha1sums=('e00356ad746c63aa0e1e98f9f5aeeff92eea7ae5' \ + 'caead6461b78f7d671d6f226dbd38162fc2e6949' \ + 'ffc6adfd93b6a268ce0635cec27b7a2821af0842' \ + 'd5e9f0923aa3e18277166c7a346bc49abd244b17' \ + '21809e574d9b9ec838707dc31ecf879f9793ff6b' \ + 'c8c0ae02b65031fddbe8fd6eca29ff31b754220e' \ + 'bc7cb26aee7fee94fb0a5263e8e10bd0c0492e1f') +# TODO: rework Menus, XX.png's and new desktop files, fw-theme hunk ./source/x11-extra/ede/FrugalBuild 34 - Fmkdir /usr/{bin,share/doc} - Fsed '$(LOCALEDIR)/' "$Fdestdir&" makeinclude.in - # Absolute path for g??-3.3 is required - CC=/usr/bin/gcc-3.3 CXX=/usr/bin/g++-3.3 Fbuild - Fln ../ede/doc /usr/share/doc/$pkgname-$pkgver + Fpatchall + Fmkdir usr/bin usr/share/pixmaps usr/share/$pkgname/{wallpapers,themes} + Fconf --disable-debug + make || Fdie + make LOCALEDIR="$Fdestdir/usr/share/locale" prefix="$Fdestdir/usr" install || Fdie + cd .. + /usr/bin/convert siwenna_boot.jpg -resize 1024x786 frugalware.jpg || Fdie + cd $pkgname hunk ./source/x11-extra/ede/FrugalBuild 44 + Fmv usr/share/$pkgname/doc/$pkgname.png usr/share/pixmaps + Fcpr EdeAirlock usr/share/$pkgname/themes/EdeAirlock + Fcpr siwenna_boot.jpg usr/share/$pkgname/wallpapers/1600x1200-frugalware.jpg + Fcpr frugalware.jpg usr/share/$pkgname/wallpapers/frugalware.jpg hunk ./source/x11-extra/ede/ede.desktop 2 - hunk ./source/x11-extra/ede/ede.desktop 5 -Exec=/usr/bin/startede +Exec=startede +Icon=/usr/share/pixmaps/ede.png hunk ./source/x11-extra/ede/ede.desktop 9 + hunk ./source/x11-extra/ede/fw-defaults.patch 1 +diff -Naur ede/datas/desktop-links/Makefile ede-fw/datas/desktop-links/Makefile +--- ede/datas/desktop-links/Makefile 2006-09-02 22:52:51.000000000 +0200 ++++ ede-fw/datas/desktop-links/Makefile 2006-09-03 20:58:12.865032240 +0200 +@@ -13,7 +13,7 @@ + desktopdir = $(datadir)/ede/.ede/desktop + + DESKTOPLINKS = \ +- Terminal.desktop ++ Terminal.desktop xmms.desktop Mozilla.desktop + + install: + $(MKINSTALLDIRS) $(desktopdir) +diff -Naur ede/datas/desktop-links/Mozilla.desktop ede-fw/datas/desktop-links/Mozilla.desktop +--- ede/datas/desktop-links/Mozilla.desktop 1970-01-01 01:00:00.000000000 +0100 ++++ ede-fw/datas/desktop-links/Mozilla.desktop 2006-09-03 20:58:12.866032088 +0200 +@@ -0,0 +1,8 @@ ++# EFLTK Configuration - Version 2,003000 ++ ++[Desktop Entry] ++ Name=Mozilla Firefox ++ Name[sk]=Mozilla Firefox ++ Exec=firefox ++ Icon=mozilla.png ++ +diff -Naur ede/datas/desktop-links/xmms.desktop ede-fw/datas/desktop-links/xmms.desktop +--- ede/datas/desktop-links/xmms.desktop 1970-01-01 01:00:00.000000000 +0100 ++++ ede-fw/datas/desktop-links/xmms.desktop 2006-09-03 20:58:12.867031936 +0200 +@@ -0,0 +1,8 @@ ++# EFLTK Configuration - Version 2,003000 ++ ++[Desktop Entry] ++ Name=X Multimedia System ++ Exec=xmms ++ Icon=xmms_classic.png ++ Name[sk]=X Multimedia System ++ +diff -Naur ede/datas/ede.conf ede-fw/datas/ede.conf +--- ede/datas/ede.conf 2006-09-02 22:52:51.000000000 +0200 ++++ ede-fw/datas/ede.conf 2006-09-03 21:02:06.634493880 +0200 +@@ -12,7 +12,8 @@ + Gridspacing=10 + Label Foreground=7 + Label Background=2037550592 +- OneClickExec=0 ++ OneClickExec=1 ++ AutoArrange=1 + + [Panel] + Volume Control=evolume +@@ -23,22 +24,22 @@ + CPUMonitor=true + SoundMixer=true + VariableWidthTaskbar=false +- ShowUsernameOnMenu=true ++ ShowUsernameOnMenu=false + ShowDesktop=true + AllDesktops=false + + [Desktop] +- Wallpaper= ++ Wallpaper=/usr/share/ede/wallpapers/frugalware.jpg + Color=RGB(76,108,178) + Opacity=205 +- Use=0 ++ Use=1 + + [Workspaces] + Count=4 + (null)=9@9 + + [Web] +- Browser=mozilla ++ Browser=firefox + + [Terminal] + Terminal=xterm +diff -Naur ede/datas/efltk.conf ede-fw/datas/efltk.conf +--- ede/datas/efltk.conf 2006-09-02 22:52:51.000000000 +0200 ++++ ede-fw/datas/efltk.conf 2006-09-03 20:58:12.868031784 +0200 +@@ -2,22 +2,22 @@ + + + [Images] +- State Effects=1 ++ State Effects=1 + + [Menus] +- Effects=0 ++ Effect Type=1 + Delay=0 +- Subwindow Effect=0 +- Effect Type=0 ++ Subwindow Effect=1 + Speed=1 ++ Effects=1 + + [Tooltips] +- Effects=0 +- Effect Type=0 +- Enabled=1 ++ Effect Type=1 + Delay=1 ++ Effects=1 ++ Enabled=1 + + [MDI] +- Animate=0 ++ Animate=1 + Opaque=0 + +diff -Naur ede/datas/mime.conf ede-fw/datas/mime.conf +--- ede/datas/mime.conf 2006-09-02 22:52:45.000000000 +0200 ++++ ede-fw/datas/mime.conf 2006-09-03 20:58:12.869031632 +0200 +@@ -1,5 +1,9 @@ + # EFLTK Configuration - Version 2.000300 + ++[.fpm] ++ Name=FPM Package ++ Exec= ++ + [.rpm] + Name=RPM Package + Exec=einstaller +@@ -22,11 +26,11 @@ + + [.html] + Name=Internet WWW page +- Exec=mozilla ++ Exec=firefox + + [.htm] + Name=Internet WWW page +- Exec=mozilla ++ Exec=firefox + + [.mp3] + Name=Music file compressed with MP3 method +diff -Naur ede/datas/programs-links/Mozilla.desktop ede-fw/datas/programs-links/Mozilla.desktop +--- ede/datas/programs-links/Mozilla.desktop 2006-09-02 22:52:51.000000000 +0200 ++++ ede-fw/datas/programs-links/Mozilla.desktop 2006-09-03 20:58:12.870031480 +0200 +@@ -1,8 +1,8 @@ + # EFLTK Configuration - Version 2,003000 + + [Desktop Entry] +- Name=Mozilla +- Name[sk]=Mozilla +- Exec=mozilla ++ Name=Mozilla Firefox ++ Name[sk]=Mozilla Firefox ++ Exec=firefox + Icon=mozilla.png + +diff -Naur ede/datas/wmanager.conf ede-fw/datas/wmanager.conf +--- ede/datas/wmanager.conf 2006-09-02 22:52:51.000000000 +0200 ++++ ede-fw/datas/wmanager.conf 2006-09-03 20:58:12.870031480 +0200 +@@ -8,8 +8,8 @@ + Draw gradient=1 + + [Resize] +- Opaque resize=0 + Animate=1 ++ Opaque resize=0 + Animate Speed=20 + + +@@ -32,3 +32,9 @@ + MinimizeWindow=Alt+F7 + MaximizeWindow=Alt+F8 + ++[Misc] ++ Use frame=0 ++ Frame color=RGB(0,0,128) ++ Use theme=1 ++ Theme path=/usr/share/ede/themes/EdeAirlock/default.theme ++ } From crazy at frugalware.org Sun Sep 3 21:39:33 2006 From: crazy at frugalware.org (crazy) Date: Sun Sep 3 21:39:34 2006 Subject: [Frugalware-darcs] frugalware-current: ede-1.1-1-i686 Message-ID: <20060903193933.5C4E54E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903193612-f6986-60e89879b68fe3dc134a6f1944d24a79394f3aa5.gz; [ede-1.1-1-i686 crazy **20060903193612 * hrrr forgot to add this one :S ] { addfile ./source/x11-extra/ede/startede.patch hunk ./source/x11-extra/ede/startede.patch 1 +diff -Naur ede/datas/startede.in ede-p/datas/startede.in +--- ede/datas/startede.in 2006-09-02 22:52:45.000000000 +0200 ++++ ede-p/datas/startede.in 2006-09-03 16:39:20.988236416 +0200 +@@ -6,7 +6,7 @@ + XSETROOT=`which xsetroot 2> /dev/null` + + userresources=$HOME/.Xdefaults +-sysresources=/usr/X11R6/lib/X11/xinit/.Xresources ++sysresources=/usr/lib/X11/xinit/.Xresources + + if [ -f $sysresources ]; then + xrdb -merge $sysresources +@@ -19,11 +19,8 @@ + PATH=$PATH:$PREFIX:$PREFIX/bin + export PATH + +-if [ -x $HOME/.ede ]; then +- echo "EDE home dir exists, ok." +-else +- echo "Default EDE home dir for user $HOME does not exist. Creating one..." +- cp -R $PREFIX/share/ede/.ede $HOME ++if [ ! -d $HOME/.ede ]; then ++ cp -R $PREFIX/share/ede/.ede $HOME + fi + + # If we have xsetroot than script shoult run it } From vmiklos at frugalware.org Sun Sep 3 21:52:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 21:52:42 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: call the -security poster, too Message-ID: <20060903195240.9CAC14E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903194838-e2957-65087af13b1e16d9ef50e940953f5c79ade340cb.gz; [fwng: call the -security poster, too VMiklos **20060903194838] { hunk ./frugalware/po/Makefile 11 + cd ../.. && python frugalware/darcs-posthook-security.py } From voroskoi at frugalware.org Sun Sep 3 22:32:15 2006 From: voroskoi at frugalware.org (voroskoi) Date: Sun Sep 3 22:32:17 2006 Subject: [Frugalware-darcs] frugalware-current: wmii-3.1-2-i686 Message-ID: <20060903203215.550444E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903202943-dd049-a58a23f07bd94bec90f204ae3cd71af41fa1e5fe.gz; [wmii-3.1-2-i686 voroskoi **20060903202943 added kdm entry, closes #812 ] { hunk ./source/x11-extra/wmii/FrugalBuild 1 -# Last Modified: Tue, 20 Jun 2006 17:23:35 +0200 +# Last Modified: Sun, 03 Sep 2006 22:02:38 +0200 hunk ./source/x11-extra/wmii/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/x11-extra/wmii/FrugalBuild 22 + Ffile /usr/share/apps/kdm/sessions/$pkgname.desktop } From boobaa at frugalware.org Sun Sep 3 23:01:48 2006 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Sep 3 23:01:50 2006 Subject: [Frugalware-darcs] homepage-ng: 0.5rc2 announce (hu_HU) Message-ID: <20060903210148.3EC384E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20060903205944-60d9d-90fc8416ca633409a65192a07adbcdc801098edd.gz; [0.5rc2 announce (hu_HU) CSÉCSY László **20060903205944] { hunk ./frugalware/xml/news_hu.xml 14 + + 43 + Megjelent a Frugalware 0.5rc2 (Siwenna) + Fri Sep 3 22:59:15 CEST 2006 + Boobaa + jelenti be a Frugalware 0.5rc2 azonnali elĂ©rhetƑsĂ©gĂ©t, mint a 0.5-ös verziĂł mĂĄsodik, kiadĂĄsra jelölt vĂĄltozatĂĄt.
    + Egy rövid, nem teljes lista a 0.5rc1 óta történt våltozåsokról:
    +
      +
    • GNOME frissĂ­tve 2.16 Release Candidate (2.15.92) verziĂłra
      • +
    • ~300 hibajavĂ­tĂĄs
      • +
    • FrissĂ­tett KDE Ă©s GRUB tĂ©mĂĄk
      • +
    • Több, mint 30 Ășj csomag: ntfs-3g, avifile, gnome-sharp, Ă©s Ă­gy tovĂĄbb!
      • +
    + BƑvebb információval a Testing ChangeLog szolgál.
    + Letöltés i686-ra:
    + MEGJEGYZÉS: A 3-9. CD-re Ă©s a 2. DVD-re csak akkor van szĂŒksĂ©g, ha nincs otthoni internet-kapcsolat
    + netinstall (21M), + cd1 (632M), + cd2 (641M), + cd3 (643M), + cd4 (640M), + cd5 (599M), + cd6 (630M), + cd7 (627M), + cd8 (417M), + cd9 (638M), + cd10 (128M), + dvd1 (4.2G) + dvd2 (1.2G) +
    + SHA1SUMS: + 
    +68b77bf880dcb5a05ba66ae9b80a7831d3fcbd8c  frugalware-0.5rc2-i686-cd10.iso
+65d73a3408d3a7e4a6f28b990c60be40706f265d  frugalware-0.5rc2-i686-cd1.iso
+0581700c2139059cee22f10c6b40561af9973d8f  frugalware-0.5rc2-i686-cd2.iso
+580bc19fa7bfcc509e075f1f337953a6da60f93a  frugalware-0.5rc2-i686-cd3.iso
+d1d78560f6f4c641621ac41c4f0e5c12d5d58a9d  frugalware-0.5rc2-i686-cd4.iso
+d72bfe2ffcd935b6d02bde576d78a5076651a2b5  frugalware-0.5rc2-i686-cd5.iso
+ffb7f8186dc804e8484082be72dfd340f83a9d8b  frugalware-0.5rc2-i686-cd6.iso
+045ed869c57eadebf172d38d506e5d775b41711c  frugalware-0.5rc2-i686-cd7.iso
+99062bdaed26566b95e78773ed3c045b5fac442a  frugalware-0.5rc2-i686-cd8.iso
+82da06750a859584804191889bd5c23e86f9edc9  frugalware-0.5rc2-i686-cd9.iso
+94f7a0a0a1d2a9d209a1f85ed251a0e78c128f36  frugalware-0.5rc2-i686-dvd1.iso
+e4397526607832e83684be5c7f88598242d05e75  frugalware-0.5rc2-i686-dvd2.iso
+fae88cc8378e2982a87761c0d97fdfbf42eb321c  frugalware-0.5rc2-i686-net.iso
+
    + ]]> +     +     } From vmiklos at frugalware.org Sun Sep 3 23:11:15 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 3 23:11:17 2006 Subject: [Frugalware-darcs] frugalware-current: docs/tech/security.txt: finish the xml part Message-ID: <20060903211115.5EE8E4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903201638-e2957-57b813538815db7424b4bdd60e41ae4b97be096b.gz; [docs/tech/security.txt: finish the xml part VMiklos **20060903201638] { hunk ./docs/tech/security.txt 7 +NOTE: As of the 0.5 release, it's no longer a plan! :) + hunk ./docs/tech/security.txt 23 -2) FIXME: updating the XML. +2) Update the frugalware/xml/security.xml file and check if the mail is sent to +the frugalware-security list. If not, then ask on -devel what can be the +problem. } From vmiklos at frugalware.org Mon Sep 4 00:17:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 00:17:43 2006 Subject: [Frugalware-darcs] pacman-tools: fwmirror: typo fix Message-ID: <20060903221742.A40164E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20060903221641-e2957-cb102faadc341f3bec9b302d9826a4e7c266f5b9.gz; [fwmirror: typo fix VMiklos **20060903221641 if more than one dir is excluded then we need --exclude for each dir thx boobaa for reporting the bug ] { hunk ./fwmirror 129 - rsync_opts="$rsync_opts --exclude /source/ /_darcs/" + rsync_opts="$rsync_opts --exclude /source/ --exclude /_darcs/" } From crazy at frugalware.org Mon Sep 4 00:42:54 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 00:42:57 2006 Subject: [Frugalware-darcs] frugalware-current: kde-frugalware-0.5.1-2-i686 Message-ID: <20060903224254.DD71B4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903223756-f6986-e12ebdd3afea3ca2c12163662992779400b80b07.gz; [kde-frugalware-0.5.1-2-i686 crazy **20060903223756 * relbump * now KDM Theme works with en|de|hu ( pls all test and report bugs ) * fixed 'Caps Lock' and 'Login Filed' in the Theme * some changes for the Login box and bar to make it looks good for all languages * removed a Face* entry from kdmrc and added SessionDirs= ] { hunk ./source/kde/kde-frugalware/FrugalBuild 1 -# Last Modified: Tue, 29 Aug 2006 14:02:30 +0200 +# Last Modified: Mon, 04 Sep 2006 00:34:28 +0200 hunk ./source/kde/kde-frugalware/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/kde/kde-frugalware/FrugalBuild 18 -sha1sums=('9588c0205207113a127d7d3e91ae8968e1f59db1') +sha1sums=('780983359189800999dee7299beeca43db6e6348') } From crazy at frugalware.org Mon Sep 4 01:06:53 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 01:06:57 2006 Subject: [Frugalware-darcs] frugalware-current: openexr-1.4.0a-1-i686 Message-ID: <20060903230653.CA16B4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903230402-f6986-38c8bc03665ebdfc6b8eae18491717e99f775a35.gz; [openexr-1.4.0a-1-i686 crazy **20060903230402 * Version bump ] { hunk ./source/xapps/openexr/FrugalBuild 1 -# Last modified: Thu, 31 Aug 2006 14:09:02 +0200 -# Compiling time: 0.36 SBU +# Last modified: Mon, 04 Sep 2006 01:01:54 +0200 +# Compiling time: 0.80 SBU hunk ./source/xapps/openexr/FrugalBuild 6 -pkgver=1.2.2 -realname=OpenEXR -pkgrel=3 +pkgver=1.4.0a +pkgrel=1 hunk ./source/xapps/openexr/FrugalBuild 13 -_F_cd_path="OpenEXR-$pkgver" -options=('force') -up2date="lynx -dump $url/downloads.html|grep source|sed 's/.* \([0-9\.]*\) .*/\1/;q'" -source=(http://savannah.nongnu.org/download/$pkgname/$realname-$pkgver.tar.gz $pkgname-$pkgver-gcc4.patch) -sha1sums=('8ee37cd2a95b8561a4c850cc35781dec87b77bbf' \ - 'ac7d7b9f660c161d110e320d95eb46879d422971') +_F_cd_path="$pkgname-${pkgver//a/}" +up2date="lynx -dump 'http://savannah.nongnu.org/download/openexr/?C=M;O=A'|grep openexr | grep -v images| Flasttar" +source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz \ + $pkgname-1.2.2-gcc4.patch) +sha1sums=('d7f2188b677ea28cafb104f2ace6c0f50b5aadee' \ + 'ac7d7b9f660c161d110e320d95eb46879d422971') } From desco at frugalware.org Mon Sep 4 01:45:09 2006 From: desco at frugalware.org (Miklos Nemeth) Date: Mon Sep 4 01:45:11 2006 Subject: [Frugalware-darcs] frugalware-current: openldev-0.6.1-1-i686 Message-ID: <20060903234509.9DF4C4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060903234420-3083d-b77a303653ca1f5861f84c0a619f9f09030fe80a.gz; [openldev-0.6.1-1-i686 Miklos Nemeth **20060903234420 new package ] { adddir ./source/xapps-extra/openldev addfile ./source/xapps-extra/openldev/FrugalBuild hunk ./source/xapps-extra/openldev/FrugalBuild 1 +# Last Modified: Mon, 04 Sep 2006 01:39:18 +0200 +# Compiling Time: 0.53 SBU +# Maintainer: Miklos Nemeth + +pkgname=openldev +pkgver=0.6.1 +pkgrel=1 +pkgdesc="GUI front-end to various development tools such as gcc, autotools and make" +url="openldev.sourceforge.net" +depends=('gtk+2' 'gtksourceview' 'vte' 'libgnomeui') +groups=('xapps-extra') +archs=('i686') +up2date="lynx -dump http://www.openldev.org/download.php | grep 'Sources.*openldev-' | sed 's/.*v-\([0-9.]*\).t.*/\1/'" +source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('277b7a36d9e2da32fc3f44d8f524ed4788f65ac5') + +build() +{ + cd openldev + Fbuild +} } From vmiklos at frugalware.org Mon Sep 4 02:05:51 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 02:05:53 2006 Subject: [Frugalware-darcs] frugalware-current: xmpppy-0.3.1-1-i686 Message-ID: <20060904000551.387B04E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904000352-e2957-db0dfbbea72eca9347443967fcc7a5a093974a0d.gz; [xmpppy-0.3.1-1-i686 VMiklos **20060904000352 new package ] { adddir ./source/devel-extra/xmpppy addfile ./source/devel-extra/xmpppy/FrugalBuild hunk ./source/devel-extra/xmpppy/FrugalBuild 1 +# Last Modified: Mon, 04 Sep 2006 00:56:24 +0200 +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=xmpppy +pkgver=0.3.1 +pkgrel=1 +pkgdesc="Library for hanling xmpp with python." +depends=('python') +groups=('devel-extra') +archs=('i686') +Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=97081|grep ']xmpppy '|sed 's/[^]]*][^]]*]\([^ ]*\) .*/\1/'" +sha1sums=('ff1ab7c3109213bcf2e9422158c3d2d0adc45642') + +build() +{ + Fcd + rm Makefile + Fbuild + Fdocrel doc +} } From vmiklos at frugalware.org Mon Sep 4 02:31:03 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 02:31:06 2006 Subject: [Frugalware-darcs] pacman-tools: generate a manpage for chkperm Message-ID: <20060904003103.5E46C4E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20060904001600-e2957-16d8995cdc55edc0bea44a83dc31a862d58f8a98.gz; [generate a manpage for chkperm VMiklos **20060904001600] { hunk ./Makefile 38 + help2man -n "controls upload rights for Frugalware packages" -S Frugalware -N ./chkperm |sed 's/\\(co/(c)/' \ + >chkperm.1 hunk ./Makefile 83 + $(INSTALL) -m644 chkperm.1 $(DESTDIR)$(man1dir) hunk ./chkperm.c 129 - printf("Usage: %s /path/to/teams.xml \n", argv[0]); + if(argc == 2 && !strcmp(argv[1], "--version")) + printf("chkperm (pacman-tools) 0.6.5\n\n" + "Copyright (c) 2006 by Miklos Vajna \n" + "This is free software; see the source for copying conditions. There is NO\n" + "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); + else if(argc == 2) + printf("Usage: %s /path/to/teams.xml \n", argv[0]); } From vmiklos at frugalware.org Mon Sep 4 02:31:02 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 02:31:07 2006 Subject: [Frugalware-darcs] pacman-tools: updates for 0.8.1 Message-ID: <20060904003102.E59A84E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20060904003035-e2957-e91ac213adf300630cfab7cabd2375ea9eb983ff.gz; [updates for 0.8.1 VMiklos **20060904003035] { hunk ./Makefile 19 -VERSION = 0.8.0 +VERSION = 0.8.1 hunk ./NEWS 3 +0.8.1 - new manpages: chkperm/fblint + - fix bug in fwmirror when source is not mirrored + - repoman: locking improvements + - fblint: don't be agressive against subdepends() + - added Polish translation } From vmiklos at frugalware.org Mon Sep 4 02:31:04 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 02:31:08 2006 Subject: [Frugalware-darcs] pacman-tools: generate a manpage for fblint Message-ID: <20060904003104.67C174E8C0F@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20060904002234-e2957-dafef6df2a48d0215c68242297b4519e8d2bb55f.gz; [generate a manpage for fblint VMiklos **20060904002234] { hunk ./Makefile 40 + help2man -n "searches for common FrugalBuild problems" -S Frugalware -N ./fblint |sed 's/\\(co/(c)/' >fblint.1 hunk ./Makefile 85 + $(INSTALL) -m644 fblint.1 $(DESTDIR)$(man1dir) hunk ./fblint 23 +myver="0.6.5" + hunk ./fblint 45 -if [ "$1" = "-h" ]; then - echo "fblint: searches for common FrugalBuild problems" - echo "usage: $0 [-h] | [-q] [-v] [-p]" +if [ "$1" = "--version" ]; then + echo "fblint (pacman-tools) $myver" + echo + echo "Copyright (c) 2006 by Miklos Vajna " + echo "This is free software; see the source for copying conditions. There is NO" + echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit 0 +fi + +if [ "$1" = "--help" ]; then + echo "usage: $0 [--help] | [--version] | [-q] [-v] [-p]" hunk ./fblint 59 - echo " -h this help" + echo " --help this help" + echo " --version version information" } From vmiklos at frugalware.org Mon Sep 4 02:31:03 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 02:31:09 2006 Subject: [Frugalware-darcs] pacman-tools: fix fwmirror/fblint's permission Message-ID: <20060904003103.D0D494E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20060904002825-e2957-e59f2f68fa6b3a5171f45723d58ef24d80cf129f.gz; [fix fwmirror/fblint's permission VMiklos **20060904002825] { hunk ./Makefile 37 + chmod +x fwmirror hunk ./Makefile 41 + chmod +x fblint } From vmiklos at frugalware.org Mon Sep 4 02:38:03 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 02:38:06 2006 Subject: [Frugalware-darcs] frugalware-current: pacman-tools-0.8.1-1-i686 Message-ID: <20060904003804.07C4C4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904003519-e2957-91969cb5ba8ad07cbcb46e587a51636738f969c5.gz; [pacman-tools-0.8.1-1-i686 VMiklos **20060904003519 version bump ] { hunk ./source/devel/pacman-tools/FrugalBuild 1 -# Last Modified: Mon, 21 Aug 2006 00:42:55 +0200 +# Last Modified: Mon, 04 Sep 2006 02:32:20 +0200 hunk ./source/devel/pacman-tools/FrugalBuild 6 -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.1 +pkgrel=1 } From crazy at frugalware.org Mon Sep 4 02:38:48 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 02:38:50 2006 Subject: [Frugalware-darcs] frugalware-current: kdelibs-3.5.4-2-i686 Message-ID: <20060904003848.DCD5B4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904003613-f6986-370cdb121a5737a15893dc953fd2e10af570ee96.gz; [kdelibs-3.5.4-2-i686 crazy **20060904003613 * rebuild with new openexr ] { hunk ./source/kde/kdelibs/FrugalBuild 1 -# Last modified: Wed, 02 Aug 2006 12:16:26 +0200 +# Last modified: Mon, 04 Sep 2006 02:29:00 +0200 hunk ./source/kde/kdelibs/FrugalBuild 9 -pkgrel=1 +pkgrel=2 hunk ./source/kde/kdelibs/FrugalBuild 12 - 'xfsprogs-acl' 'openexr' 'libidn' 'aspell' 'jasper' 'avahi' 'avahi-qt3' 'avahi-compat') + 'xfsprogs-acl' 'openexr>=1.4.0a' 'libidn' 'aspell' 'jasper' 'avahi' 'avahi-qt3' 'avahi-compat') hunk ./source/kde/kdelibs/FrugalBuild 56 - make apidox || return 1 + make apidox || Fdie } From vmiklos at frugalware.org Mon Sep 4 02:46:50 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 02:46:51 2006 Subject: [Frugalware-darcs] frugalware-current: activerecord-1.14.4-1-i686 Message-ID: <20060904004650.5E2274E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904004519-e2957-078f1ee9ad6cc446ed60980486059635f68f1868.gz; [activerecord-1.14.4-1-i686 VMiklos **20060904004519 version bump ] { hunk ./source/devel-extra/activerecord/FrugalBuild 1 -# Last Modified: Mon, 03 Jul 2006 08:24:30 +0200 +# Last Modified: Mon, 04 Sep 2006 02:44:49 +0200 hunk ./source/devel-extra/activerecord/FrugalBuild 6 -pkgver=1.14.3 +pkgver=1.14.4 hunk ./source/devel-extra/activerecord/FrugalBuild 13 -sha1sums=('7e4a5914ac52f0d5e6dfc42271dfa5ce7a261afd') hunk ./source/devel-extra/activerecord/FrugalBuild 15 +sha1sums=('c8c22eebbce894f99e6fee7394a1160402fea510') } From vmiklos at frugalware.org Mon Sep 4 02:51:03 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 02:51:05 2006 Subject: [Frugalware-darcs] frugalware-current: actionwebservice-1.1.6-1-i686 Message-ID: <20060904005103.4B2834E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904004931-e2957-6586230f615d2cbbd10af7c264b53d1a80e266f2.gz; [actionwebservice-1.1.6-1-i686 VMiklos **20060904004931 version bump ] { hunk ./source/devel-extra/actionwebservice/FrugalBuild 1 -# Last Modified: Mon, 03 Jul 2006 08:30:55 +0200 +# Last Modified: Mon, 04 Sep 2006 02:49:19 +0200 hunk ./source/devel-extra/actionwebservice/FrugalBuild 6 -pkgver=1.1.4 +pkgver=1.1.6 hunk ./source/devel-extra/actionwebservice/FrugalBuild 15 -sha1sums=('066af0a62ba319855ec8e533a2ddfa24851552c4') +sha1sums=('d2710a67e48cff1c4cb46ad4ee406b015dd0dea2') } From vmiklos at frugalware.org Mon Sep 4 03:02:06 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 03:02:10 2006 Subject: [Frugalware-darcs] frugalware-current: actionpack-1.12.5-1-i686 Message-ID: <20060904010206.94F7A4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904005959-e2957-3509426e2c357abea2461869e5de82ecda7f5f80.gz; [actionpack-1.12.5-1-i686 VMiklos **20060904005959 version bump ] { hunk ./source/devel-extra/actionpack/FrugalBuild 1 -# Last Modified: Mon, 03 Jul 2006 08:10:12 +0200 +# Last Modified: Mon, 04 Sep 2006 02:57:15 +0200 hunk ./source/devel-extra/actionpack/FrugalBuild 6 -pkgver=1.12.3 +pkgver=1.12.5 hunk ./source/devel-extra/actionpack/FrugalBuild 13 -sha1sums=('28b3d415b64bde2760728579345bcbf2522cfd94') hunk ./source/devel-extra/actionpack/FrugalBuild 15 +sha1sums=('e15ade7da2609a24a972c210258593b6f78c3838') } From crazy at frugalware.org Mon Sep 4 03:50:42 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 03:50:45 2006 Subject: [Frugalware-darcs] frugalware-current: kdegraphics-3.5.4-3-i686 Message-ID: <20060904015043.07EF14E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904014805-f6986-fb666458feceff578920893005f29604dbb7eb23.gz; [kdegraphics-3.5.4-3-i686 crazy **20060904014805 * rebuild with new openexr ] { hunk ./source/kde/kdegraphics/FrugalBuild 1 -# Last Modified: Wed, 09 Aug 2006 00:24:02 +0200 +# Last Modified: Mon, 04 Sep 2006 03:42:25 +0200 hunk ./source/kde/kdegraphics/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/kde/kdegraphics/FrugalBuild 12 - 'fribidi' 'poppler-qt' 'xespgs' 'xpdf' 'urw-fonts' 'openexr>=1.2.2-2') + 'fribidi' 'poppler-qt' 'xespgs' 'xpdf' 'urw-fonts' 'openexr>=1.4.0a') } From crazy at frugalware.org Mon Sep 4 04:04:49 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 04:04:50 2006 Subject: [Frugalware-darcs] frugalware-current: yafray-0.0.9-2-i686 Message-ID: <20060904020449.2C43E4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904020210-f6986-69e2d649771006a7e5e33395527980e99f825e4e.gz; [yafray-0.0.9-2-i686 crazy **20060904020210 * rebuild with new openexr ] { hunk ./source/xapps/yafray/FrugalBuild 1 -# Last Modified: Wed, 19 Jul 2006 11:36:52 +0200 +# Last Modified: Mon, 04 Sep 2006 04:00:02 +0200 hunk ./source/xapps/yafray/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xapps/yafray/FrugalBuild 10 -depends=('openexr' 'libjpeg' 'zlib' 'libstdc++') +depends=('openexr>=1.4.0a' 'libjpeg' 'zlib' 'libstdc++') } From crazy at frugalware.org Mon Sep 4 05:34:01 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 05:34:04 2006 Subject: [Frugalware-darcs] frugalware-current: blender-2.42a-2-i686 Message-ID: <20060904033401.64AB64E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904032723-f6986-fb66d99dac20f53d7ccc71ad61dc87a5e6dca20a.gz; [blender-2.42a-2-i686 crazy **20060904032723 * rebuild with new openexr ] { hunk ./source/xapps-extra/blender/FrugalBuild 1 -# Last Modified: Sat, 29 Jul 2006 15:03:52 +0200 +# Last Modified: Mon, 04 Sep 2006 05:24:46 +0200 hunk ./source/xapps-extra/blender/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/xapps-extra/blender/FrugalBuild 11 -depends=('mesa' 'gettext' 'freealut' 'libjpeg' 'libpng' 'python' 'ffmpeg' 'openexr' 'libtiff') +depends=('mesa' 'gettext' 'freealut' 'libjpeg' 'libpng' 'python' 'ffmpeg' 'openexr>=1.4.0a' 'libtiff') } From crazy at frugalware.org Mon Sep 4 06:02:03 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 06:02:07 2006 Subject: [Frugalware-darcs] frugalware-current: fontconfig-2.3.96-1-i686 Message-ID: <20060904040204.590624E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904035659-f6986-8264499d091c9681548f17fe99b4ad2fce5db155.gz; [fontconfig-2.3.96-1-i686 crazy **20060904035659 * Version bump * removed patches in upstream now * added a new one to fu***** stop this weird saw bold warning now its warn about 'saw bool expected unknow' ... * synced confs with upstream * readded docs * some FB cleanups ] { hunk ./source/lib/fontconfig/fontconfig-2.3.95-ttf-collections.patch 1 ---- fontconfig-2.3.95/src/ftglue.c.ttf-collections 2006-06-02 12:31:02.000000000 -0400 -+++ fontconfig-2.3.95/src/ftglue.c 2006-06-02 12:31:38.000000000 -0400 -@@ -290,7 +290,7 @@ - if ( tag == the_tag ) - { - LOG(( "TrueType table (start: %ld) (size: %ld)\n", start, size )); -- error = ftglue_stream_seek( stream, offset+start ); -+ error = ftglue_stream_seek( stream, start ); - goto FoundIt; - } - } rmfile ./source/lib/fontconfig/fontconfig-2.3.95-ttf-collections.patch hunk ./source/lib/fontconfig/fontconfig-2.4-cmap-parsing.patch 1 ---- fontconfig-2.3.95/src/fcfreetype.c.cmap-parsing 2006-04-25 11:31:41.000000000 -0400 -+++ fontconfig-2.3.95/src/fcfreetype.c 2006-05-18 08:14:09.000000000 -0400 -@@ -2511,31 +2511,12 @@ - } - else - { -- FT_UInt gindex; -- -- /* -- * Find the first encoded character in the font -- */ -- if (FT_Get_Char_Index (face, 0)) -+ page = ~0; -+ leaf = NULL; -+ ucs4 = FT_Get_First_Char (face, &glyph); -+ while (glyph != 0) - { -- ucs4 = 0; -- gindex = 1; -- } -- else -- { -- ucs4 = FT_Get_Next_Char (face, 0, &gindex); -- if (!ucs4) -- gindex = 0; -- } -- -- while (gindex) -- { -- page = ucs4 >> 8; -- leaf = 0; -- while ((ucs4 >> 8) == page) -- { -- glyph = FT_Get_Char_Index (face, ucs4); -- if (glyph && FcFreeTypeCheckGlyph (face, ucs4, -+ if (FcFreeTypeCheckGlyph (face, ucs4, - glyph, blanks, &advance)) - { - if (advance) -@@ -2558,8 +2539,9 @@ - } - } - -- if (!leaf) -+ if ((ucs4 >> 8) != page) - { -+ page = (ucs4 >> 8); - leaf = FcCharSetFindLeafCreate (fcs, ucs4); - if (!leaf) - goto bail1; -@@ -2571,11 +2553,7 @@ - font_max = ucs4; - #endif - } -- ucs4++; -- } -- ucs4 = FT_Get_Next_Char (face, ucs4 - 1, &gindex); -- if (!ucs4) -- gindex = 0; -+ ucs4 = FT_Get_Next_Char (face, ucs4, &glyph); - } - #ifdef CHECK - for (ucs4 = 0; ucs4 < 0x10000; ucs4++) rmfile ./source/lib/fontconfig/fontconfig-2.4-cmap-parsing.patch addfile ./source/lib/fontconfig/tmp-mute-saw-weird-warning.patch hunk ./source/lib/fontconfig/FrugalBuild 1 -# Last modified: Fri, 23 Jun 2006 00:49:54 +0200 +# Last modified: Mon, 04 Sep 2006 05:47:11 +0200 hunk ./source/lib/fontconfig/FrugalBuild 7 -pkgver=2.3.95 -pkgrel=7 +pkgver=2.3.96 +pkgrel=1 hunk ./source/lib/fontconfig/FrugalBuild 16 - fontconfig-2.3.95-ttf-collections.patch fontconfig-2.4-cmap-parsing.patch \ hunk ./source/lib/fontconfig/FrugalBuild 19 - frugalware.conf) -sha1sums=('0349b0dea46e58ac6db370f344596d7ac6f31a01' \ - '178a667c3759424d2208ea3d29fda5f3e53c7c69' \ - 'c55837104cd160d52b69fe1a144a9717ca9e16cc' \ - '8791c0f7879b368842ac26f134c37750ba2c93c1' \ + frugalware.conf tmp-mute-saw-weird-warning.patch) +sha1sums=('6486a7fa87c5a1bde161affbc1e387f1248e9611' \ + '2078374b8cbabcf2228500264335602869725bba' \ hunk ./source/lib/fontconfig/FrugalBuild 26 - 'db1d01d8910b5d54303539f921fca486157f4f98') + 'db1d01d8910b5d54303539f921fca486157f4f98' \ + '8ea9a225bc6aa75d037d9b77e5f3db9acc969008') + hunk ./source/lib/fontconfig/FrugalBuild 34 - Fcd - Fautoconfize hunk ./source/lib/fontconfig/FrugalBuild 35 - Fbuild --with-add-fonts=/usr/lib/X11/fonts --enable-libxml2 --disable-docs - Fmkdir /etc/fonts/frugalware.d + Fbuild --with-add-fonts=/usr/lib/X11/fonts --enable-libxml2 + Fmkdir etc/fonts/frugalware.d usr/share/doc/$pkgname-$pkgver/html etc/fonts/conf.d/disabled hunk ./source/lib/fontconfig/FrugalBuild 40 - Fmv etc/fonts/conf.d/10-fonts-persian.conf /etc/fonts/frugalware.d/ - Fmkdir /etc/fonts/conf.d/disabled - Fmv etc/fonts/conf.d/*.conf /etc/fonts/conf.d/disabled/ + Fmv etc/fonts/conf.d/10-fonts-persian.conf etc/fonts/frugalware.d + Fmv etc/fonts/conf.d/60-delicious.conf etc/fonts/frugalware.d + Fmv etc/fonts/conf.d/10LohitGujarati.conf etc/fonts/frugalware.d + Fmv etc/fonts/conf.d/*.conf etc/fonts/conf.d/disabled + ## weird + Fmv usr/share/doc/$pkgname/$pkgname-devel/* usr/share/doc/$pkgname-$pkgver/html + Frm usr/share/doc/$pkgname/$pkgname-devel + Fmv usr/share/doc/$pkgname/* usr/share/doc/$pkgname-$pkgver + Frm usr/share/doc/$pkgname hunk ./source/lib/fontconfig/fontconfig.install 10 - /usr/bin/fc-cache --force --system-only --really-force + /usr/bin/fc-cache --force --system-only hunk ./source/lib/fontconfig/fontconfig.install 14 + +pre_upgrade() +{ + ## not valid with 2.3.96 anymore now its has such a + ## xxxx-$ARCH.cache-2 + /usr/bin/rm -f /var/cache/fontconfig/*.cache-2 2>/dev/null >/dev/null +} hunk ./source/lib/fontconfig/fonts.conf 31 + + + /var/cache/fontconfig + ~/.fontconfig + + hunk ./source/lib/fontconfig/fonts.conf 94 - FreeSerif hunk ./source/lib/fontconfig/fonts.conf 95 + FreeSerif hunk ./source/lib/fontconfig/fonts.conf 116 - FreeSans hunk ./source/lib/fontconfig/fonts.conf 117 + FreeSans hunk ./source/lib/fontconfig/fonts.conf 315 - FreeSerif hunk ./source/lib/fontconfig/fonts.conf 320 + FreeSerif hunk ./source/lib/fontconfig/fonts.conf 336 - FreeSans hunk ./source/lib/fontconfig/fonts.conf 342 + FreeSans hunk ./source/lib/fontconfig/fonts.conf 357 - FreeMono hunk ./source/lib/fontconfig/fonts.conf 360 + FreeMono hunk ./source/lib/fontconfig/tmp-mute-saw-weird-warning.patch 1 +diff -Naur fontconfig-2.3.96/src/fcxml.c fontconfig-2.3.96-p/src/fcxml.c +--- fontconfig-2.3.96/src/fcxml.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcxml.c 2006-09-04 05:42:33.971217112 +0200 +@@ -545,8 +545,9 @@ + if ((value == FcTypeLangSet && type == FcTypeString) || + (value == FcTypeString && type == FcTypeLangSet)) + return; +- FcConfigMessage (parse, FcSevereWarning, "saw %s, expected %s", ++ /* FcConfigMessage (parse, FcSevereWarning, "saw %s, expected %s", + FcTypeName (value), FcTypeName (type)); ++ */ + } + } + } From krics at linuxforum.hu Mon Sep 4 07:41:33 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 07:41:39 2006 Subject: [Frugalware-darcs] frugalware-current: dasher-4.2.0-1-x86_64 Message-ID: <20060904054133.D89D04E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904054156-d209c-13afd179fda8c5f1d4179f4882d42cc89f80d25d.gz; [dasher-4.2.0-1-x86_64 Christian Hamar alias krix **20060904054156 * Version bump ] { hunk ./source/gnome/dasher/FrugalBuild 1 -# Last Modified: Fri, 25 Aug 2006 11:05:20 +0100 +# Last Modified: Mon, 04 Sep 2006 07:37:12 +0200 hunk ./source/gnome/dasher/FrugalBuild 6 -pkgver=4.1.10 +pkgver=4.2.0 hunk ./source/gnome/dasher/FrugalBuild 17 -sha1sums=('c21e5437a9d027ea81a434f038b36229e6fecb03') +sha1sums=('29db12f0e34d200dbc76e11e3dffa8a187487be6') } From krics at linuxforum.hu Mon Sep 4 08:58:29 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 08:58:32 2006 Subject: [Frugalware-darcs] frugalware-current: fpc-bin-2.0.4-1-x86_64 Message-ID: <20060904065829.7781C4F04E3@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904065825-d209c-4b1dcae2ceb475234301b27e589a1f9b9c3911c3.gz; [fpc-bin-2.0.4-1-x86_64 Christian Hamar alias krix **20060904065825 * Version bump ] { hunk ./source/devel-extra/fpc-bin/FrugalBuild 1 -# Last Modified: Mon, 13 Mar 2006 19:13:37 +0100 +# Last Modified: Mon, 04 Sep 2006 08:49:39 +0200 hunk ./source/devel-extra/fpc-bin/FrugalBuild 6 -pkgver=2.0.2 +pkgver=2.0.4 hunk ./source/devel-extra/fpc-bin/FrugalBuild 20 - sha1sums=('d1402f8465362571d0f5a5576b7c5734ec343bb0') + sha1sums=('60526f416cbe7b50683def1284d3a0ceec3e7f72') hunk ./source/devel-extra/fpc-bin/FrugalBuild 24 -build() -{ +build() { hunk ./source/devel-extra/fpc-bin/FrugalBuild 43 -# vim: ft=sh - } From vmiklos at frugalware.org Mon Sep 4 09:35:08 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 09:35:11 2006 Subject: [Frugalware-darcs] pacman-tools: repoman del: typo fix Message-ID: <20060904073508.7C5F84E88F9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20060904073418-e2957-97801a3f3652b7350624bd7318c005a5a1157a4e.gz; [repoman del: typo fix VMiklos **20060904073418 thx crazy for reporting the issue, Alex for testing the patch ] { hunk ./Makefile 19 -VERSION = 0.8.1 +VERSION = 0.8.2 hunk ./NEWS 3 +0.8.2 - bugfix for repoman del hunk ./repoman 38 - ssh $lopts $host "cd $path_to_repo; if [ ! -e _darcs/lock ]; then sudo -u $sudouser rm $rmopts $file; else echo \"Couldn't get lock.\"; fi" + ssh $lopts $host "cd $path_to_repo; if [ ! -e _darcs/lock ]; then sudo -u $sudouser rm $rmopts $path_to_repo/$file; else echo \"Couldn't get lock.\"; fi" } From krics at linuxforum.hu Mon Sep 4 09:38:00 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 09:38:02 2006 Subject: [Frugalware-darcs] frugalware-current: fpc-2.0.4-1-x86_64 Message-ID: <20060904073801.084B24E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904073740-d209c-4ad5ee7e6f9fe4f2f2664bc3390bacca281dbf67.gz; [fpc-2.0.4-1-x86_64 Christian Hamar alias krix **20060904073740 * Version bump * Reworked FB (now enough some make all && make install) ] { hunk ./source/devel-extra/fpc/FrugalBuild 1 -# Last Modified: Sun, 18 Sep 2005 01:13:30 +0200 -# Compiling Time: ~1.01 SBU +# Last Modified: Mon, 04 Sep 2006 09:34:34 +0200 +# Compiling Time: 1.14 SBU hunk ./source/devel-extra/fpc/FrugalBuild 6 -pkgver=2.0.0 +pkgver=2.0.4 hunk ./source/devel-extra/fpc/FrugalBuild 16 -source=(ftp://ftp.freepascal.org/pub/fpc/dist/source-$pkgver/$pkgname-$pkgver.source.tar.gz) -sha1sums=('074dc87fdc866c0380e8b836be9b16d1931d8228') -GZIP=1 +source=(ftp://ftp.freepascal.org/pub/fpc/dist/source-$pkgver/${pkgname}build-$pkgver.tar.gz) +sha1sums=('69258600bf07a428549da70f190fbf8ff8af2f51') hunk ./source/devel-extra/fpc/FrugalBuild 19 -build() -{ -# define ppc +build() { +# define binary name hunk ./source/devel-extra/fpc/FrugalBuild 22 - ppcname="ppcx86" + ppcname="ppcx64" hunk ./source/devel-extra/fpc/FrugalBuild 26 - Fcd $pkgname || return 1 -# making fpc all component - NEWPP=`pwd`/compiler/$ppcname || return 1 - NEWFPDOC=`pwd`/utils/fpdoc/fpdoc || return 1 - make compiler_cycle || return 1 - make rtl_clean rtl_smart FPC=${NEWPP} || return 1 - make packages_base_smart FPC=${NEWPP} || return 1 - make fcl_smart FPC=${NEWPP} || return 1 - make fv_smart FPC=${NEWPP} || return 1 - make packages_extra_smart FPC=${NEWPP} || return 1 - make ide_all FPC=${NEWPP} || return 1 - make utils_all FPC=${NEWPP} || return 1 - make demo FPC=${NEWPP} || return 1 -if [ -z ${NODOCS} ]; then - make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC} || return 1 -fi -# installing component - NEWPP=`pwd`/compiler/$ppcname - INSTALLOPTS="FPC=${NEWPP} INSTALL_PREFIX=$Fdestdir/usr" || return 1 - make compiler_distinstall ${INSTALLOPTS} || return 1 - make rtl_distinstall ${INSTALLOPTS} || return 1 - make packages_distinstall ${INSTALLOPTS} || return 1 - make fcl_distinstall ${INSTALLOPTS} || return 1 - make fv_distinstall ${INSTALLOPTS} || return 1 - make ide_distinstall ${INSTALLOPTS} || return 1 - make utils_distinstall ${INSTALLOPTS} || return 1 - make doc_install ${INSTALLOPTS} || return 1 - make man_install ${INSTALLOPTS} INSTALL_MANDIR=$Fdestdir/usr/man || return 1 -if [ -z ${NODOCS} ]; then - make -C docs pdfinstall ${INSTALLOPTS} INSTALL_DOCDIR=$Fdestdir/usr/share/doc/$pkgname-$pkgver || return 1 -fi -# create symlink + Fcd ${pkgname}build_${pkgver}_exp + NEWPP=`pwd`/fpcsrc/compiler/$ppcname + NEWFPDOC=`pwd`/fpcsrc/utils/fpdoc/fpoc + make all || Fdie + NEWPP=`pwd`/fpcsrc/compiler/$ppcname + INSTALLOPTS="FPC=${NEWPP} INSTALL_PREFIX=$Fdestdir/usr" + make $INSTALLOPTS install || Fdie hunk ./source/devel-extra/fpc/FrugalBuild 38 -# vim: ft=sh - } From vmiklos at frugalware.org Mon Sep 4 09:39:06 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Sep 4 09:39:08 2006 Subject: [Frugalware-darcs] frugalware-current: pacman-tools-0.8.2-1-i686 Message-ID: <20060904073907.042E14E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904073712-e2957-637f5d3ba6816cf8eaee913ccdad1879a933a2d8.gz; [pacman-tools-0.8.2-1-i686 VMiklos **20060904073712 version bump ] { hunk ./source/devel/pacman-tools/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 02:32:20 +0200 +# Last Modified: Mon, 04 Sep 2006 09:36:47 +0200 hunk ./source/devel/pacman-tools/FrugalBuild 6 -pkgver=0.8.1 +pkgver=0.8.2 } From krics at linuxforum.hu Mon Sep 4 09:57:10 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 09:57:13 2006 Subject: [Frugalware-darcs] frugalware-current: fpc-bin-2.0.4-1-i686 Message-ID: <20060904075710.C24034E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904075650-d209c-0406a34ebfa720776f185d1147469f54126d6344.gz; [fpc-bin-2.0.4-1-i686 Christian Hamar alias krix **20060904075650 * Fixed i686 sha1sum (now syncpkgd can build this) ] { hunk ./source/devel-extra/fpc-bin/FrugalBuild 17 - sha1sums=('2800c9e3efaa0b769cb56b0cf987312f03d07f8f') + sha1sums=('3e3796e4c91709658b007189317ed196fcfce74f') } From voroskoi at frugalware.org Mon Sep 4 10:12:16 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 4 10:12:18 2006 Subject: [Frugalware-darcs] frugalware-current: cups-1.2.3-1-i686 Message-ID: <20060904081216.998DC4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904080824-dd049-da6b0e98ddbfbbb1a0225fbe295aa4e867031607.gz; [cups-1.2.3-1-i686 voroskoi **20060904080824 version bump changed mirror ] { hunk ./source/apps/cups/FrugalBuild 1 -# Last Modified: Thu, 20 Jul 2006 20:47:16 +0200 +# Last Modified: Mon, 04 Sep 2006 09:26:59 +0200 hunk ./source/apps/cups/FrugalBuild 7 -pkgver=1.2.2 +pkgver=1.2.3 hunk ./source/apps/cups/FrugalBuild 16 -source=(ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/$pkgname/$pkgver/cups-$pkgver-source.tar.bz2 \ +source=(ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/$pkgver/cups-$pkgver-source.tar.bz2 \ hunk ./source/apps/cups/FrugalBuild 18 -sha1sums=('c392e216e1eaa0d5dee437056d70c3457a93e35c' \ +sha1sums=('acba5fab912654bd2202d1a3c3d55264048ec108' \ } From alex at alex-smith.me.uk Mon Sep 4 10:21:04 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Sep 4 10:21:13 2006 Subject: [Frugalware-darcs] frugalware-current: dhcp-3.0.4-4-x86_64 Message-ID: <20060904082106.705544E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904091837-46e39-9ce2de05d001e3965acbabd1479d802a9eaf87cf.gz; [dhcp-3.0.4-4-x86_64 AlexExtreme **20060904091837 * Added a dhclient.conf which sets some sane defaults ] { hunk ./source/network/dhcp/FrugalBuild 1 -# Last Modified: Mon, 14 Aug 2006 07:45:20 +0100 +# Last Modified: Mon, 04 Sep 2006 10:14:44 +0100 hunk ./source/network/dhcp/FrugalBuild 7 -pkgrel=3 +pkgrel=4 hunk ./source/network/dhcp/FrugalBuild 17 - rc.dhcpd rc.dhcpd-hu.po README.Frugalware $pkgname-$pkgver-networkmanager-fixes.patch) + rc.dhcpd rc.dhcpd-hu.po README.Frugalware $pkgname-$pkgver-networkmanager-fixes.patch dhclient.conf) hunk ./source/network/dhcp/FrugalBuild 19 - '78b0defcc0dbdc85b947bdf9c0037b0530358a32' \ - 'fd70ba41e16c15d69529eeb216be103e042f3437' \ - '0aa3103883d0df5d9aa56defb39b22966af35a60' \ - 'ff249ec72b41dc0050348feb2aa205a63a857f6f') + '78b0defcc0dbdc85b947bdf9c0037b0530358a32' \ + 'fd70ba41e16c15d69529eeb216be103e042f3437' \ + '0aa3103883d0df5d9aa56defb39b22966af35a60' \ + 'ff249ec72b41dc0050348feb2aa205a63a857f6f' \ + 'ce6545dad5c371b269da8f689f6d3599feefc4da') hunk ./source/network/dhcp/FrugalBuild 57 - Ffile $pkgname-$pkgver/client/dhclient.conf /etc/dhclient.conf - Fsed "/etc/dhclient-script" "/sbin/dhclient-script" $Fdestdir/etc/dhclient.conf - Fsed "\(.*\)" "# \1" $Fdestdir/etc/dhclient.conf + Ffile dhclient.conf /etc/dhclient.conf + #Ffile $pkgname-$pkgver/client/dhclient.conf /etc/dhclient.conf + #Fsed "/etc/dhclient-script" "/sbin/dhclient-script" $Fdestdir/etc/dhclient.conf + #Fsed "\(.*\)" "# \1" $Fdestdir/etc/dhclient.conf addfile ./source/network/dhcp/dhclient.conf hunk ./source/network/dhcp/dhclient.conf 1 +# send host-name "andare.fugue.com"; +# send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; +# send dhcp-lease-time 3600; +# supersede domain-name "fugue.com home.vix.com"; +# retry 60; +# reboot 10; +# select-timeout 5; +# initial-interval 2; +# media "-link0 -link1 -link2", "link0 link1"; +# reject 192.33.137.209; +# +# alias { +# interface "ep0"; +# fixed-address 192.5.5.213; +# option subnet-mask 255.255.255.255; +# } +# +# lease { +# interface "ep0"; +# fixed-address 192.33.137.200; +# medium "link0 link1"; +# option host-name "andare.swiftmedia.com"; +# option subnet-mask 255.255.255.0; +# option broadcast-address 192.33.137.255; +# option routers 192.33.137.250; +# option domain-name-servers 127.0.0.1; +# renew 2 2000/1/12 00:00:01; +# rebind 2 2000/1/12 00:00:01; +# expire 2 2000/1/12 00:00:01; +# } + +prepend domain-name-servers 127.0.0.1; +request subnet-mask, broadcast-address, time-offset, + routers, domain-name, domain-name-servers, + host-name, netbios-name-servers, netbios-scope; +require subnet-mask, domain-name-servers; +timeout 20; +script "/sbin/dhclient-script"; } From krics at linuxforum.hu Mon Sep 4 10:23:25 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 10:23:30 2006 Subject: [Frugalware-darcs] frugalware-current: vice-1.20-1-x86_64 Message-ID: <20060904082325.62B904E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904082321-d209c-381d6e4846b21e3d0882b7eeed6693b4e7c67b01.gz; [vice-1.20-1-x86_64 Christian Hamar alias krix **20060904082321 * Version bump * Added some options to configure ] { hunk ./source/xapps-extra/vice/FrugalBuild 1 -# Last Modified: Sun, 26 Feb 2006 20:29:21 +0100 +# Last Modified: Mon, 04 Sep 2006 10:19:40 +0200 hunk ./source/xapps-extra/vice/FrugalBuild 11 -pkgver=1.19 +pkgver=1.20 hunk ./source/xapps-extra/vice/FrugalBuild 15 -depends=('esd' 'libxv' 'libstdc++' 'readline' 'libxaw' 'libpng' 'libxt' 'bdftopcf' 'mkfontdir') +depends=('esd' 'libxv' 'libstdc++' 'readline' 'libxaw' \ + 'libpng' 'libxt' 'bdftopcf' 'mkfontdir' 'libjpeg' 'libungif') hunk ./source/xapps-extra/vice/FrugalBuild 22 -sha1sums=('8620d891fa9de29eb21e334f3c7c8254e89e80a9') +sha1sums=('ab24d4cda34e93eb8663337af127402cc6ccaa6a') +Fconfopts="$Fconfopts --enable-ethernet --enable-textfield --disable-dependency-tracking" hunk ./source/xapps-extra/vice/FrugalBuild 25 -# optimalization OK +# optimization OK } From krics at linuxforum.hu Mon Sep 4 10:46:54 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 10:46:57 2006 Subject: [Frugalware-darcs] frugalware-current: scite-1.71-1-x86_64 Message-ID: <20060904084655.0B65C4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904084711-d209c-54bda9ff2e9455eb6c4afd55d60340ca1728ccd2.gz; [scite-1.71-1-x86_64 Christian Hamar alias krix **20060904084711 * Version bump * Using sourceforge for source() * Fixed source URI() ] { hunk ./source/xapps-extra/scite/FrugalBuild 1 -# Last modified: Wed, 19 Jul 2006 11:10:13 +0200 -# Compiling time: 0.4 SBU +# Last modified: Mon, 04 Sep 2006 10:46:21 +0200 +# Compiling time: 0.25 SBU hunk ./source/xapps-extra/scite/FrugalBuild 6 -pkgver=1.70 -pkgrel=2 +pkgver=1.71 +pkgrel=1 hunk ./source/xapps-extra/scite/FrugalBuild 13 -#source=(http://heanet.dl.sourceforge.net/sourceforge/scintilla/$pkgname.tgz) -source=(http://frugalware.org/~gimb/download/$pkgname.tar.bz2) +source=(http://heanet.dl.sourceforge.net/sourceforge/scintilla/scite`echo $pkgver | sed -e 's/\.//g'`.tgz) hunk ./source/xapps-extra/scite/FrugalBuild 16 -sha1sums=('2b68004a9d1c99164a43b2c219fe97af5baeaa94') +sha1sums=('5cc1cce7ab5dc7723f36306af6d6fff5d81bc68c') } From crazy at frugalware.org Mon Sep 4 13:00:43 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 13:00:45 2006 Subject: [Frugalware-darcs] frugalware-current: k3d-0.6.0.0-2-i686 Message-ID: <20060904110043.4AAC04E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904105702-f6986-d84f8f0938aea50f8409e71d9fcb1a4097bff714.gz; [k3d-0.6.0.0-2-i686 crazy **20060904105702 * rebuild with new openexr ] { hunk ./source/xapps-extra/k3d/FrugalBuild 1 -# Last Modified: Sat, 19 Aug 2006 18:38:43 +0200 +# Last Modified: Mon, 04 Sep 2006 07:18:23 +0200 hunk ./source/xapps-extra/k3d/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/xapps-extra/k3d/FrugalBuild 10 -depends=('gtkglext' 'imagemagick' 'librsvg' 'gts' 'python' 'openexr' 'libxml2' 'libsigc++2' 'freetype2' 'plib' 'graphviz' 'libtiff' \ - 'atk' 'gtkmm' 'pango' 'glibmm' 'boost>=1.33.1-2') +depends=('gtkglext' 'imagemagick' 'librsvg' 'gts' 'python' 'openexr>=1.4.0a' 'libxml2' 'libsigc++2' 'freetype2' \ + 'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm' 'pango' 'glibmm' 'boost>=1.33.1-2') } From crazy at frugalware.org Mon Sep 4 13:21:42 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 13:21:47 2006 Subject: [Frugalware-darcs] frugalware-current: fish-1.21.12-1-i686 Message-ID: <20060904112142.7601C4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904111855-f6986-0db0cfc8b2c302510c26b1ee2d07efbc503dfe50.gz; [fish-1.21.12-1-i686 crazy **20060904111855 * Version bump * new m8r ] { hunk ./source/apps-extra/fish/FrugalBuild 1 -# Last Modified: Fri, 25 Aug 2006 14:44:27 +0200 +# Last Modified: Mon, 04 Sep 2006 13:18:27 +0200 hunk ./source/apps-extra/fish/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 hunk ./source/apps-extra/fish/FrugalBuild 7 -pkgver=1.21.11 +pkgver=1.21.12 hunk ./source/apps-extra/fish/FrugalBuild 11 +depends=('ncurses') +makedepends=('doxygen' 'groff') +groups=('apps-extra') +archs=('i686' 'x86_64') hunk ./source/apps-extra/fish/FrugalBuild 18 -groups=('apps-extra') -archs=('i686' 'x86_64') -makedepends=('doxygen' 'groff') -depends=('ncurses') -sha1sums=('841d2bee0d3548ff52bdb42c3bc58bb394d2567f') +sha1sums=('8ab4da3ffc4acb5cd56e395bdbef83eb6c8cf8ab') } From crazy at frugalware.org Mon Sep 4 13:34:12 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 13:34:14 2006 Subject: [Frugalware-darcs] frugalware-current: ksmoothdock-4.0.1-1-i686 Message-ID: <20060904113412.3D4AD4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904113037-f6986-0d00c2314322714aa6ef52b49623da39395d851c.gz; [ksmoothdock-4.0.1-1-i686 crazy **20060904113037 * Version bump * new m8r ] { hunk ./source/kde-extra/ksmoothdock/FrugalBuild 1 -# Last Modified: Sat, 26 Aug 2006 01:52:24 +0200 +# Last Modified: Mon, 04 Sep 2006 13:25:38 +0200 hunk ./source/kde-extra/ksmoothdock/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 hunk ./source/kde-extra/ksmoothdock/FrugalBuild 7 -pkgver=4.0 +pkgver=4.0.1 hunk ./source/kde-extra/ksmoothdock/FrugalBuild 16 -sha1sums=('91aeb49b6dc3a0f1193609ece4241d88ff52ce25') +sha1sums=('d764e0e3d5a491aedd9ad523686dbd4466cb05d2') } From crazy at frugalware.org Mon Sep 4 13:48:48 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 13:48:51 2006 Subject: [Frugalware-darcs] frugalware-current: ksudo-0.2-5-i686 Message-ID: <20060904114848.902AB4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904114541-f6986-38b6576b14e15729ac5587a3be936b2e6406a8c9.gz; [ksudo-0.2-5-i686 crazy **20060904114541 * rebuild with kde 3.5* * new m8r ] { hunk ./source/kde-extra/ksudo/FrugalBuild 1 -# Last Modified: Mon, 06 Mar 2006 23:24:54 +0100 +# Last Modified: Mon, 04 Sep 2006 13:44:04 +0200 hunk ./source/kde-extra/ksudo/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 hunk ./source/kde-extra/ksudo/FrugalBuild 8 -pkgrel=4 +pkgrel=5 hunk ./source/kde-extra/ksudo/FrugalBuild 17 -depends=('qt' 'kdebase') +depends=('kdebase>=3.5.4') hunk ./source/kde-extra/ksudo/FrugalBuild 29 +# optimization OK + } From crazy at frugalware.org Mon Sep 4 13:59:38 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 13:59:40 2006 Subject: [Frugalware-darcs] frugalware-current: kxmleditor-1.1.4-2-i686 Message-ID: <20060904115938.D0A4B4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904115642-f6986-d831b44f7f0b53940114da639d8be57799c9d103.gz; [kxmleditor-1.1.4-2-i686 crazy **20060904115642 * rebuild with whatever its depends on :-D * new m8r ] { hunk ./source/kde-extra/kxmleditor/FrugalBuild 1 -# Last Modified: Wed, 06 Jul 2005 19:10:31 +0200 +# Last Modified: Mon, 04 Sep 2006 13:55:21 +0200 hunk ./source/kde-extra/kxmleditor/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 hunk ./source/kde-extra/kxmleditor/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/kde-extra/kxmleditor/FrugalBuild 14 -depends=('qt' 'kdelibs') +depends=('kdelibs>=3.5.4') hunk ./source/kde-extra/kxmleditor/FrugalBuild 21 +# optimization OK + } From crazy at frugalware.org Mon Sep 4 14:31:18 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 14:31:21 2006 Subject: [Frugalware-darcs] frugalware-current: superkaramba-0.39-2-i686 Message-ID: <20060904123118.B70E24E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904122816-f6986-1d2418e48cf974ce8e38ce14923acd7e38733dbf.gz; [superkaramba-0.39-2-i686 crazy **20060904122816 * rebuild with newer kde * new m8r ] { hunk ./source/kde-extra/superkaramba/FrugalBuild 1 -# Last Modified: Thu, 30 Mar 2006 15:49:05 +0200 +# Last Modified: Mon, 04 Sep 2006 14:26:34 +0200 hunk ./source/kde-extra/superkaramba/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 hunk ./source/kde-extra/superkaramba/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/kde-extra/superkaramba/FrugalBuild 11 -depends=('kdelibs>=3.5.2' 'python' 'qt>=3.3.6' 'xmms') +depends=('kdelibs>=3.5.4' 'python' 'qt>=3.3.6' 'xmms') hunk ./source/kde-extra/superkaramba/FrugalBuild 24 +# optimization OK + } From voroskoi at frugalware.org Mon Sep 4 14:35:53 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 4 14:35:56 2006 Subject: [Frugalware-darcs] frugalware-current: kino-0.9.2-1-i686 Message-ID: <20060904123553.A3D594E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904123143-dd049-8b18d95e9d76a0a9c3fd38082b63560501277ed9.gz; [kino-0.9.2-1-i686 voroskoi **20060904123143 version bump added quicktime support updated depends() some cleanup in build() ] { hunk ./source/xapps-extra/kino/FrugalBuild 1 -# Last Modified: Thu, 24 Aug 2006 17:09:07 +0200 +# Last Modified: Mon, 04 Sep 2006 14:03:56 +0200 hunk ./source/xapps-extra/kino/FrugalBuild 6 -pkgver=0.9.1 +pkgver=0.9.2 hunk ./source/xapps-extra/kino/FrugalBuild 11 -depends=('libstdc++' 'alsa-lib' 'libdv' 'libiec61883' 'libavc1394' 'libglade>=2.5' 'atk' 'libsamplerate' 'freetype2' 'cairo' 'pango') +depends=('libstdc++' 'libiec61883' 'libglade>=2.5' 'libquicktime' 'atk' 'libsamplerate' 'freetype2' 'cairo' 'pango') hunk ./source/xapps-extra/kino/FrugalBuild 16 -sha1sums=('1f1d43984f8ac33e46d9442344fef67ef5759e39') +sha1sums=('c54a2603b2f13ba9d9eb28e2eef47e092b73ee30') hunk ./source/xapps-extra/kino/FrugalBuild 19 - Fmkdir usr/share/pixmaps - Fmkdir usr/share/kino - Fmkdir etc/hotplug/usb - Fmake --enable-hotplug-script-dir=/etc/hotplug/usb \ + Fmkdir usr/share/{kino,pixmaps} etc/hotplug/usb + Fbuild --enable-quicktime \ + --enable-hotplug-script-dir=/etc/hotplug/usb \ hunk ./source/xapps-extra/kino/FrugalBuild 23 - Fmakeinstall } From crazy at frugalware.org Mon Sep 4 14:41:41 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 14:41:46 2006 Subject: [Frugalware-darcs] frugalware-current: koverartist-0.4.4-1-i686 Message-ID: <20060904124141.3B0504E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904113658-f6986-628b6f18f67acbf2b2dbdff57fbb1ea68da82c3d.gz; [koverartist-0.4.4-1-i686 crazy **20060904113658 * new m8r ] { hunk ./source/kde-extra/koverartist/FrugalBuild 3 -# Maintainer: BMH1980 -# Contributor: Sector +# Maintainer: crazy +# Contributor: BMH1980 + } From crazy at frugalware.org Mon Sep 4 14:41:41 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 14:41:47 2006 Subject: [Frugalware-darcs] frugalware-current: knoda-0.8.1-2-i686 Message-ID: <20060904124141.E1F684E8B4E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904113543-f6986-63055b1c3e825e5bedf03d49a11a4db1cbccea69.gz; [knoda-0.8.1-2-i686 crazy **20060904113543 * new m8r ] { hunk ./source/kde-extra/knoda/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 } From crazy at frugalware.org Mon Sep 4 14:41:42 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 14:41:49 2006 Subject: [Frugalware-darcs] frugalware-current: kmymoney2-0.8.5-2-i686 Message-ID: <20060904124142.B01374E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904113434-f6986-a565f928f43a90668bacc1d819e1fad2ab22cfa6.gz; [kmymoney2-0.8.5-2-i686 crazy **20060904113434 * new m8r ] { hunk ./source/kde-extra/kmymoney2/FrugalBuild 3 -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 } From crazy at frugalware.org Mon Sep 4 14:45:48 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 14:45:51 2006 Subject: [Frugalware-darcs] frugalware-current: perl-class-autouse-1.27-1-i686 Message-ID: <20060904124549.0C7634E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904124309-f6986-d18a65ce6e28982814c31929779f3e3134e89afd.gz; [perl-class-autouse-1.27-1-i686 crazy **20060904124309 * Version bump ] { hunk ./source/devel-extra/perl-class-autouse/FrugalBuild 1 -# Last Modified: Sat, 22 Apr 2006 13:31:41 +0200 +# Last Modified: Mon, 04 Sep 2006 14:42:53 +0200 hunk ./source/devel-extra/perl-class-autouse/FrugalBuild 8 -pkgver=1.26 +pkgver=1.27 hunk ./source/devel-extra/perl-class-autouse/FrugalBuild 11 -depends=('perl') -groups=('devel-extra') hunk ./source/devel-extra/perl-class-autouse/FrugalBuild 13 -sha1sums=('146b831ef1239874df20234d6415a2c18ad54188') +sha1sums=('3150524488690b163b1622725743c4deff83e435') } From crazy at frugalware.org Mon Sep 4 14:48:04 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 14:48:06 2006 Subject: [Frugalware-darcs] frugalware-current: perl-poe-filter-ircd-1.9-1-i686 Message-ID: <20060904124804.CA4C54E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904124526-f6986-54ae649511cc701c5e7ccd64fe75dc908d47ab7f.gz; [perl-poe-filter-ircd-1.9-1-i686 crazy **20060904124526 * Version bump ] { hunk ./source/devel-extra/perl-poe-filter-ircd/FrugalBuild 1 -# Last Modified: Tue, 01 Aug 2006 19:48:01 +0200 +# Last Modified: Mon, 04 Sep 2006 14:44:48 +0200 hunk ./source/devel-extra/perl-poe-filter-ircd/FrugalBuild 7 -pkgver=1.8 +pkgver=1.9 hunk ./source/devel-extra/perl-poe-filter-ircd/FrugalBuild 13 -sha1sums=('da868fcaa7ac69965cd87dea82b94b3a166e8b80') +sha1sums=('57daba245d54eb649b7459a375a11f956255ec1c') } From crazy at frugalware.org Mon Sep 4 14:51:04 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 14:51:05 2006 Subject: [Frugalware-darcs] frugalware-current: perl-poe-component-irc-5.00-1-i686 Message-ID: <20060904125104.568FE4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904124823-f6986-a268e5ed6b134335c92125ff1b439186b173249f.gz; [perl-poe-component-irc-5.00-1-i686 crazy **20060904124823 * Version bump ] { hunk ./source/devel-extra/perl-poe-component-irc/FrugalBuild 1 -# Last Modified: Wed, 30 Aug 2006 15:20:09 +0200 +# Last Modified: Mon, 04 Sep 2006 14:48:00 +0200 hunk ./source/devel-extra/perl-poe-component-irc/FrugalBuild 7 -pkgver=4.99 +pkgver=5.00 hunk ./source/devel-extra/perl-poe-component-irc/FrugalBuild 10 -depends=('perl-poe' 'perl-poe-filter-ircd' 'perl-poe-component-client-dns') +depends=('perl-poe' 'perl-poe-filter-ircd>=1.9' 'perl-poe-component-client-dns') hunk ./source/devel-extra/perl-poe-component-irc/FrugalBuild 13 -sha1sums=('f737c49280227bb708d96837004c647ad6e352d9') +sha1sums=('bb380b838b4cea8c49b87cdb0b61d34190131858') } From crazy at frugalware.org Mon Sep 4 15:05:58 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 15:06:00 2006 Subject: [Frugalware-darcs] frugalware-current: gnormalize-0.49-1-i686 Message-ID: <20060904130558.1F4284E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904130106-f6986-dcbf8e85d7f43345ce8c3c99c73cec93ca652820.gz; [gnormalize-0.49-1-i686 crazy **20060904130106 * added up2date() sf.net is really broken sometimes :S * btw vmiklos the source() looks somewhat strange =) ] { hunk ./source/xapps-extra/gnormalize/FrugalBuild 14 +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=129432|grep -m1 '.tar.gz'|sed 's/.*lize-\(.*\).tar.gz.*/\1/'" } From crazy at frugalware.org Mon Sep 4 15:10:52 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 15:10:55 2006 Subject: [Frugalware-darcs] frugalware-current: imagemagick-6.2.9_3-1-i686 Message-ID: <20060904131052.E65614E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904130814-f6986-7626eeb7cce40be756e6beb99f48c04a65b067cf.gz; [imagemagick-6.2.9_3-1-i686 crazy **20060904130814 * Version bump ] { hunk ./source/xapps/imagemagick/FrugalBuild 1 -# Last modified: Tue, 29 Aug 2006 15:04:07 +0200 +# Last modified: Mon, 04 Sep 2006 15:06:58 +0200 hunk ./source/xapps/imagemagick/FrugalBuild 6 -pkgver=6.2.9_2 +pkgver=6.2.9_3 hunk ./source/xapps/imagemagick/FrugalBuild 17 -sha1sums=('38f2a87a12564c4c65f1ed6f98a16304f220c91a' \ +sha1sums=('2f0f00fff0b0c3691b37ba9d38f17979a8328295' \ hunk ./source/xapps/imagemagick/FrugalBuild 20 + } From crazy at frugalware.org Mon Sep 4 15:23:25 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 15:23:28 2006 Subject: [Frugalware-darcs] frugalware-current: kdissert-1.0.6-1-i686 Message-ID: <20060904132326.07F6D4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904131957-f6986-accfb6b665d1a6975b61526c0e8334b398c01a65.gz; [kdissert-1.0.6-1-i686 crazy **20060904131957 * up2date() fix ] { hunk ./source/kde-extra/kdissert/FrugalBuild 15 -up2date='wget -q -O - "$url" | grep "kdissert-.*.tar.bz2" | head -n 1 | sed "s/.*kdissert-\(.*\)-waf.tar.bz2.*/\1/"' +up2date="lynx -dump http://freehackers.org/~tnagy/kdissert/|grep -m1 'kdissert-\(.*\)-waf.tar.bz2'|sed 's/.*ert-\(.*\)-waf.*t.*/\1/'" } From crazy at frugalware.org Mon Sep 4 15:25:12 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 15:25:13 2006 Subject: [Frugalware-darcs] frugalware-current: foomatic-filters-ppds-20060904-1-i686 Message-ID: <20060904132512.4040A4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904132124-f6986-20954ac7f755c070dbac6ddca00fa3db5f7e5a46.gz; [foomatic-filters-ppds-20060904-1-i686 crazy **20060904132124 * Version bump ] { hunk ./source/apps/foomatic-filters-ppds/FrugalBuild 1 -# Last modified: Tue, 29 Aug 2006 20:22:07 +0200 +# Last modified: Mon, 04 Sep 2006 15:16:37 +0200 hunk ./source/apps/foomatic-filters-ppds/FrugalBuild 6 -pkgver=20060829 +pkgver=20060904 hunk ./source/apps/foomatic-filters-ppds/FrugalBuild 16 -sha1sums=('70b91591ce6265ab8dcc29094e32ec53021d348d') +sha1sums=('4a5a233049d95620155303a9c95c2c68dd8305f0') } From alex at alex-smith.me.uk Mon Sep 4 15:35:25 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Sep 4 15:35:31 2006 Subject: [Frugalware-darcs] frugalware-current: monodevelop-20060904-1-x86_64 Message-ID: <20060904133525.5DC324E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904143124-46e39-cecca70b90c71835b089fa1b45cd6099c208f237.gz; [monodevelop-20060904-1-x86_64 AlexExtreme **20060904143124 * Bumped to SVN snapshot as the "stable" version is broken * Converted to use Finclude gnome-scriptlet and Finclude mono * Removed nofakeroot option (duh, the MONO_SHARED_DIR stuff was needed, not nofakeroot -_-) * Added several patches to fix several bugs * Patch to remove gtk1-sharp support, it is deprecated and gtk2-sharp should be used instead * Fixed Firefox detection * Changed maintainer to me (ok @ krix) ] { hunk ./source/gnome-extra/monodevelop/FrugalBuild 1 -# Last modified: Tue, 06 Jun 2006 16:43:36 +0200 +# Last modified: Mon, 04 Sep 2006 15:26:22 +0100 hunk ./source/gnome-extra/monodevelop/FrugalBuild 3 -# Maintainer: Christian Hamar alias krix +# Maintainer: AlexExtreme hunk ./source/gnome-extra/monodevelop/FrugalBuild 6 -pkgver=0.11 +pkgver=20060904 hunk ./source/gnome-extra/monodevelop/FrugalBuild 10 -depends=('gecko-sharp' 'gtksourceview-sharp' 'shared-mime-info' 'gnome-vfs' \ - 'mono-tools' 'libglade' 'firefox' 'ikvm' 'boo') +depends=('gecko-sharp' 'gtksourceview-sharp' 'shared-mime-info' 'mono-tools' 'firefox' 'ikvm' 'boo' 'gnome-sharp') hunk ./source/gnome-extra/monodevelop/FrugalBuild 15 -source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.gz \ - $pkgname-0.10-firefox.diff) -options=('nofakeroot' 'scriptlet') -sha1sums=('9589f6148b52474774344efa35636b5072cf33ac' \ - 'eaf51f02d67593de7a786e8bfe5dd791840a4edb') +#source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.gz \ +source=(http://ftp.frugalware.org/pub/other/sources/monodevelop/$pkgname-$pkgver.tar.bz2 \ + boo_mimetype.patch \ + firefox.patch \ + libstetic-dllmap.patch \ + remove_gtk-sharp-1.0_support.patch \ + update_templates_for_gtk_sharp_2.8.x.patch) +options=('scriptlet') +_F_gnome_desktop=y +_F_gnome_mime=y +Finclude gnome-scriptlet mono +sha1sums=('ad8b8e2fbd2327b04c1708091a93b55f72ca11b7' \ + '719b456cee8e5e2b4cf3778915464c191f246d98' \ + 'ce1df8e62734bd8cbdeee6c180e03df4cbc9fe65' \ + '769451a6399a13eb5164b7c10bee808c87dc0706' \ + '1d2aa608a1039fb275f0f35abb461d3213b1f775' \ + 'db0fe450ef76f83853179bd0fd557f408175c3ee') +Fconfopts="$Fconfopts --enable-java --enable-boo --enable-nunit --enable-versioncontrol" hunk ./source/gnome-extra/monodevelop/FrugalBuild 34 -Fconfopts="$Fconfopts --enable-java --enable-boo --enable-nunit \ ---enable-versioncontrol --disable-update-mimedb --disable-update-desktopdb" - -export MOZILLA_FIVE_HOME=/usr/lib/firefox +build() { + Fmonoexport + Fpatchall + NOCONFIGURE=y ./autogen.sh + Fmake + Fmakeinstall + Fmonocleanup + Fbuild_gnome_scriptlet +} addfile ./source/gnome-extra/monodevelop/boo_mimetype.patch hunk ./source/gnome-extra/monodevelop/boo_mimetype.patch 1 +--- monodevelop-0.10/monodevelop.xml.old 2006-04-13 12:12:05.676000000 +0200 ++++ monodevelop-0.10/monodevelop.xml 2006-04-13 12:12:54.376000000 +0200 +@@ -12,6 +12,10 @@ + Nemerle source + + ++ ++ Boo source ++ ++ + + VB source + addfile ./source/gnome-extra/monodevelop/firefox.patch hunk ./source/gnome-extra/monodevelop/firefox.patch 1 +diff -urN monodevelop-20060904.orig/configure.in monodevelop-20060904/configure.in +--- monodevelop-20060904.orig/configure.in 2006-09-04 14:58:21.000000000 +0100 ++++ monodevelop-20060904/configure.in 2006-09-04 14:59:20.000000000 +0100 +@@ -254,7 +254,7 @@ + # get zip to create jar/xpi for chrome + AC_PATH_PROG(ZIP, zip) + else +- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" ++ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir firefox-gtkmozembed`" + AC_SUBST(MOZILLA_HOME) + fi + +diff -urN monodevelop-20060904.orig/monodevelop.in monodevelop-20060904/monodevelop.in +--- monodevelop-20060904.orig/monodevelop.in 2006-09-04 14:58:21.000000000 +0100 ++++ monodevelop-20060904/monodevelop.in 2006-09-04 14:59:35.000000000 +0100 +@@ -18,7 +18,7 @@ + + if test -n "$MOZILLA_FIVE_HOME"; then + MOZILLA_HOME=$MOZILLA_FIVE_HOME +-elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then ++elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then + MOZILLA_HOME=@MOZILLA_HOME@ + elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then + MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1) addfile ./source/gnome-extra/monodevelop/libstetic-dllmap.patch hunk ./source/gnome-extra/monodevelop/libstetic-dllmap.patch 1 +--- monodevelop/Extras/MonoDevelop.GtkCore/lib/libstetic.dll.config.old 2006-07-30 17:04:17.964199000 +0200 ++++ monodevelop/Extras/MonoDevelop.GtkCore/lib/libstetic.dll.config 2006-07-30 17:04:40.457604750 +0200 +@@ -2,4 +2,5 @@ + + + ++ + hunk ./source/gnome-extra/monodevelop/monodevelop-0.10-firefox.diff 1 -diff -Naur monodevelop-0.7.orig/monodevelop.in monodevelop-0.7/monodevelop.in ---- monodevelop-0.7.orig/monodevelop.in 2005-09-23 16:19:20.000000000 +0200 -+++ monodevelop-0.7/monodevelop.in 2005-09-23 16:21:15.000000000 +0200 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+export MOZILLA_FIVE_HOME=/usr/lib/firefox -+ - reWrite() { - ret="" - WD=`pwd` rmfile ./source/gnome-extra/monodevelop/monodevelop-0.10-firefox.diff hunk ./source/gnome-extra/monodevelop/monodevelop.install 1 -post_install() { - echo -n "updating mime database... " - update-mime-database /usr/share/mime > /dev/null 2>&1 - echo "done." - echo -n "updating desktop database... " - update-desktop-database > /dev/null 2>&1 - echo "done." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -op=$1 -shift - -$op $* rmfile ./source/gnome-extra/monodevelop/monodevelop.install addfile ./source/gnome-extra/monodevelop/remove_gtk-sharp-1.0_support.patch hunk ./source/gnome-extra/monodevelop/remove_gtk-sharp-1.0_support.patch 1 +diff -urNad monodevelop-0.11~/Extras/CSharpBinding/CSharpBinding.addin.xml monodevelop-0.11/Extras/CSharpBinding/CSharpBinding.addin.xml +--- monodevelop-0.11~/Extras/CSharpBinding/CSharpBinding.addin.xml 2006-05-06 16:57:07.000000000 +0200 ++++ monodevelop-0.11/Extras/CSharpBinding/CSharpBinding.addin.xml 2006-05-06 16:58:54.000000000 +0200 +@@ -34,11 +34,8 @@ + + + +- + +- + +- + + + +diff -urNad monodevelop-0.11~/Extras/CSharpBinding/Makefile.am monodevelop-0.11/Extras/CSharpBinding/Makefile.am +--- monodevelop-0.11~/Extras/CSharpBinding/Makefile.am 2006-05-06 16:57:07.000000000 +0200 ++++ monodevelop-0.11/Extras/CSharpBinding/Makefile.am 2006-05-06 16:58:54.000000000 +0200 +@@ -49,12 +49,9 @@ + templates/ConsoleProject.xpt.xml \ + templates/EmptyCSharpFile.xft.xml \ + templates/EmptyProject.xpt.xml \ +-templates/GladeSharpProject.xpt.xml \ + templates/GladeSharp2Project.xpt.xml \ + templates/GnomeSharpProgram.xft.xml \ +-templates/GnomeSharpProject.xpt.xml \ + templates/GnomeSharp2Project.xpt.xml \ +-templates/GtkSharpProject.xpt.xml \ + templates/GtkSharp2Project.xpt.xml \ + templates/GtkSharpWindow.xft.xml \ + templates/Library.xpt.xml \ +diff -urNad monodevelop-0.11~/Extras/CSharpBinding/templates/GladeSharpProject.xpt.xml monodevelop-0.11/Extras/CSharpBinding/templates/GladeSharpProject.xpt.xml +--- monodevelop-0.11~/Extras/CSharpBinding/templates/GladeSharpProject.xpt.xml 2006-05-06 16:57:07.000000000 +0200 ++++ monodevelop-0.11/Extras/CSharpBinding/templates/GladeSharpProject.xpt.xml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,135 +0,0 @@ +- +- +diff -urNad monodevelop-0.11~/Extras/CSharpBinding/templates/GnomeSharpProject.xpt.xml monodevelop-0.11/Extras/CSharpBinding/templates/GnomeSharpProject.xpt.xml +--- monodevelop-0.11~/Extras/CSharpBinding/templates/GnomeSharpProject.xpt.xml 2006-05-06 16:57:07.000000000 +0200 ++++ monodevelop-0.11/Extras/CSharpBinding/templates/GnomeSharpProject.xpt.xml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,107 +0,0 @@ +- +- +diff -urNad monodevelop-0.11~/Extras/CSharpBinding/templates/GtkSharpProject.xpt.xml monodevelop-0.11/Extras/CSharpBinding/templates/GtkSharpProject.xpt.xml +--- monodevelop-0.11~/Extras/CSharpBinding/templates/GtkSharpProject.xpt.xml 2006-05-06 16:57:07.000000000 +0200 ++++ monodevelop-0.11/Extras/CSharpBinding/templates/GtkSharpProject.xpt.xml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,106 +0,0 @@ +- +- +diff -urNad monodevelop-0.11~/Extras/VBNetBinding/Makefile.am monodevelop-0.11/Extras/VBNetBinding/Makefile.am +--- monodevelop-0.11~/Extras/VBNetBinding/Makefile.am 2006-05-06 16:57:07.000000000 +0200 ++++ monodevelop-0.11/Extras/VBNetBinding/Makefile.am 2006-05-06 16:58:54.000000000 +0200 +@@ -45,7 +45,6 @@ + templates/EmptyVBFile.xft.xml \ + templates/EmptyVBProject.xpt.xml \ + templates/VBConsoleApplicationProject.xpt.xml \ +-templates/VBGtkSharpProject.xpt.xml \ + templates/VBGtkSharp2Project.xpt.xml \ + icons/VB.File.EmptyFile \ + icons/VB.File.Form \ +diff -urNad monodevelop-0.11~/Extras/VBNetBinding/VBNetBinding.addin.xml monodevelop-0.11/Extras/VBNetBinding/VBNetBinding.addin.xml +--- monodevelop-0.11~/Extras/VBNetBinding/VBNetBinding.addin.xml 2006-05-06 16:57:07.000000000 +0200 ++++ monodevelop-0.11/Extras/VBNetBinding/VBNetBinding.addin.xml 2006-05-06 16:58:54.000000000 +0200 +@@ -33,7 +33,6 @@ + + + +- + + + +diff -urNad monodevelop-0.11~/Extras/VBNetBinding/templates/VBGtkSharpProject.xpt.xml monodevelop-0.11/Extras/VBNetBinding/templates/VBGtkSharpProject.xpt.xml +--- monodevelop-0.11~/Extras/VBNetBinding/templates/VBGtkSharpProject.xpt.xml 2006-05-06 16:57:07.000000000 +0200 ++++ monodevelop-0.11/Extras/VBNetBinding/templates/VBGtkSharpProject.xpt.xml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,107 +0,0 @@ +- +- addfile ./source/gnome-extra/monodevelop/update_templates_for_gtk_sharp_2.8.x.patch hunk ./source/gnome-extra/monodevelop/update_templates_for_gtk_sharp_2.8.x.patch 1 +diff -Naur monodevelop-0.9/Extras-old/BooBinding/templates/BooGtkSharpProject.xpt.xml monodevelop-0.9/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml +--- monodevelop-0.9/Extras-old/BooBinding/templates/BooGtkSharpProject.xpt.xml 2005-09-27 16:50:33.000000000 +0200 ++++ monodevelop-0.9/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml 2006-03-17 20:12:32.150898800 +0100 +@@ -23,8 +23,8 @@ + + + +- +- ++ ++ + + + + +- +- +- +- +- ++ ++ ++ ++ ++ + + + +diff -Naur monodevelop-0.9/Extras-old/CSharpBinding/templates/GnomeSharp2Project.xpt.xml monodevelop-0.9/Extras/CSharpBinding/templates/GnomeSharp2Project.xpt.xml +--- monodevelop-0.9/Extras-old/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2005-11-17 12:04:46.000000000 +0100 ++++ monodevelop-0.9/Extras/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2006-03-17 20:12:30.322176808 +0100 +@@ -28,12 +28,12 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + + +diff -Naur monodevelop-0.9/Extras-old/CSharpBinding/templates/GtkSharp2Project.xpt.xml monodevelop-0.9/Extras/CSharpBinding/templates/GtkSharp2Project.xpt.xml +--- monodevelop-0.9/Extras-old/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2005-11-17 12:04:46.000000000 +0100 ++++ monodevelop-0.9/Extras/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2006-03-17 20:12:30.331175440 +0100 +@@ -28,11 +28,11 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ + + + +diff -Naur monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGladeApplicationProject.xpt.xml monodevelop-0.9/Extras/JavaBinding/templates/IkvmGladeApplicationProject.xpt.xml +--- monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGladeApplicationProject.xpt.xml 2005-09-23 22:11:15.000000000 +0200 ++++ monodevelop-0.9/Extras/JavaBinding/templates/IkvmGladeApplicationProject.xpt.xml 2006-03-17 20:12:31.583984984 +0100 +@@ -28,12 +28,12 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + + +diff -Naur monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGnomeApplicationProject.xpt.xml monodevelop-0.9/Extras/JavaBinding/templates/IkvmGnomeApplicationProject.xpt.xml +--- monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGnomeApplicationProject.xpt.xml 2005-09-23 22:11:15.000000000 +0200 ++++ monodevelop-0.9/Extras/JavaBinding/templates/IkvmGnomeApplicationProject.xpt.xml 2006-03-17 20:12:31.590983920 +0100 +@@ -28,12 +28,12 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + + +diff -Naur monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGtkApplicationProject.xpt.xml monodevelop-0.9/Extras/JavaBinding/templates/IkvmGtkApplicationProject.xpt.xml +--- monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmGtkApplicationProject.xpt.xml 2005-09-23 22:11:15.000000000 +0200 ++++ monodevelop-0.9/Extras/JavaBinding/templates/IkvmGtkApplicationProject.xpt.xml 2006-03-17 20:12:31.599982552 +0100 +@@ -28,11 +28,11 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ + + + +diff -Naur monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmLibraryProject.xpt.xml monodevelop-0.9/Extras/JavaBinding/templates/IkvmLibraryProject.xpt.xml +--- monodevelop-0.9/Extras-old/JavaBinding/templates/IkvmLibraryProject.xpt.xml 2005-09-23 22:11:15.000000000 +0200 ++++ monodevelop-0.9/Extras/JavaBinding/templates/IkvmLibraryProject.xpt.xml 2006-03-17 20:12:31.606981488 +0100 +@@ -25,10 +25,10 @@ + + + +- +- +- +- ++ ++ ++ ++ + + + +diff -Naur monodevelop-0.9/Extras-old/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml monodevelop-0.9/Extras/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml +--- monodevelop-0.9/Extras-old/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2005-09-23 22:11:15.000000000 +0200 ++++ monodevelop-0.9/Extras/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2006-03-17 20:12:33.442702416 +0100 +@@ -27,11 +27,11 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ + + + } From crazy at frugalware.org Mon Sep 4 15:36:17 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 15:36:18 2006 Subject: [Frugalware-darcs] frugalware-current: actionmailer-1.2.5-1-i686 Message-ID: <20060904133617.115F74E8ABF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904133331-f6986-f18a1de8ca87b7c8d0b211dd3f1e4a552afeccc0.gz; [actionmailer-1.2.5-1-i686 crazy **20060904133331 * Version bump ] { hunk ./source/devel-extra/actionmailer/FrugalBuild 1 -# Last Modified: Mon, 03 Jul 2006 08:23:52 +0200 +# Last Modified: Mon, 04 Sep 2006 15:32:39 +0200 hunk ./source/devel-extra/actionmailer/FrugalBuild 6 -pkgver=1.2.3 +pkgver=1.2.5 hunk ./source/devel-extra/actionmailer/FrugalBuild 10 -depends=('actionpack') +depends=('actionpack>=1.12.5') hunk ./source/devel-extra/actionmailer/FrugalBuild 13 -sha1sums=('9f1c5dfa31f0b5112b40042a57067ead69ac3289') - hunk ./source/devel-extra/actionmailer/FrugalBuild 14 +sha1sums=('05e8ce12b0fcc8561b4c25b86e70a476cd7c3389') } From krics at linuxforum.hu Mon Sep 4 15:52:24 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 15:52:28 2006 Subject: [Frugalware-darcs] frugalware-current: gdb-6.5-2-x86_64 Message-ID: <20060904135224.BFDCF4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904135133-d209c-a517312cf2f28f125332782a8012b2b315352ea9.gz; [gdb-6.5-2-x86_64 Christian Hamar alias krix **20060904135133 * Release bump * Fixes BTS #1100 (SEC FIX for CVE-2006-4146) * Added mpfr as depends() ] { hunk ./source/devel/gdb/FrugalBuild 1 -# Last Modified: Tue, 27 Jun 2006 14:31:10 +0200 +# Last Modified: Mon, 04 Sep 2006 15:50:58 +0200 hunk ./source/devel/gdb/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/devel/gdb/FrugalBuild 11 -depends=('readline') +depends=('readline' 'mpfr') hunk ./source/devel/gdb/FrugalBuild 17 - 01-gdb-6.3-use_system_readline.patch 02-gdb-6.3-readline_docs.patch) + 01-gdb-6.3-use_system_readline.patch 02-gdb-6.3-readline_docs.patch \ + gdb-cve-2006-4146-sec.patch) +sha1sums=('4ec883314affaecc564fd5980996b4e81119a886' \ + '89ba7928ebd4e66af0e54ba4c343b1205b0f033a' \ + '0e778259423896e27b08be7d5d37b83114d95035' \ + 'f557135474b2c3ae57448e0cce709142887f48d1') hunk ./source/devel/gdb/FrugalBuild 24 -build() -{ +build() { hunk ./source/devel/gdb/FrugalBuild 27 - Fbuild --with-gmp=/usr --with-mpfr=/usr + Fpatch 01-gdb-6.3-use_system_readline.patch + Fpatch 02-gdb-6.3-readline_docs.patch + # Fixes CVE-2006-4146 SEC bug + Fpatch gdb-cve-2006-4146-sec.patch + Fmake --with-gmp=/usr --with-mpfr=/usr + Fmakeinstall hunk ./source/devel/gdb/FrugalBuild 43 - hunk ./source/devel/gdb/FrugalBuild 44 -sha1sums=('4ec883314affaecc564fd5980996b4e81119a886' \ - '89ba7928ebd4e66af0e54ba4c343b1205b0f033a' \ - '0e778259423896e27b08be7d5d37b83114d95035') addfile ./source/devel/gdb/gdb-cve-2006-4146-sec.patch hunk ./source/devel/gdb/gdb-cve-2006-4146-sec.patch 1 +diff -Naur gdb-6.5.orig/gdb/dwarf2read.c gdb-6.5/gdb/dwarf2read.c +--- gdb-6.5.orig/gdb/dwarf2read.c 2006-09-04 15:34:23.000000000 +0200 ++++ gdb-6.5/gdb/dwarf2read.c 2006-09-04 15:42:43.000000000 +0200 +@@ -8855,6 +8855,17 @@ + dwarf_stack_op_name (op)); + return (stack[stacki]); + } ++ ++ /* Enforce maximum stach depth of 63 to avoid ++stacki writing ++ outside of the gives size. Also enforce minimum > 0. ++ -- wad@google.com 14 Aug 2006 */ ++ if (stacki >= sizeof(stack)/sizeof(*stack) - 1) ++ internal_error (__FILE__, __LINE__, ++ _("location description stack too deep: %d"), ++ stacki); ++ if (stacki <= 0) ++ internal_error (__FILE__, __LINE__, ++ _("location description stack too shallow")); + } + return (stack[stacki]); + } +diff -Naur gdb-6.5.orig/gdb/dwarfread.c gdb-6.5/gdb/dwarfread.c +--- gdb-6.5.orig/gdb/dwarfread.c 2006-09-04 15:34:23.000000000 +0200 ++++ gdb-6.5/gdb/dwarfread.c 2006-09-04 15:39:44.000000000 +0200 +@@ -2224,6 +2224,16 @@ + stacki--; + break; + } ++ /* Enforce maximum stack depth of 63 to avoid ++stacki writing ++ outside of the given size. Also enforce minimum > 0. ++ -- wad@google.com 14 Aug 2006 */ ++ if (stacki >= sizeof(stack)/sizeof(*stack) - 1) ++ internal_error (__FILE__, __LINE__, ++ _("location description stack too deep: %d"), ++ stacki); ++ if (stacki <= 0) ++ internal_error (__FILE__, __LINE__, ++ _("location description stack too shallow")); + } + return (stack[stacki]); + } } From krics at linuxforum.hu Mon Sep 4 16:23:24 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 16:23:26 2006 Subject: [Frugalware-darcs] pacman: pacman - db.c: implement category show Message-ID: <20060904142324.37D9B4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904142313-d209c-e9706efc00bd39f0963a3dc072cc23caaed4aa9b.gz; [pacman - db.c: implement category show Christian Hamar alias krix **20060904142313 * At -Ss show the category too (frugalware-current/categoryname/pkgname) - NOTE: Actually it shows the first group which found in groups maybe vmiklos knows a better way ? :P * Closes #1075 ] { hunk ./src/pacman/db.c 51 - PM_LIST *j; + PM_LIST *j, *g; hunk ./src/pacman/db.c 63 - char *pkgname, *pkgdesc; + char *pkgname, *pkgdesc, *pkggroup; hunk ./src/pacman/db.c 68 + g = alpm_pkg_getinfo(pkg, PM_PKG_GROUPS); + g = alpm_list_first(g); + pkggroup = alpm_list_getdata(g); hunk ./src/pacman/db.c 117 - printf("%s/%s %s\n ", treename, pkgname, (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION)); + printf("%s/%s/%s %s\n ", treename, pkggroup, pkgname, (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION)); } From krics at linuxforum.hu Mon Sep 4 16:25:29 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 16:25:31 2006 Subject: [Frugalware-darcs] pacman: TODO update (frugalware) Message-ID: <20060904142529.56DCB4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904142621-d209c-194f0433dd4439215d58fd330a43f6c30f765359.gz; [TODO update (frugalware) Christian Hamar alias krix **20060904142621 * Removed one TODO entry (for package progressbar/counter in remove state) * Added new TODO entry (from BTS) ] { hunk ./TODO.frugalware 1 -- Make progressbar and package counter work for remove too ! +- Review #1079 (BTS) and maybe implement it } From alex at alex-smith.me.uk Mon Sep 4 16:32:27 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Sep 4 16:32:28 2006 Subject: [Frugalware-darcs] frugalware-current: libgdiplus-1.1.17-1-x86_64 Message-ID: <20060904143227.3C9C04E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904153031-46e39-5eb437d755876533e5bb24f8f426905a4b1b1b9f.gz; [libgdiplus-1.1.17-1-x86_64 AlexExtreme **20060904153031 * New package (duh, why wasn't this here in the first place... Mono uses it) ] { adddir ./source/lib/libgdiplus addfile ./source/lib/libgdiplus/FrugalBuild hunk ./source/lib/libgdiplus/FrugalBuild 1 +# Last Modified: Mon, 04 Sep 2006 16:25:35 +0100 +# Compiling Time: 0.29 SBU +# Maintainer: AlexExtreme + +pkgname=libgdiplus +pkgver=1.1.17 +pkgrel=1 +pkgdesc="libgdiplus is an implementation of the GDI+ library on Windows" +url="http://www.mono-project.com" +depends=('glib2>=2.12.0' 'libungif' 'libjpeg' 'libtiff' 'libexif' 'cairo>=1.2.4') +groups=('lib') +archs=('i686' 'x86_64') +up2date="lynx -dump http://www.go-mono.com/sources-latest/|grep -m1 'libgdiplus-'|sed 's/.*-\(.*\).t.*/\1/'" +source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.gz \ + system-cairo.patch) +sha1sums=('1405f96cd91427518d4b70dbdd43d4c55c4632b6' \ + '2e210e98900ccfe006534cb919f1b97836572e5a') + +build() { + Fcd + Fpatchall + Fautoconfize + Fmake --with-cairo=installed + Fmakeinstall +} + +# optimization OK addfile ./source/lib/libgdiplus/system-cairo.patch hunk ./source/lib/libgdiplus/system-cairo.patch 1 +diff -ur libgdiplus-1.1.15-old/Makefile.am libgdiplus-1.1.15/Makefile.am +--- libgdiplus-1.1.15-old/Makefile.am 2006-04-14 10:04:55.000000000 -0700 ++++ libgdiplus-1.1.15/Makefile.am 2006-04-21 18:06:49.000000000 -0700 +@@ -1,4 +1,4 @@ +-SUBDIRS = cairo src tests ++SUBDIRS = src tests + #libpixman + + pkgconfigdir = $(libdir)/pkgconfig +diff -ur libgdiplus-1.1.15-old/configure.in libgdiplus-1.1.15/configure.in +--- libgdiplus-1.1.15-old/configure.in 2006-04-14 10:04:55.000000000 -0700 ++++ libgdiplus-1.1.15/configure.in 2006-04-21 18:06:49.000000000 -0700 +@@ -18,32 +18,32 @@ + AC_MSG_ERROR("Did not find Glib >= 2.2.3"); + fi + +-AC_CONFIG_SUBDIRS(cairo) +-CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la' +-CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src' +-AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) ++#AC_CONFIG_SUBDIRS(cairo) ++#CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la' ++#CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src' ++#AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) + + # Activate this when we support linking to an already exiting Cairo installation +-#default_cairo=included +-#AC_ARG_WITH(cairo, [ --with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo]) ++default_cairo=included ++AC_ARG_WITH(cairo, [ --with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo]) + # +-#if test $cairo_v = "included"; +-#then ++if test $cairo_v = "included"; ++then + # #AC_CONFIG_SUBDIRS(libpixman) +-# AC_CONFIG_SUBDIRS(cairo) +-# CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la' +-# CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src' +-# AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) +-#else +-# if pkg-config --exact-version 0.3.0 cairo; then +-# echo Cairo installation OK +-# else +-# AC_MSG_ERROR("Did not find Cairo == 0.3.0"); +-# fi +-# +-# CAIRO_LIBS="`pkg-config --libs cairo`" +-# CAIRO_CFLAGS="`pkg-config --cflags cairo`" +-#fi ++ AC_CONFIG_SUBDIRS(cairo) ++ CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la' ++ CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src' ++ AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) ++else ++ if pkg-config --atleast-version 1.0.1 cairo; then ++ echo Cairo installation OK ++ else ++ AC_MSG_ERROR("Did not find Cairo == 1.0.1"); ++ fi ++ ++ CAIRO_LIBS="`pkg-config --libs cairo`" ++ CAIRO_CFLAGS="`pkg-config --cflags cairo`" ++fi + + GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `pkg-config freetype2 fontconfig --libs`" + GDIPLUS_CFLAGS="$CAIRO_CFLAGS `pkg-config --cflags glib-2.0 ` `pkg-config freetype2 fontconfig --cflags`" +diff -ur libgdiplus-1.1.15-old/src/gdip.h libgdiplus-1.1.15/src/gdip.h +--- libgdiplus-1.1.15-old/src/gdip.h 2006-04-14 10:04:54.000000000 -0700 ++++ libgdiplus-1.1.15/src/gdip.h 2006-04-21 18:06:49.000000000 -0700 +@@ -24,7 +24,8 @@ + + #include "config.h" + +-#include "pixman.h" ++#include ++typedef uint32_t pixman_bits_t; + + #ifdef USE_INCLUDED_CAIRO + #include } From krics at linuxforum.hu Mon Sep 4 17:03:18 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 17:03:19 2006 Subject: [Frugalware-darcs] pacman: TODO: added one more entry :P Message-ID: <20060904150318.5C8054E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904150420-d209c-1a130f6b3831617035ff619a65db43372e1df50d.gz; [TODO: added one more entry :P Christian Hamar alias krix **20060904150420 * Added one more TODO entry (db_search -> libalpm migration) ] { hunk ./TODO.frugalware 3 +- Move db_search to libalpm (for frontends) + +Mon, 04 Sep 2006 17:04:12 +0200 + } From alex at alex-smith.me.uk Mon Sep 4 17:50:31 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Sep 4 17:50:34 2006 Subject: [Frugalware-darcs] frugalware-current: libgdiplus-1.1.17-2-x86_64 Message-ID: <20060904155031.452A54E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904164754-46e39-9d1055f1a4cee5eda896f2dd4cc0359da305e11a.gz; [libgdiplus-1.1.17-2-x86_64 AlexExtreme **20060904164754 * Moved to correct group ] { move ./source/lib/libgdiplus ./source/xlib/libgdiplus hunk ./source/xlib/libgdiplus/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 16:25:35 +0100 +# Last Modified: Mon, 04 Sep 2006 17:46:35 +0100 hunk ./source/xlib/libgdiplus/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xlib/libgdiplus/FrugalBuild 11 -groups=('lib') +groups=('xlib') } From voroskoi at frugalware.org Mon Sep 4 17:54:53 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 4 17:54:55 2006 Subject: [Frugalware-darcs] frugalware-current: x264-20060903-1-i686 Message-ID: <20060904155453.342924E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904135413-dd049-e1e3f6bebc15a086fdf489fd75c63719563412bc.gz; [x264-20060903-1-i686 voroskoi **20060904135413 version bump visualize enabled ] { hunk ./source/multimedia/x264/FrugalBuild 1 -# Last Modified: Fri, 05 May 2006 20:21:31 +0200 +# Last Modified: Mon, 04 Sep 2006 15:51:02 +0200 hunk ./source/multimedia/x264/FrugalBuild 7 -pkgver=20060502 +pkgver=20060903 hunk ./source/multimedia/x264/FrugalBuild 11 -depends=('glibc') +depends=('glibc' 'libx11') hunk ./source/multimedia/x264/FrugalBuild 19 -sha1sums=('a1a1ec0c5a7d04428449594bff0633d4a96b01aa') +sha1sums=('c2dcdbcef43c59c5b544e3a8bb2fbdeb9b388dfb') hunk ./source/multimedia/x264/FrugalBuild 24 - Fsed "CFLAGS=\"-Wall -I. -O4" "CFLAGS=\"-Wall -I. $CFLAGS" configure + Fsed "CFLAGS=\"-O4" "CFLAGS=\"$CFLAGS" configure hunk ./source/multimedia/x264/FrugalBuild 27 - --enable-mp4-output + --enable-mp4-output \ + --enable-visualize hunk ./source/multimedia/x264/FrugalBuild 30 - Fln libx264.so.46 /usr/lib/libx264.so + Fln libx264.so.50 /usr/lib/libx264.so } From krics at linuxforum.hu Mon Sep 4 20:05:45 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 20:05:52 2006 Subject: [Frugalware-darcs] frugalware-current: sox-12.18.2-1-x86_64 Message-ID: <20060904180546.30B324E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904180521-d209c-8e402a3ddace6ef672713cc9c9ccc5e6025a6372.gz; [sox-12.18.2-1-x86_64 Christian Hamar alias krix **20060904180521 * Version bump ] { hunk ./source/multimedia/sox/FrugalBuild 1 -# Last Modified: Thu, 11 May 2006 08:59:10 +0200 +# Last Modified: Mon, 04 Sep 2006 20:04:46 +0200 hunk ./source/multimedia/sox/FrugalBuild 6 -pkgver=12.18.1 +pkgver=12.18.2 hunk ./source/multimedia/sox/FrugalBuild 14 -sha1sums=('9591248680029a6e89468daeb4046cdab6e6e759') +sha1sums=('3f5742cbed98deafbcf80251c29224c9a9ef5c89') } From krics at linuxforum.hu Mon Sep 4 20:56:18 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 20:56:22 2006 Subject: [Frugalware-darcs] pacman: db.c: pkggroup code cleanup Message-ID: <20060904185618.EB5164E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904185654-d209c-09368d1e2c2c90d75f6166ab2530c217d2a0251f.gz; [db.c: pkggroup code cleanup Christian Hamar alias krix **20060904185654 * Clean up for -Ss category patch * Removed unneccessary *g as vmiklos requested a better way :P ] { hunk ./src/pacman/db.c 51 - PM_LIST *j, *g; + PM_LIST *j; hunk ./src/pacman/db.c 68 - g = alpm_pkg_getinfo(pkg, PM_PKG_GROUPS); - g = alpm_list_first(g); - pkggroup = alpm_list_getdata(g); + pkggroup = alpm_list_getdata(alpm_pkg_getinfo(pkg, PM_PKG_GROUPS)); } From krics at linuxforum.hu Mon Sep 4 21:08:58 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Sep 4 21:09:00 2006 Subject: [Frugalware-darcs] pacman: configure.ac: typo fix :S Message-ID: <20060904190859.0C0414E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904190953-d209c-365fbd4af0f762359e1efd2ec978aac1bfdc8ab6.gz; [configure.ac: typo fix :S Christian Hamar alias krix **20060904190953 * Typo / Cosmetics fix (AC_HELP -> --disable-fakeoot -> disable-fakeroot :) ) ] { hunk ./configure.ac 141 - AC_HELP_STRING([--disable-fakeoot], [Disable fakeroot proof support]), + AC_HELP_STRING([--disable-fakeroot], [Disable fakeroot proof support]), } From voroskoi at frugalware.org Mon Sep 4 21:13:17 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 4 21:13:19 2006 Subject: [Frugalware-darcs] frugalware-current: x264-20060903-1-i686 Message-ID: <20060904191318.25A6C4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904190904-dd049-cc342d2d0c7dbd781737887850ad36fabda77094.gz; [x264-20060903-1-i686 voroskoi **20060904190904 moved to xmultimedia ] { move ./source/multimedia/x264 ./source/xmultimedia/x264 hunk ./source/xmultimedia/x264/FrugalBuild 15 -groups=('multimedia') +groups=('xmultimedia') } From alex at alex-smith.me.uk Mon Sep 4 21:14:22 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Sep 4 21:14:23 2006 Subject: [Frugalware-darcs] xfce44: xfce44: initial import of repo for xfce 4.4rc1 packages Message-ID: <20060904191422.78ED14E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060904201409-46e39-7e5383188176a3966dacc013c3bd238a4bee1482.gz; [xfce44: initial import of repo for xfce 4.4rc1 packages AlexExtreme **20060904201409] { adddir ./frugalware-i686 adddir ./frugalware-x86_64 adddir ./source } From crazy at frugalware.org Mon Sep 4 21:36:29 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 21:36:32 2006 Subject: [Frugalware-darcs] frugalware-current: notecase-1.1.9-2-i686 Message-ID: <20060904193629.5F9D44E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904193214-f6986-557863912e758858e04e4c81470911137dafa74b.gz; [notecase-1.1.9-2-i686 crazy **20060904193214 * relbump * well I just wanted to build on i686 because failed on factory but that FB got 1) wrong sha1sums() 2) whatever gnome-scriptlet is doing its doesn't have 'a scriptlet' option which this package *needs* so fixed both :P ] { hunk ./source/xapps-extra/notecase/FrugalBuild 1 -# Last modified: Fri, 01 Sep 2006 11:27:29 +0200 +# Last modified: Mon, 04 Sep 2006 21:29:12 +0200 hunk ./source/xapps-extra/notecase/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xapps-extra/notecase/FrugalBuild 17 +options=('scriptlet') hunk ./source/xapps-extra/notecase/FrugalBuild 19 -sha1sums=('98789a9c0ae529e8e5f5f0e1cf3a23ada5d7c2bc') +sha1sums=('98789a9c0ae529e8e5f5f0e1cf3a23ada5d7c2bc' \ + '3182963c89f6e85319d03bf22c76b5b00f2db817') + } From crazy at frugalware.org Mon Sep 4 21:41:12 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 21:41:14 2006 Subject: [Frugalware-darcs] frugalware-current: fontconfig-2.3.96-1-i686 Message-ID: <20060904194112.3BFBA4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904193647-f6986-9f660fc8400348f572694107f75dca98f796c25d.gz; [fontconfig-2.3.96-1-i686 crazy **20060904193647 * added fcarch.tmpl.h-x86_64.patch and added our x86_64 signature in there. Anyway our signature for x86_64 looks strange just see the *original x86 one* ] { hunk ./source/lib/fontconfig/FrugalBuild 19 - frugalware.conf tmp-mute-saw-weird-warning.patch) + frugalware.conf \ + tmp-mute-saw-weird-warning.patch \ + fcarch.tmpl.h-x86_64.patch) hunk ./source/lib/fontconfig/FrugalBuild 29 - '8ea9a225bc6aa75d037d9b77e5f3db9acc969008') - + '8ea9a225bc6aa75d037d9b77e5f3db9acc969008' \ + '041a7694053901ea4dfd6ae98477667c550d7312') addfile ./source/lib/fontconfig/fcarch.tmpl.h-x86_64.patch hunk ./source/lib/fontconfig/fcarch.tmpl.h-x86_64.patch 1 +diff -Naur fontconfig-2.3.96/fc-arch/fcarch.tmpl.h fontconfig-2.3.96-p/fc-arch/fcarch.tmpl.h +--- fontconfig-2.3.96/fc-arch/fcarch.tmpl.h 2006-09-01 07:20:22.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-arch/fcarch.tmpl.h 2006-09-04 21:25:22.000000000 +0200 +@@ -32,3 +32,4 @@ + x86 78563412_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c + x86-64 78563412 + ppc 12345678 ++x86_64 78563412_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000030 } From crazy at frugalware.org Mon Sep 4 21:53:02 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 21:53:04 2006 Subject: [Frugalware-darcs] frugalware-current: fontconfig-2.3.96-1-x86_64 Message-ID: <20060904195302.890114E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904195242-f6986-826a5b4920f023d97594e80eb7e11549b210edfe.gz; [fontconfig-2.3.96-1-x86_64 crazy **20060904195242 * :-D worked ] { hunk ./source/lib/fontconfig/FrugalBuild 1 -# Last modified: Mon, 04 Sep 2006 05:47:11 +0200 +# Last modified: Mon, 04 Sep 2006 21:52:27 +0200 } From voroskoi at frugalware.org Mon Sep 4 22:50:10 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 4 22:50:12 2006 Subject: [Frugalware-darcs] frugalware-current: ffmpeg-20060904-1-i686 Message-ID: <20060904205010.621CB4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904204340-dd049-bf9797d009a01222bf1e5cfe1de00ace16bb917f.gz; [ffmpeg-20060904-1-i686 voroskoi **20060904204340 version bump removed a52dec patch removed dc1394 support as it doesn't work with 2.x version updated depends() some change in build() ] { hunk ./source/multimedia/ffmpeg/ffmpeg-0.4.9-pre1-misc-fixes.patch 1 -diff -Naur ffmpeg-0.4.9-pre1.orig/libavcodec/Makefile ffmpeg-0.4.9-pre1/libavcodec/Makefile ---- ffmpeg-0.4.9-pre1.orig/libavcodec/Makefile 2005-06-02 09:37:57.000000000 +0000 -+++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2005-06-02 09:46:09.000000000 +0000 -@@ -68,8 +68,9 @@ - - # using builtin liba52 or runtime linked liba52.so.0 - ifneq ($(CONFIG_A52BIN),yes) --OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \ -- liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o -+#OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \ -+# liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o -+EXTRALIBS += -la52 - endif - endif - -diff -Naur ffmpeg-0.4.9-pre1.orig/libavcodec/a52dec.c ffmpeg-0.4.9-pre1/libavcodec/a52dec.c ---- ffmpeg-0.4.9-pre1.orig/libavcodec/a52dec.c 2005-06-02 09:37:57.000000000 +0000 -+++ ffmpeg-0.4.9-pre1/libavcodec/a52dec.c 2005-06-02 09:46:21.000000000 +0000 -@@ -23,7 +23,7 @@ - */ - - #include "avcodec.h" --#include "liba52/a52.h" -+#include - - #ifdef CONFIG_A52BIN - #include rmfile ./source/multimedia/ffmpeg/ffmpeg-0.4.9-pre1-misc-fixes.patch hunk ./source/multimedia/ffmpeg/FrugalBuild 1 -# Last Modified: Tue, 09 May 2006 16:06:38 +0200 +# Last Modified: Mon, 04 Sep 2006 22:41:36 +0200 hunk ./source/multimedia/ffmpeg/FrugalBuild 6 -pkgver=20060427 -pkgrel=2 +pkgver=20060904 +pkgrel=1 hunk ./source/multimedia/ffmpeg/FrugalBuild 10 -depends=('a52dec' 'freetype2' 'lame' 'faac' 'libvorbis' 'libdc1394' 'xvidcore' 'libtheora' 'libdca' 'x264') +depends=('a52dec' 'lame' 'faac' 'x264' 'libvorbis' 'xvidcore' 'zlib' 'libdca') +makedepends=('freetype2' 'imlib2') hunk ./source/multimedia/ffmpeg/FrugalBuild 15 -source=(ftp://ftp.frugalware.org/pub/frugalware/frugalware-current/source/multimedia/ffmpeg/$pkgname-$pkgver.tar.bz2 \ - ffmpeg-0.4.9-pre1-misc-fixes.patch) -sha1sums=('a5b64a86c80afc0e3a8887c9ab5de2476921c8d9' \ - '8dc371bf720e2074e17b7ccfa5d0be8760e0b3fc') +source=(ftp://ftp.frugalware.org/pub/frugalware/frugalware-current/source/multimedia/ffmpeg/$pkgname-$pkgver.tar.bz2) +_F_cd_path=ffmpeg +sha1sums=('04b276c58b9b816899cf37cc924f579b403e9743') hunk ./source/multimedia/ffmpeg/FrugalBuild 21 - Fpatch ffmpeg-0.4.9-pre1-misc-fixes.patch - Fmake --enable-gpl \ + Fconf --enable-gpl \ hunk ./source/multimedia/ffmpeg/FrugalBuild 25 - --enable-pp \ hunk ./source/multimedia/ffmpeg/FrugalBuild 27 - --enable-a52 \ - --enable-pthreads \ - --enable-libogg \ - --enable-theora \ + --enable-faadbin \ hunk ./source/multimedia/ffmpeg/FrugalBuild 29 + --enable-x264 \ + --enable-a52 \ + --enable-a52bin \ + --enable-dts \ hunk ./source/multimedia/ffmpeg/FrugalBuild 35 - --enable-dts \ - --enable-x264 - Fmakeinstall prefix=$Fdestdir/usr \ - bindir=$Fdestdir/usr/bin \ - libdir=$Fdestdir/usr/lib \ - mandir=$Fdestdir/usr/man \ - incdir=$Fdestdir/usr/include/ffmpeg \ - SHARED_PP="yes" + --enable-pp \ + --enable-pthreads \ + --disable-opts + make SHARED_PP="yes" || Fdie + make DESTDIR=$Fdestdir install || Fdie hunk ./source/multimedia/ffmpeg/FrugalBuild 42 +# TODO: --enable-libgsm, --enable-dc1394 + } From crazy at frugalware.org Mon Sep 4 23:44:48 2006 From: crazy at frugalware.org (crazy) Date: Mon Sep 4 23:44:50 2006 Subject: [Frugalware-darcs] frugalware-current: liferea-1.0.22-1-i686 Message-ID: <20060904214448.366CE4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904214141-f6986-34dfb61cd4cc47436cf108bbc967a591b9471374.gz; [liferea-1.0.22-1-i686 crazy **20060904214141 * Version bump ] { hunk ./source/gnome-extra/liferea/FrugalBuild 1 -# Last Modified: Thu, 10 Aug 2006 12:16:44 +0200 +# Last Modified: Mon, 04 Sep 2006 23:40:03 +0200 hunk ./source/gnome-extra/liferea/FrugalBuild 6 -pkgver=1.0.21 +pkgver=1.0.22 hunk ./source/gnome-extra/liferea/FrugalBuild 15 -up2date="lynx -dump http://liferea.sourceforge.net/|grep -o '[0-9\.]\+[0-9]\.tar\.gz'|sed 's/\.tar\.gz//'" -sha1sums=('c0b28777789414fc0557ca516c41158eb5e83262') +up2date="lynx -dump http://liferea.sourceforge.net|grep -m1 'Stable'|sed 's/.*]\(.*\) .*/\1/'" +sha1sums=('0a8f7674d93808f45a07e305f81f96d69fc6aca6') } From vmiklos at frugalware.org Tue Sep 5 00:26:05 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 00:26:08 2006 Subject: [Frugalware-darcs] pacman: _alpm_sync_load_dbarchive(): bin Message-ID: <20060904222605.4929B4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904222545-e2957-6150b757c1d1b5b79ddcc66d4005b06302ef169c.gz; [_alpm_sync_load_dbarchive(): bin VMiklos **20060904222545 used by none ] { hunk ./lib/libalpm/sync.c 113 - -/* It returns a PMList of packages extracted from the given archive - * (the archive must have been generated by gensync) - */ -PMList *_alpm_sync_load_dbarchive(char *archive) -{ - PMList *lp = NULL; - register struct archive *_archive; - - if ((_archive = archive_read_new ()) == NULL) { - pm_errno = PM_ERR_LIBARCHIVE_ERROR; - goto error; - } - - archive_read_support_compression_all(_archive); - archive_read_support_format_all (_archive); - - if (archive_read_open_file (_archive, archive, 10240) != ARCHIVE_OK) { - pm_errno = PM_ERR_NOT_A_FILE; - goto error; - } - - archive_read_finish(_archive); - - return(lp); - -error: - if(_archive) { - archive_read_finish(_archive); - } - return(NULL); -} hunk ./lib/libalpm/sync.h 40 - -PMList *_alpm_sync_load_dbarchive(char *archive); } From vmiklos at frugalware.org Tue Sep 5 01:07:08 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 01:07:11 2006 Subject: [Frugalware-darcs] pacman: pactest: initial import Message-ID: <20060904230708.DAB084E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904230141-e2957-aea654ea34c03986991521f5a556474c6c150ce6.gz; [pactest: initial import VMiklos **20060904230141] { adddir ./pactest addfile ./pactest/COPYING addfile ./pactest/ChangeLog addfile ./pactest/README addfile ./pactest/TODO addfile ./pactest/pactest.py addfile ./pactest/pmdb.py addfile ./pactest/pmenv.py addfile ./pactest/pmfile.py addfile ./pactest/pmpkg.py addfile ./pactest/pmrule.py addfile ./pactest/pmtest.py adddir ./pactest/tests addfile ./pactest/tests/TESTS addfile ./pactest/tests/add001.py addfile ./pactest/tests/add002.py addfile ./pactest/tests/add003.py addfile ./pactest/tests/add004.py addfile ./pactest/tests/add010.py addfile ./pactest/tests/add011.py addfile ./pactest/tests/add012.py addfile ./pactest/tests/add013.py addfile ./pactest/tests/add020.py addfile ./pactest/tests/add021.py addfile ./pactest/tests/add030.py addfile ./pactest/tests/add031.py addfile ./pactest/tests/add032.py addfile ./pactest/tests/add040.py addfile ./pactest/tests/add041.py addfile ./pactest/tests/add042.py addfile ./pactest/tests/add050.py addfile ./pactest/tests/add060.py addfile ./pactest/tests/dummy001.py addfile ./pactest/tests/query001.py addfile ./pactest/tests/remove010.py addfile ./pactest/tests/remove011.py addfile ./pactest/tests/remove020.py addfile ./pactest/tests/remove021.py addfile ./pactest/tests/remove030.py addfile ./pactest/tests/smoke001.py addfile ./pactest/tests/sync001.py addfile ./pactest/tests/sync002.py addfile ./pactest/tests/sync003.py addfile ./pactest/tests/sync010.py addfile ./pactest/tests/sync020.py addfile ./pactest/tests/sync021.py addfile ./pactest/tests/sync040.py addfile ./pactest/tests/sync041.py addfile ./pactest/tests/sync042.py addfile ./pactest/tests/sync043.py addfile ./pactest/tests/sync050.py addfile ./pactest/tests/sync100.py addfile ./pactest/tests/sync101.py addfile ./pactest/tests/sync102.py addfile ./pactest/tests/sync103.py addfile ./pactest/tests/sync110.py addfile ./pactest/tests/sync120.py addfile ./pactest/tests/sync130.py addfile ./pactest/tests/sync131.py addfile ./pactest/tests/sync132.py addfile ./pactest/tests/sync133.py addfile ./pactest/tests/sync134.py addfile ./pactest/tests/sync135.py addfile ./pactest/tests/sync200.py addfile ./pactest/tests/sync890.py addfile ./pactest/tests/sync891.py addfile ./pactest/tests/sync892.py addfile ./pactest/tests/sync893.py addfile ./pactest/tests/sync897.py addfile ./pactest/tests/sync898.py addfile ./pactest/tests/sync899.py addfile ./pactest/tests/sync990.py addfile ./pactest/tests/sync992.py addfile ./pactest/tests/sync999.py addfile ./pactest/tests/upgrade001.py addfile ./pactest/tests/upgrade002.py addfile ./pactest/tests/upgrade003.py addfile ./pactest/tests/upgrade004.py addfile ./pactest/tests/upgrade010.py addfile ./pactest/tests/upgrade020.py addfile ./pactest/tests/upgrade021.py addfile ./pactest/tests/upgrade022.py addfile ./pactest/tests/upgrade030.py addfile ./pactest/tests/upgrade040.py addfile ./pactest/util.py hunk ./pactest/COPYING 1 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. hunk ./pactest/ChangeLog 1 + +Release 0.3 (pending) +------------- +- added detection for fakeroot enabled pacman binaries and leftover lock +and core files. +- fixed number format for statistics line +- display elapsed times for each test cases +- added COPYING file +- added patch to disable fakeroot support for pacman 2.9.x +- added "--gdb" command line options to ease debugging (as suggested by VMiklos) +- added "--valgrind" option to run tests through valgrind memory checker +- added more test cases +- added gensync archives + +Release 0.2 (06/02/13) +----------- +- added support for directories, symlinks and altered files +- removed hardcoded references to package names in testcase scripts +- splited pactest.py in several modules +- lots of code optimizations +- created a home page to host the project +- added README, TODO and ChangeLog files + +Release 0.1 (06/01/30) +----------- +Initial release. + +Annoucement on the ArchLinux pacman-dev mailing list: +http://www.archlinux.org/pipermail/pacman-dev/2006-January/000186.html hunk ./pactest/README 1 +README +====== + +pactest is a test suite for the pacman package manager. + +It has a rather high level view of operations performed by pacman: it +automatically creates a test environment based on a test case file +description, the run pacman, and finally check the results of test according +to a set of rules defined in the test case. + +It is written in Python and makes available most of what can be found in +pacman's code to create pacman packages or read and write databases entries. + +Each test case is defined in a separate file that is sourced in order to set +the environment. + +pactest creates the environment in the subdirectory "root" created in the +current directory. +The following directory structure is used: + - var/lib/pacman: databases path (local and sync ones) + - etc/pacman.conf for pacman configuration file + - var/cache/pkg: sync packages cache + - var/log/pactest.log: log file + - var/pub: location for pseudo sync repositories + - tmp: hold all local package archives (to be used with pacman -A or -U) + +Note: the logfile is used to capture all pacman outputs. + +Test case example: + self.description = "Install a package" + + p = pmpkg("dummy", "1.0-3") + p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] + self.addpkg(p) + + self.args = "-A dummy-1.0-1.pkg.tar.gz" + + self.addrule("PACMAN_RETCODE=0") + self.addrule("PKG_EXIST=dummy") + for f in p.files: + self.addrule("FILE_EXIST=%s" % f) + +Basically, the above test case will try to install a package (dummy-1.0-3), +including two files, from a local archive, by calling "pacman -A" +Upon completion, it checks that: + - pacman returned no error code, + - a "dummy" entry exists in the "local" database + - all files from the package exist in the filesystem. + + +Installation +============ + +Simply extract the pactest tarball, jump into the newly created directory and +run pactest.py. See the usage section below. + +Remark: pacman restrictions regarding fakeroot must be disabled. +It can be done by configuring pacman with the --disable-fakeroot flag: + ./configure --disable-fakeroot + +Usage +===== + +pactest will run the suite of tests defined by the "--test" parameter. + +Example: + ./pactest.py --test=test/* + +This example will run tests from the "test" directory. +Note: several "--test" options can be passed to pactest. + +Use the ""help" option to get the full list of parameters: + ./pactest.py --help + + +Parameters +========== + +The test environment is described by the following basic parameters: + + description + ----------- + +A short string describing the aim of the test case. It is displayed on the +standard output during test execution. + + args + ---- + +A string of arguments that are passed to the pacman binary when the test is +run. + +Example: + self.args = "-S dummy" + + option + ------ + +A dictionnary that holds the data used in the pacman configuration file. +It has 3 keys, each one of them pointing at a list of strings: + - noupgrade + - noextract + - ignorepkg + +Examples: + self.option["noupgrade"] = ["etc/X11/xorg.conf", + "etc/pacman.conf"] + self.option["noextract"] = ["etc/lilo.conf"] + + filesystem + ---------- + +A list of strings describing a set of files supposed to exist in the filesystem +when the test case is run. +Upon test startup, pactest will automatically populate the test environment +filesystem with this list of files. + +Example: + self.filesystem = ["bin/dummy", + "etc/X11/xorg.conf.pacsave"] + +Note that all paths are relative ones, and thus file names should not start +with a "/". + + +Packages +======== + +The test case file description shall define a number of packages that can be +used to either populate a database, or to feed pacman with data needed during +its execution. + +This can be achieved by creating pmpkg objects, with the following constructor: + pmpkg(name, version) + +Both "name" and "version" are strings. Also, note that if not provided, the +version defaults to "1.0-1". + +Example: + pkg1 = pmpkg("dummy", "2.1-1") + pkg2 = pmpkg("foobar") + +All fields from a pacman package can be set and modified directly with no +methods to access them. +Note: some fields are automatically set by pactest and should preferably not +be modified by hand (i.e. "md5sum", "size", or "csize"). + +Examples: + pkg.depends = ["pkg2", "pkg3>=2.0"] + pkg.files = ["bin/dummy", "etc/dummy.conf", "usr/man/man1/dummy.1"] + + +Databases +========= + +The test environment provides a way to create and fill databases (local or +sync ones). + +The following methods shall be used: + + * addpkg2db(database, package) + +Notes: "database" is a string, and "package" shall be a previously created +pmpkg object. + +Examples: + self.addpkg2db("local", lpkg) + self.addpkg2db("sync1", spkg11) + self.addpkg2db("sync1", spkg12) + self.addpkg2db("sync2", spkg21) + +Note: there is no need to explicitly create a database. The "local" one +already exists (even if empty), and sync databases are created on the fly when +a new database new is given. + + * addpkg(package) + +package is an existing pmpkg object. +It creates a package archive based on the given object. The resulting archive +is located in the temporary directory of the test environment, ready to be +supplied to pacman for test purposes. + + +Files +===== + +All files created by pactest are filled with a content defaulting to the file +name, with an additional line feed. +For instance, the content of a file "bin/dummy" created in the test environment +file system is: "bin/dummy\n". + +It is possible to create directories by appending a slash "/" to the name and +to create symlinks by appending an arrow followed by a filename " -> target". + +Note: only relative symlinks are supported. + +Example: + pkg = pmpkg("dummy") + pkg.files = ["bin/dummy", + "usr/local/", + "lib/libfoo.so.O", + "lib/libfoo.so -> ./libfoo.so.0"] + +In this example, "usr/local/" is a directory, and "libfoo.so" will be a +symlink pointing at "libfoo.so.0". It is usually a good idea to also define +the target of the symlink! + +It can be interesting for some tests to create altered files. This can be +done by appending one or more asterisks "*" to the file name. + +Example: + lpkg = pmpkg("dummy") + lpkg.files = ["bin/dummy"] + self.addpkg2db("local", lpkg) + + newpkg = pmpkg("dummy", "1.0-2") + newpkg.files = ["bin/dummy*"] + self.addpkg(newpkg) + + self.args = "-U dummy-1.0-2.pkg.tar.gz" + +In this case, package "lpkg" will install a file "bin/dummy" with "bin/dummy\n" +as its content. Upon package upgrade, newpkg will provide a file named +"bin/dummy" with "bin/dummy*\n" as its content. +This is useful to simulate that a file has been modified between two different +releases of a same package. + +The same also applies to files from the "filesystem" parameter of the test +environment, and to the "backup" attribute of a package object. + + +Rules +===== + +Finally, to check test success or failure, one shall define a set of rules. + + addrule(rule) + ------------- + +A rule is a string composed by a key and an item, joined with a "=" symbol. + +Examples: + self.addrule("PACMAN_RETCODE=0") + self.addrule("PKG_EXIST=dummy") + self.addrule("FILE_MODIFIED=bin/dummy") + self.addrule("PKG_DEPENDS=xorg|fontconfig") + +Note: an item can be divided into two arguments, as shown in the latter +example. + +All rules can be prepended with a bang "!" in order to tell pactest to expect +the exact opposite result. + +Example: + self.addrule("!FILE_MODIFIED=bin/dummy") + +Finally, the following rules are supported: + + . PACMAN rules + +Possible rules are: + + PACMAN_RETCODE=value + PACMAN_OUTPUT=value + +For the RETCODE one, pactest will compare pacman return code with the value +provided as an item. +For the OUTPUT one, pactest will grep pacman outputs for the given value. + +Note: PACMAN_OUTPUT should not be used. Pacman outputs are likely to change +from one release to another, so that it's reliability is quite low. + + . PKG rules + +For each rule, pactest will read the entry "name" from the local database and +challenge the requested data with it. + +Possible rules are: + + PKG_EXIST=name + PKG_MODIFIED=name + PKG_VERSION=name|version + PKG_DEPENDS=name|depname + PKG_REQUIREDBY=name|reqbyname + +Example: + PKG_DEPENDS=ncurses|glibc + +pactest will test the local database entry "ncurses" has "glibc" in its +DEPENDS field. + + . FILE rules + + FILE_EXIST=path/to/file + FILE_MODIFIED=path/to/file + FILE_PACNEW=path/to/file + FILE_PACSAVE=path/to/file + FILE_PACORIG=path/to/file hunk ./pactest/TODO 1 +TODO +==== + +Features: +- implement gensync support + +Tests: +- add test cases for pacman -D and pacman -T hunk ./pactest/pactest.py 1 +#! /usr/bin/python +# +# Copyright (c) 2006 by Aurelien Foret +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + + +import getopt +import sys +import glob +import os + +import pmenv +import util + + +__author__ = "Aurelien FORET" +__version__ = "0.3" + + +def usage(retcode): + """ + """ + print "Usage: %s [options] [[--test=] ...]\n\n" % __file__ + sys.exit(retcode) + +if __name__ == "__main__": + env = pmenv.pmenv() + testcases = [] + + try: + opts, args = getopt.getopt(sys.argv[1:], + "d:hp:t:v", + ["debug=", "gdb", "help", "pacman=", "test=", "valgrind", "verbose"]) + except getopt.GetoptError: + usage(1) + + for (cmd, param) in opts: + if cmd == "-v" or cmd == "--verbose": + util.verbose += 1 + elif cmd == "-d" or cmd == "--debug": + env.pacman["debug"] = int(param) + elif cmd == "-t" or cmd == "--test": + testcases.extend(glob.glob(param)) + elif cmd == "-p" or cmd == "--pacman": + env.pacman["bin"] = os.path.abspath(param) + elif cmd == "-h" or cmd == "--help": + usage(0) + elif cmd == "--gdb": + env.pacman["gdb"] = 1 + elif cmd == "--valgrind": + env.pacman["valgrind"] = 1 + + for i in testcases: + env.addtest(i) + + env.run() + env.results() hunk ./pactest/pmdb.py 1 +#! /usr/bin/python +# +# Copyright (c) 2006 by Aurelien Foret +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + + +import os +import tempfile +import shutil + +import pmpkg +from util import * + + +def _mkfilelist(files): + """Generate a list of files from the list supplied as an argument. + + Each path is decomposed to generate the list of all directories leading + to the file. + + Example with 'usr/local/bin/dummy': + The resulting list will be + usr/ + usr/local/ + usr/local/bin/ + usr/local/bin/dummy + """ + i = [] + for f in files: + dir = getfilename(f) + i.append(dir) + while "/" in dir: + [dir, tmp] = dir.rsplit("/", 1) + if not dir + "/" in files: + i.append(dir + "/") + i.sort() + return i + +def _mkbackuplist(backup): + """ + """ + return ["%s\t%s" % (getfilename(i), mkmd5sum(i)) for i in backup] + +def _getsection(fd): + """ + """ + i = [] + while 1: + line = fd.readline().strip("\n") + if not line: + break + i.append(line) + return i + +def _mksection(title, data): + """ + """ + s = "" + if isinstance(data, list): + s = "\n".join(data) + else: + s = data + return "%%%s%%\n" \ + "%s\n" % (title, s) + + +class pmdb: + """Database object + """ + + def __init__(self, treename, dbdir): + self.treename = treename + self.dbdir = dbdir + self.pkgs = [] + + def __str__(self): + return "%s" % self.treename + + def getpkg(self, name): + """ + """ + for pkg in self.pkgs: + if name == pkg.name: + return pkg + + def db_read(self, name): + """ + """ + + path = os.path.join(self.dbdir, self.treename) + if not os.path.isdir(path): + return None + + dbentry = "" + for roots, dirs, files in os.walk(path): + for i in dirs: + [pkgname, pkgver, pkgrel] = i.rsplit("-", 2) + if pkgname == name: + dbentry = i + break + if not dbentry: + return None + path = os.path.join(path, dbentry) + + [pkgname, pkgver, pkgrel] = dbentry.rsplit("-", 2) + pkg = pmpkg.pmpkg(pkgname, pkgver + "-" + pkgrel) + + # desc + filename = os.path.join(path, "desc") + fd = file(filename, "r") + while 1: + line = fd.readline() + if not line: + break + line = line.strip("\n") + if line == "%DESC%": + pkg.desc = fd.readline().strip("\n") + elif line == "%GROUPS%": + pkg.groups = _getsection(fd) + elif line == "%URL%": + pkg.url = fd.readline().strip("\n") + elif line == "%LICENSE%": + pkg.license = _getsection(fd) + elif line == "%ARCH%": + pkg.arch = fd.readline().strip("\n") + elif line == "%BUILDDATE%": + pkg.builddate = fd.readline().strip("\n") + elif line == "%INSTALLDATE%": + pkg.installdate = fd.readline().strip("\n") + elif line == "%PACKAGER%": + pkg.packager = fd.readline().strip("\n") + elif line == "%REASON%": + pkg.reason = int(fd.readline().strip("\n")) + elif line == "%SIZE%" or line == "%CSIZE%": + pkg.size = int(fd.readline().strip("\n")) + elif line == "%MD5SUM%": + pkg.md5sum = fd.readline().strip("\n") + elif line == "%REPLACES%": + pkg.replaces = _getsection(fd) + elif line == "%FORCE%": + fd.readline() + pkg.force = 1 + fd.close() + pkg.checksum["desc"] = getmd5sum(filename) + pkg.mtime["desc"] = getmtime(filename) + + # files + filename = os.path.join(path, "files") + fd = file(filename, "r") + while 1: + line = fd.readline() + if not line: + break + line = line.strip("\n") + if line == "%FILES%": + while line: + line = fd.readline().strip("\n") + if line and line[-1] != "/": + pkg.files.append(line) + if line == "%BACKUP%": + pkg.backup = _getsection(fd) + fd.close() + pkg.checksum["files"] = getmd5sum(filename) + pkg.mtime["files"] = getmtime(filename) + + # depends + filename = os.path.join(path, "depends") + fd = file(filename, "r") + while 1: + line = fd.readline() + if not line: + break + line = line.strip("\n") + if line == "%DEPENDS%": + pkg.depends = _getsection(fd) + elif line == "%REQUIREDBY%": + pkg.requiredby = _getsection(fd) + elif line == "%CONFLICTS%": + pkg.conflicts = _getsection(fd) + elif line == "%PROVIDES%": + pkg.provides = _getsection(fd) + elif line == "%REPLACES%": + pkg.replaces = _getsection(fd) + elif line == "%FORCE%": + fd.readline() + pkg.force = 1 + fd.close() + pkg.checksum["depends"] = getmd5sum(filename) + pkg.mtime["depends"] = getmtime(filename) + + # install + filename = os.path.join(path, "install") + if os.path.isfile(filename): + pkg.checksum["install"] = getmd5sum(filename) + pkg.mtime["install"] = getmtime(filename) + + return pkg + + # + # db_write is used to add both 'local' and 'sync' db entries + # + def db_write(self, pkg): + """ + """ + + path = os.path.join(self.dbdir, self.treename, pkg.dbname()) + if not os.path.isdir(path): + os.makedirs(path); + + # desc + # for local db entries: name, version, desc, groups, url, license, + # arch, builddate, installdate, packager, + # size, reason + # for sync entries: name, version, desc, groups, csize, md5sum, + # replaces, force + data = [_mksection("NAME", pkg.name)] + data.append(_mksection("VERSION", pkg.version)) + if pkg.desc: + data.append(_mksection("DESC", pkg.desc)) + if pkg.groups: + data.append(_mksection("GROUPS", pkg.groups)) + if pkg.arch: + data.append(_mksection("ARCH", pkg.arch)) + if self.treename == "local": + if pkg.url: + data.append(_mksection("URL", pkg.url)) + if pkg.license: + data.append(_mksection("LICENSE", pkg.license)) + if pkg.builddate: + data.append(_mksection("BUILDDATE", pkg.builddate)) + if pkg.installdate: + data.append(_mksection("INSTALLDATE", pkg.installdate)) + if pkg.packager: + data.append(_mksection("PACKAGER", pkg.packager)) + if pkg.size: + data.append(_mksection("SIZE", pkg.size)) + if pkg.reason: + data.append(_mksection("REASON", pkg.reason)) + else: + if pkg.csize: + data.append(_mksection("CSIZE", pkg.csize)) + if pkg.md5sum: + data.append(_mksection("MD5SUM", pkg.md5sum)) + if data: + data.append("") + filename = os.path.join(path, "desc") + mkfile(filename, "\n".join(data)) + pkg.checksum["desc"] = getmd5sum(filename) + pkg.mtime["desc"] = getmtime(filename) + + # files + # for local entries, fields are: files, backup + # for sync ones: none + if self.treename == "local": + data = [] + if pkg.files: + data.append(_mksection("FILES", _mkfilelist(pkg.files))) + if pkg.backup: + data.append(_mksection("BACKUP", _mkbackuplist(pkg.backup))) + if data: + data.append("") + filename = os.path.join(path, "files") + mkfile(filename, "\n".join(data)) + pkg.checksum["files"] = getmd5sum(filename) + pkg.mtime["files"] = getmtime(filename) + + # depends + # for local db entries: depends, requiredby, conflicts, provides + # for sync ones: depends, conflicts, provides + data = [] + if pkg.depends: + data.append(_mksection("DEPENDS", pkg.depends)) + if self.treename == "local": + if pkg.requiredby: + data.append(_mksection("REQUIREDBY", pkg.requiredby)) + if pkg.conflicts: + data.append(_mksection("CONFLICTS", pkg.conflicts)) + if pkg.provides: + data.append(_mksection("PROVIDES", pkg.provides)) + if not self.treename == "local": + if pkg.replaces: + data.append(_mksection("REPLACES", pkg.replaces)) + if pkg.force: + data.append(_mksection("FORCE", "")) + if data: + data.append("") + filename = os.path.join(path, "depends") + mkfile(filename, "\n".join(data)) + pkg.checksum["depends"] = getmd5sum(filename) + pkg.mtime["depends"] = getmtime(filename) + + # install + if self.treename == "local": + empty = 1 + for value in pkg.install.values(): + if value: + empty = 0 + if not empty: + filename = os.path.join(path, "install") + mkinstallfile(filename, pkg.install) + pkg.checksum["install"] = getmd5sum(filename) + pkg.mtime["install"] = getmtime(filename) + + def gensync(self, path): + """ + """ + + curdir = os.getcwd() + tmpdir = tempfile.mkdtemp() + os.chdir(tmpdir) + + for pkg in self.pkgs: + mkdescfile(pkg.fullname(), pkg) + + # Generate database archive + os.makedirs(path, 0755) + archive = os.path.join(path, "%s%s" % (self.treename, PM_EXT_DB)) + os.system("tar zcf %s *" % archive) + + os.chdir(curdir) + shutil.rmtree(tmpdir) + + def ispkgmodified(self, pkg): + """ + """ + + modified = 0 + + oldpkg = self.getpkg(pkg.name) + if not oldpkg: + return 0 + + dbg("oldpkg.checksum : %s" % oldpkg.checksum) + dbg("oldpkg.mtime : %s" % oldpkg.mtime) + + for key in pkg.mtime.keys(): + if key == "install" \ + and oldpkg.mtime[key] == (0, 0, 0) \ + and pkg.mtime[key] == (0, 0, 0): + continue + if not oldpkg.mtime[key][1:3] == pkg.mtime[key][1:3]: + modified += 1 + + return modified + + +if __name__ == "__main__": + db = pmdb("local") + print db hunk ./pactest/pmenv.py 1 +#! /usr/bin/python +# +# Copyright (c) 2006 by Aurelien Foret +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + + +import os +import time + +import pmtest + + +class pmenv: + """Environment object + """ + + def __init__(self, root = "root"): + self.root = os.path.abspath(root) + self.pacman = { + "bin": "pacman", + "debug": 0, + "gdb": 0, + "valgrind": 0 + } + self.testcases = [] + + def __str__(self): + return "root = %s\n" \ + "pacman = %s" \ + % (self.root, self.pacman) + + def addtest(self, testcase): + """ + """ + if not os.path.isfile(testcase): + err("file %s not found" % testcase) + return + test = pmtest.pmtest(testcase, self.root) + self.testcases.append(test) + + def run(self): + """ + """ + + for t in self.testcases: + print "=========="*8 + print "Running '%s'" % t.name.strip(".py") + + t.load() + print t.description + print "----------"*8 + + t.generate() + # Hack for mtimes consistency + modified = 0 + for i in t.rules: + if i.rule.find("MODIFIED") != -1: + modified = 1 + if modified: + time.sleep(3) + + t.run(self.pacman) + + t.check() + print "==> Test result" + if t.result["ko"] == 0: + print "\tPASSED" + else: + print "\tFAILED" + print + + def results(self): + """ + """ + passed = 0 + print "=========="*8 + print "Results" + print "----------"*8 + for test in self.testcases: + ok = test.result["ok"] + ko = test.result["ko"] + rules = len(test.rules) + if ko == 0: + print "[PASSED]", + passed += 1 + else: + print "[FAILED]", + print test.name.strip(".py").ljust(38), + print "Rules:", + print "OK = %2u KO = %2u SKIP = %2u" % (ok, ko, rules-(ok+ko)) + print "----------"*8 + total = len(self.testcases) + failed = total - passed + print "TOTAL = %3u" % total + if total: + print "PASSED = %3u (%6.2f%%)" % (passed, float(passed)*100/total) + print "FAILED = %3u (%6.2f%%)" % (failed, float(failed)*100/total) + print + + +if __name__ == "__main__": + env = pmenv("/tmp") + print env hunk ./pactest/pmfile.py 1 +#! /usr/bin/python +# +# Copyright (c) 2006 by Aurelien Foret +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + + +import os + +from util import * + + +class pmfile: + """File object + """ + + def __init__(self, root, name): + self.name = name + self.root = root + + filename = os.path.join(self.root, self.name) + self.checksum = getmd5sum(filename) + self.mtime = getmtime(filename) + + def __str__(self): + return "%s (%s / %lu)" % (self.name, self.checksum, self.mtime) + + def ismodified(self): + """ + """ + + retval = 0 + + filename = os.path.join(self.root, self.name) + checksum = getmd5sum(filename) + mtime = getmtime(filename) + + if debug: + print "ismodified(%s)" % self.name + print "old: %s / %s" % (self.checksum, self.mtime) + print "new: %s / %s" % (checksum, mtime) + + if not self.checksum == checksum \ + or not (self.mtime[1], self.mtime[2]) == (mtime[1], mtime[2]): + retval = 1 + + return retval + + +if __name__ == "__main__": + f = pmfile("/tmp", "foobar") + print f hunk ./pactest/pmpkg.py 1 +#! /usr/bin/python +# +# Copyright (c) 2006 by Aurelien Foret +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + + +import os +import tempfile +import stat +import shutil + +from util import * + + +class pmpkg: + """Package object. + + Object holding data from a pacman package. + """ + + def __init__(self, name, version = "1.0-1", arch = 'i686'): + # desc + self.name = name + self.version = version + self.desc = "" + self.groups = [] + self.url = "" + self.license = [] + self.arch = arch + self.builddate = "" + self.installdate = "" + self.packager = "" + self.size = 0 + self.csize = 0 + self.reason = 0 + self.md5sum = "" # sync only + self.replaces = [] # sync only (will be moved to depends) + self.force = 0 # sync only (will be moved to depends) + # depends + self.depends = [] + self.requiredby = [] # local only + self.conflicts = [] + self.provides = [] + # files + self.files = [] + self.backup = [] + # install + self.install = { + "pre_install": "", + "post_install": "", + "pre_remove": "", + "post_remove": "", + "pre_upgrade": "", + "post_upgrade": "" + } + self.checksum = { + "desc": "", + "depends": "", + "files": "", + "install": "" + } + self.mtime = { + "desc": (0, 0, 0), + "depends": (0, 0, 0), + "files": (0, 0, 0), + "install": (0, 0, 0) + } + + def __str__(self): + s = ["%s" % self.fullname()] + s.append("description: %s" % self.desc) + s.append("url: %s" % self.url) + s.append("depends: %s" % " ".join(self.depends)) + s.append("files: %s" % " ".join(self.files)) + s.append("reason: %d" % self.reason) + return "\n".join(s) + + def dbname(self): + """Db name of a package. + + Returns a string formatted as follows: "pkgname-pkgver". + """ + return self.name + "-" + self.version + + def fullname(self): + """Long name of a package. + + Returns a string formatted as follows: "pkgname-pkgver-arch". + """ + return self.name + "-" + self.version + "-" + self.arch + + def filename(self): + """File name of a package, including its extension. + + Returns a string formatted as follows: "pkgname-pkgver.PKG_EXT_PKG". + """ + return "%s%s" % (self.fullname(), PM_EXT_PKG) + + def install_files(self, root): + """Install files in the filesystem located under "root". + + Files are created with content generated automatically. + """ + [mkfile(os.path.join(root, f), f) for f in self.files] + + def makepkg(self, path): + """Creates a pacman package archive. + + A package archive is generated in the location 'path', based on the data + from the object. + """ + archive = os.path.join(path, self.filename()) + + curdir = os.getcwd() + tmpdir = tempfile.mkdtemp() + os.chdir(tmpdir) + + # Generate package file system + for f in self.files: + mkfile(f, f) + self.size += os.stat(getfilename(f))[stat.ST_SIZE] + + # .PKGINFO + data = ["pkgname = %s" % self.name] + data.append("pkgver = %s" % self.version) + data.append("pkgdesc = %s" % self.desc) + data.append("url = %s" % self.url) + data.append("builddate = %s" % self.builddate) + data.append("packager = %s" % self.packager) + data.append("size = %s" % self.size) + if self.arch: + data.append("arch = %s" % self.arch) + for i in self.license: + data.append("license = %s" % i) + for i in self.replaces: + data.append("replaces = %s" % i) + for i in self.groups: + data.append("group = %s" % i) + for i in self.depends: + data.append("depend = %s" % i) + for i in self.conflicts: + data.append("conflict = %s" % i) + for i in self.provides: + data.append("provides = %s" % i) + for i in self.backup: + data.append("backup = %s" % i) + mkfile(".PKGINFO", "\n".join(data)) + targets = ".PKGINFO" + + # .INSTALL + empty = 1 + for value in self.install.values(): + if value: + empty = 0 + if not empty: + mkinstallfile(".INSTALL", self.install) + targets += " .INSTALL" + + # .FILELIST + if self.files: + os.system("tar cvf /dev/null * | sort >.FILELIST") + targets += " .FILELIST *" + + # Generate package archive + os.system("tar zcf %s %s" % (archive, targets)) + + os.chdir(curdir) + shutil.rmtree(tmpdir) + + +if __name__ == "__main__": + pkg = pmpkg("dummy") + print pkg hunk ./pactest/pmrule.py 1 +#! /usr/bin/python +# +# Copyright (c) 2006 by Aurelien Foret +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + + +from util import * + + +class pmrule: + """Rule object + """ + + def __init__(self, rule): + self.rule = rule + self.false = 0 + self.result = 0 + + def __str__(self): + return "rule = %s" % self.rule + + def check(self, root, retcode, localdb, files): + """ + """ + + success = 1 + + [test, args] = self.rule.split("=") + if test[0] == "!": + self.false = 1 + test = test.lstrip("!") + [kind, case] = test.split("_") + if "|" in args: + [key, value] = args.split("|", 1) + else: + [key, value] = [args, None] + + if kind == "PACMAN": + if case == "RETCODE": + if retcode != int(key): + success = 0 + elif case == "OUTPUT": + if not grep(os.path.join(root, LOGFILE), key): + success = 0 + else: + success = -1 + elif kind == "PKG": + newpkg = localdb.db_read(key) + if not newpkg: + success = 0 + else: + dbg("newpkg.checksum : %s" % newpkg.checksum) + dbg("newpkg.mtime : %s" % newpkg.mtime) + if case == "EXIST": + success = 1 + elif case == "MODIFIED": + if not localdb.ispkgmodified(newpkg): + success = 0 + elif case == "VERSION": + if value != newpkg.version: + success = 0 + elif case == "GROUPS": + if not value in newpkg.groups: + success = 0 + elif case == "DEPENDS": + if not value in newpkg.depends: + success = 0 + elif case == "REQUIREDBY": + if not value in newpkg.requiredby: + success = 0 + elif case == "REASON": + if not newpkg.reason == int(value): + success = 0 + elif case == "FILES": + if not value in newpkg.files: + success = 0 + elif case == "BACKUP": + found = 0 + for f in newpkg.backup: + name, md5sum = f.split("\t") + if value == name: + found = 1 + if not found: + success = 0 + else: + success = -1 + elif kind == "FILE": + filename = os.path.join(root, key) + if case == "EXIST": + if not os.path.isfile(filename): + success = 0 + else: + if case == "MODIFIED": + for f in files: + if f.name == key: + if not f.ismodified(): + success = 0 + elif case == "PACNEW": + if not os.path.isfile("%s%s" % (filename, PM_PACNEW)): + success = 0 + elif case == "PACORIG": + if not os.path.isfile("%s%s" % (filename, PM_PACORIG)): + success = 0 + elif case == "PACSAVE": + if not os.path.isfile("%s%s" % (filename, PM_PACSAVE)): + success = 0 + else: + success = -1 + else: + success = -1 + + if self.false and success != -1: + success = not success + self.result = success + return success + + +if __name__ != "__main__": + rule = pmrule("PKG_EXIST=dummy") hunk ./pactest/pmtest.py 1 +#! /usr/bin/python +# +# Copyright (c) 2006 by Aurelien Foret +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + + +import os +import shutil +import time + +import pmrule +import pmdb +import pmfile +from pmpkg import pmpkg +from util import * + + +class pmtest: + """Test object + """ + + def __init__(self, name, root): + self.name = name + self.root = root + + def __str__(self): + return "name = %s\n" \ + "root = %s" % (self.name, self.root) + + def addpkg2db(self, treename, pkg): + """ + """ + if not treename in self.db: + self.db[treename] = pmdb.pmdb(treename, os.path.join(self.root, PM_DBPATH)) + self.db[treename].pkgs.append(pkg) + + def addpkg(self, pkg): + """ + """ + self.localpkgs.append(pkg) + + def addrule(self, rulename): + """ + """ + rule = pmrule.pmrule(rulename) + self.rules.append(rule) + + def load(self): + """ + """ + + # Reset test parameters + self.result = { + "ok": 0, + "ko": 0 + } + self.args = "" + self.retcode = 0 + self.db = { + "local": pmdb.pmdb("local", os.path.join(self.root, PM_DBPATH)) + } + self.localpkgs = [] + self.filesystem = [] + + self.description = "" + self.option = { + "noupgrade": [], + "ignorepkg": [], + "noextract": [] + } + + # Test rules + self.rules = [] + self.files = [] + + if os.path.isfile(self.name): + execfile(self.name) + else: + err("file %s does not exist!" % self.name) + + def generate(self): + """ + """ + + print "==> Generating test environment" + + # Cleanup leftover files from a previous test session + if os.path.isdir(self.root): + shutil.rmtree(self.root) + vprint("\t%s" % self.root) + + # Create directory structure + vprint(" Creating directory structure:") + dbdir = os.path.join(self.root, PM_DBPATH) + cachedir = os.path.join(self.root, PM_CACHEDIR) + syncdir = os.path.join(self.root, SYNCREPO) + tmpdir = os.path.join(self.root, TMPDIR) + logdir = os.path.join(self.root, os.path.dirname(LOGFILE)) + etcdir = os.path.join(self.root, os.path.dirname(PACCONF)) + for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir]: + if not os.path.isdir(dir): + vprint("\t%s" % dir[len(self.root)+1:]) + os.makedirs(dir, 0755) + + # Configuration file + vprint(" Creating configuration file") + vprint("\t%s" % PACCONF) + mkcfgfile(PACCONF, self.root, self.option, self.db) + + # Creating packages + vprint(" Creating package archives") + for pkg in self.localpkgs: + vprint("\t%s" % os.path.join(TMPDIR, pkg.filename())) + pkg.makepkg(tmpdir) + for key, value in self.db.iteritems(): + if key == "local": + continue + for pkg in value.pkgs: + archive = pkg.filename() + vprint("\t%s" % os.path.join(PM_CACHEDIR, archive)) + pkg.makepkg(cachedir) + pkg.md5sum = getmd5sum(os.path.join(cachedir, archive)) + pkg.csize = os.stat(os.path.join(cachedir, archive))[stat.ST_SIZE] + + # Populating databases + vprint(" Populating databases") + for key, value in self.db.iteritems(): + for pkg in value.pkgs: + vprint("\t%s/%s" % (key, pkg.fullname())) + if key == "local": + pkg.installdate = time.ctime() + value.db_write(pkg) + + # Creating sync database archives + vprint(" Creating sync database archives") + for key, value in self.db.iteritems(): + if key == "local": + continue + archive = value.treename + PM_EXT_DB + vprint("\t" + os.path.join(SYNCREPO, archive)) + value.gensync(os.path.join(syncdir, value.treename)) + + # Filesystem + vprint(" Populating file system") + for pkg in self.db["local"].pkgs: + vprint("\tinstalling %s" % pkg.fullname()) + pkg.install_files(self.root) + for f in self.filesystem: + vprint("\t%s" % f) + mkfile(os.path.join(self.root, f), f) + + # Done. + vprint(" Taking a snapshot of the file system") + for roots, dirs, files in os.walk(self.root): + for i in files: + filename = os.path.join(roots, i) + f = pmfile.pmfile(self.root, filename.replace(self.root + "/", "")) + self.files.append(f) + vprint("\t%s" % f.name) + + def run(self, pacman): + """ + """ + + if os.path.isfile(PM_LOCK): + print "\tERROR: another pacman session is on-going -- skipping" + return + + print "==> Running test" + vprint("\tpacman %s" % self.args) + + cmd = ["fakeroot"] + if pacman["gdb"]: + cmd.append("libtool gdb --args") + if pacman["valgrind"]: + cmd.append("valgrind --tool=memcheck --leak-check=full --show-reachable=yes") + cmd.append("%s --noconfirm --config=%s --root=%s" \ + % (pacman["bin"], os.path.join(self.root, PACCONF), self.root)) + if pacman["debug"]: + cmd.append("--debug=%s" % pacman["debug"]) + cmd.append("%s" % self.args) + if not pacman["gdb"] and not pacman["valgrind"]: + cmd.append(">%s 2>&1" % os.path.join(self.root, LOGFILE)) + dbg(" ".join(cmd)) + + # Change to the tmp dir before running pacman, so that local package + # archives are made available more easily. + curdir = os.getcwd() + tmpdir = os.path.join(self.root, TMPDIR) + os.chdir(tmpdir) + + t0 = time.time() + self.retcode = os.system(" ".join(cmd)) + t1 = time.time() + vprint("\ttime elapsed: %ds" % (t1-t0)) + + if self.retcode == None: + self.retcode = 0 + else: + self.retcode /= 256 + dbg("retcode = %s" % self.retcode) + os.chdir(curdir) + + # Check if pacman failed because of bad permissions + if self.retcode \ + and grep(os.path.join(self.root, LOGFILE), + "you cannot perform this operation unless you are root"): + print "\tERROR: pacman support for fakeroot is not disabled" + # Check if the lock is still there + if os.path.isfile(PM_LOCK): + print "\tERROR: %s not removed" % PM_LOCK + os.unlink(PM_LOCK) + # Look for a core file + if os.path.isfile(os.path.join(self.root, TMPDIR, "core")): + print "\tERROR: pacman dumped a core file" + + def check(self): + """ + """ + + print "==> Checking rules" + + for i in self.rules: + success = i.check(self.root, self.retcode, self.db["local"], self.files) + if success == 1: + msg = "OK" + self.result["ok"] += 1 + elif success == 0: + msg = "KO" + self.result["ko"] += 1 + else: + msg = "SKIP" + print "\t[%s] %s" % (msg, i.rule) + i.result = success + + +if __name__ == "__main__": + test = pmtest("test1", "./root") + print test hunk ./pactest/tests/TESTS 1 +add001: Install a package +add002: Install a package (already installed) +add003: Install a set of packages +add004: Install a set of the same package at different versions +add010: Install a package with a filesystem conflict +add011: Install a package with a filesystem conflict (--force) +add012: Install two packages with a conflicting file +add013: Install two packages with a conflicting file (--force) +add020: Install a package with an existing file +add021: Install a package with an existing file (new modified) +add030: Freshen a package +add031: Freshen a package (installed is newer) +add032: Freshen a package (installed is newer) +add040: Install a package with a missing dependency +add041: Install a package with a missing dependency (nodeps) +add042: Install a package with cascaded dependencies +add050: Install a package with a file in NoUpgrade +add060: Install a package with a file in NoExtract +query001: Query a package +remove010: Remove a package, with a file marked for backup +remove011: Remove a package, with a modified file marked for backup +remove020: Remove a package, with a file marked for backup (--nosave) +remove021: Remove a package, with a modified file marked for backup (--nosave) +smoke001: Install a thousand packages in a single transaction +sync001: Install a package from a sync db +sync002: Upgrade a package from a sync db +sync003: Install a package from a sync db, with a filesystem conflict +sync010: Install a package from a sync db, with its dependencies +sync040: Install two targets with a conflict +sync041: Install two conflicting targets +sync042: Install a sync package conflicting with a local one +sync043: Install a sync package conflicting with a local one +sync050: Install a virtual target (provided by a sync package) +sync100: Sysupgrade with a newer sync package +sync101: Sysupgrade with same version for local and sync packages +sync102: Sysupgrade with a newer local package +sync103: Sysupgrade with a local package not existing in sync db +sync110: Sysupgrade of a package pulling new dependencies +sync120: Sysupgrade of packages in 'IgnorePkg' +sync130: Sysupgrade with a sync package replacing a local one +sync131: Sysupgrade with a sync package replacing a set of local ones +sync132: Sysupgrade with a replacement for a local package out of date +sync133: Sysupgrade with a sync package replacing a local one in 'IgnorePkg' +sync134: Sysupgrade with a set of sync packages replacing a set local one +sync135: Sysupgrade with a set of sync packages replacing a set of local ones +sync897: System upgrade +sync898: System upgrade +sync899: System upgrade +sync990: Sync a package pulling a dependency conflicting with a target +sync992: Sync a package pulling a conflicting dependency +sync999: System upgrade +upgrade001: Upgrade a package (newer version) +upgrade002: Upgrade a package (same version) +upgrade003: Upgrade a package (lesser version) +upgrade004: Upgrade a package (not installed) +upgrade010: Upgrade a package, with a file in NoUpgrade +upgrade020: Upgrade a package, with a file in 'backup' (new modified) +upgrade021: Upgrade a package, with a file in 'backup' (local modified, new unchanged) +upgrade022: Upgrade a package, with a file in 'backup' (local and new modified) +upgrade030: Upgrade packages with various reasons +upgrade040: file relocation 1 hunk ./pactest/tests/add001.py 1 +self.description = "Install a package" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +for f in p.files: + self.addrule("FILE_EXIST=%s" % f) hunk ./pactest/tests/add002.py 1 +self.description = "Install a package (already installed)" + +lp = pmpkg("dummy") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_MODIFIED=dummy") +for f in lp.files: + self.addrule("!FILE_MODIFIED=%s" % f) hunk ./pactest/tests/add003.py 1 +self.description = "Install a set of packages" + +p1 = pmpkg("pkg1") +p1.files = ["bin/pkg1", + "usr/man/man1/pkg1.1"] + +p2 = pmpkg("pkg2", "2.0-1") +p2.files = ["bin/pkg2", + "usr/man/man1/pkg2.1"] + +p3 = pmpkg("pkg3", "3.0-1") +p3.files = ["bin/pkg3", "usr/man/man1/pkg3.1"] + +for p in p1, p2, p3: + self.addpkg(p) + +self.args = "-A %s" % " ".join([p.filename() for p in p1, p2, p3]) + +self.addrule("PACMAN_RETCODE=0") +for p in p1, p2, p3: + self.addrule("PKG_EXIST=%s" % p.name) + for f in p.files: + self.addrule("FILE_EXIST=%s" % f) hunk ./pactest/tests/add004.py 1 +self.description = "Install a set of the same package at different versions" + +p1 = pmpkg("dummy", "1.0-2") +p2 = pmpkg("dummy", "2.0-1") +p3 = pmpkg("dummy") +for p in p1, p2, p3: + self.addpkg(p) + +self.args = "-A %s" % " ".join([p.filename() for p in p1, p2, p3]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|2.0-1") hunk ./pactest/tests/add010.py 1 +self.description = "Install a package with a filesystem conflict" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.filesystem = ["bin/dummy"] + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_MODIFIED=bin/dummy") +self.addrule("!FILE_EXIST=usr/man/man1/dummy.1") hunk ./pactest/tests/add011.py 1 +self.description = "Install a package with a filesystem conflict (--force)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.filesystem = ["bin/dummy"] + +self.args = "-Af %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("FILE_MODIFIED=bin/dummy") +self.addrule("FILE_EXIST=usr/man/man1/dummy.1") hunk ./pactest/tests/add012.py 1 +self.description = "Install two packages with a conflicting file" + +p1 = pmpkg("dummy") +p1.files = ["bin/dummy", + "usr/man/man1/dummy.1", + "usr/common"] + +p2 = pmpkg("foobar") +p2.files = ["bin/foobar", + "usr/man/man1/foobar.1", + "usr/common"] + +for p in p1, p2: + self.addpkg(p) + +self.args = "-A %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!PKG_EXIST=foobar") hunk ./pactest/tests/add013.py 1 +self.description = "Install two packages with a conflicting file (--force)" + +p1 = pmpkg("dummy") +p1.files = ["bin/dummy", + "usr/man/man1/dummy.1", + "usr/common"] + +p2 = pmpkg("foobar") +p2.files = ["bin/foobar", + "usr/man/man1/foobar.1", + "usr/common"] + +for p in p1, p2: + self.addpkg(p) + +self.args = "-Af %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=0") +for p in p1, p2: + self.addrule("PKG_EXIST=%s" % p.name) + self.addrule("PKG_FILES=%s|usr/common" % p.name) + for f in p.files: + self.addrule("FILE_EXIST=%s" % f) hunk ./pactest/tests/add020.py 1 +self.description = "Install a package with an existing file" + +p = pmpkg("dummy") +p.files = ["etc/dummy.conf"] +self.addpkg(p) + +self.filesystem = ["etc/dummy.conf"] + +self.args = "-Af %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("FILE_MODIFIED=etc/dummy.conf") +self.addrule("!FILE_PACNEW=etc/dummy.conf") +self.addrule("!FILE_PACORIG=etc/dummy.conf") hunk ./pactest/tests/add021.py 1 +self.description = "Install a package with an existing file (new modified)" + +p = pmpkg("dummy") +p.files = ["etc/dummy.conf*"] +p.backup = ["etc/dummy.conf"] +self.addpkg(p) + +self.filesystem = ["etc/dummy.conf"] + +self.args = "-Af %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("FILE_MODIFIED=etc/dummy.conf") +self.addrule("!FILE_PACNEW=etc/dummy.conf") +self.addrule("FILE_PACORIG=etc/dummy.conf") hunk ./pactest/tests/add030.py 1 +self.description = "Freshen a package" + +lp = pmpkg("dummy") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.0-2") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-F %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-2") +for f in p.files: + self.addrule("FILE_MODIFIED=%s" % f) hunk ./pactest/tests/add031.py 1 +self.description = "Freshen a package (installed is newer)" + +lp = pmpkg("dummy", "1.0-2") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-F %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_MODIFIED=dummy") +for f in p.files: + self.addrule("!FILE_MODIFIED=%s" % f) hunk ./pactest/tests/add032.py 1 +self.description = "Freshen a package (installed is newer)" + +lp = pmpkg("dummy") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-F %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_MODIFIED=dummy") +for f in p.files: + self.addrule("!FILE_MODIFIED=%s" % f) hunk ./pactest/tests/add040.py 1 +self.description = "Install a package with a missing dependency" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p.depends = ["missdep"] +self.addpkg(p) + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=dummy") +for f in p.files: + self.addrule("!FILE_EXIST=%s" % f) hunk ./pactest/tests/add041.py 1 +self.description = "Install a package with a missing dependency (nodeps)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p.depends = ["dep1"] +self.addpkg(p) + +self.args = "-Ad %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("PKG_DEPENDS=dummy|dep1") +for f in p.files: + self.addrule("FILE_EXIST=%s" % f) hunk ./pactest/tests/add042.py 1 +self.description = "Install a package with cascaded dependencies" + +p1 = pmpkg("dummy", "1.0-2") +p1.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p1.depends = ["dep1"] + +p2 = pmpkg("dep1") +p2.files = ["bin/dep1"] +p2.depends = ["dep2"] + +p3 = pmpkg("dep2") +p3.files = ["bin/dep2"] + +for p in p1, p2, p3: + self.addpkg(p) + +self.args = "-A %s" % " ".join([p.filename() for p in p1, p2, p3]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-2") +for f in p1.files: + self.addrule("FILE_EXIST=%s" % f) +self.addrule("PKG_EXIST=dep1") +self.addrule("PKG_EXIST=dep2") +self.addrule("PKG_DEPENDS=dummy|dep1") +self.addrule("PKG_DEPENDS=dep1|dep2") +self.addrule("PKG_REQUIREDBY=dep1|dummy") +self.addrule("PKG_REQUIREDBY=dep2|dep1") hunk ./pactest/tests/add050.py 1 +self.description = "Install a package with a file in NoUpgrade" + +p = pmpkg("dummy") +p.files = ["etc/dummy.conf"] +self.addpkg(p) + +self.filesystem = ["etc/dummy.conf"] + +self.option["noupgrade"] = ["etc/dummy.conf"] + +self.args = "-Af %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("!FILE_MODIFIED=etc/dummy.conf") +self.addrule("FILE_PACNEW=etc/dummy.conf") hunk ./pactest/tests/add060.py 1 +self.description = "Install a package with a file in NoExtract" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.option["noextract"] = ["usr/man/man1/dummy.1"] + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("FILE_EXIST=bin/dummy") +self.addrule("!FILE_EXIST=usr/man/man1/dummy.1") hunk ./pactest/tests/dummy001.py 1 +self.description = "dummy test case" + +p1 = pmpkg("dummy") +p1.files = ["etc/dummy.conf*", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "usr/", + "bin/dummy"] +p1.backup = ["etc/dummy.conf*"] +p1.install['post_install'] = "echo toto"; +p1.url="ze url" +self.addpkg(p1) + +#p2 = pmpkg("dummy", "1.0-2") +#p2.files = ["etc/dummy.conf**"] +#p2.backup = ["etc/dummy.conf"] +#self.addpkg(p2) + +self.args = "-U %s" % p1.filename() hunk ./pactest/tests/query001.py 1 +self.description = "Query a package" + +p = pmpkg("foobar") +p.files = ["bin/foobar"] +self.addpkg2db("local", p) + +self.args = "-Q foobar" + +self.addrule("PACMAN_OUTPUT=foobar") hunk ./pactest/tests/remove010.py 1 +self.description = "Remove a package, with a file marked for backup" + +p1 = pmpkg("dummy") +p1.files = ["etc/dummy.conf"] +p1.backup = ["etc/dummy.conf"] +self.addpkg2db("local", p1) + +self.args = "-R dummy" + +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_EXIST=etc/dummy.conf") +self.addrule("FILE_PACSAVE=etc/dummy.conf") hunk ./pactest/tests/remove011.py 1 +self.description = "Remove a package, with a modified file marked for backup" + +p1 = pmpkg("dummy") +p1.files = ["etc/dummy.conf*"] +p1.backup = ["etc/dummy.conf"] +self.addpkg2db("local", p1) + +self.args = "-R dummy" + +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_EXIST=etc/dummy.conf") +self.addrule("FILE_PACSAVE=etc/dummy.conf") hunk ./pactest/tests/remove020.py 1 +self.description = "Remove a package, with a file marked for backup (--nosave)" + +p1 = pmpkg("dummy") +p1.files = ["etc/dummy.conf"] +p1.backup = ["etc/dummy.conf"] +self.addpkg2db("local", p1) + +self.args = "-Rn dummy" + +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_EXIST=etc/dummy.conf") +self.addrule("!FILE_PACSAVE=etc/dummy.conf") hunk ./pactest/tests/remove021.py 1 +self.description = "Remove a package, with a modified file marked for backup (--nosave)" + +p1 = pmpkg("dummy") +p1.files = ["etc/dummy.conf*"] +p1.backup = ["etc/dummy.conf"] +self.addpkg2db("local", p1) + +self.args = "-Rn dummy" + +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_EXIST=etc/dummy.conf") +self.addrule("!FILE_PACSAVE=etc/dummy.conf") hunk ./pactest/tests/remove030.py 1 +self.description = "Remove a package in HoldPkg" + +p1 = pmpkg("dummy") +self.addpkg2db("local", p1) + +self.option["holdpkg"] = ["dummy"] + +self.args = "-R dummy" + +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_EXIST=etc/dummy.conf") +self.addrule("!FILE_PACSAVE=etc/dummy.conf") hunk ./pactest/tests/smoke001.py 1 +self.description = "Install a thousand packages in a single transaction" + +p = pmpkg("pkg1000") + +self.addpkg2db("local", p) + +for i in range(1000): + p = pmpkg("pkg%03d" % i) + p.depends = ["pkg%03d" % (i+1)] + p.files = ["usr/share/pkg%03d" % i] + self.addpkg(p) + +_list = [] +[_list.append(p.filename()) for p in self.localpkgs] +self.args = "-A %s" % " ".join(_list) + +self.addrule("PACMAN_RETCODE=0") +#for i in range(1000): +# self.addrule("PKG_EXIST=pkg%03d" %i) hunk ./pactest/tests/sync001.py 1 +self.description = "Install a package from a sync db" + +sp = pmpkg("dummy") +sp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("sync", sp) + +self.args = "-S dummy" + +self.addrule("PKG_EXIST=dummy") +for f in sp.files: + self.addrule("FILE_EXIST=%s" % f) hunk ./pactest/tests/sync002.py 1 +self.description = "Upgrade a package from a sync db" + +sp = pmpkg("dummy", "1.0-2") +sp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("sync", sp) + +lp = pmpkg("dummy") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +self.args = "-S dummy" + +self.addrule("PKG_VERSION=dummy|1.0-2") +for f in lp.files: + self.addrule("FILE_MODIFIED=%s" % f) hunk ./pactest/tests/sync003.py 1 +self.description = "Install a package from a sync db, with a filesystem conflict" + +sp = pmpkg("dummy") +sp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("sync", sp) + +self.filesystem = ["bin/dummy"] + +self.args = "-S dummy" + +self.addrule("!PKG_EXIST=dummy") hunk ./pactest/tests/sync010.py 1 +self.description = "Install a package from a sync db, with its dependencies" + +sp1 = pmpkg("dummy", "1.0-2") +sp1.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +sp1.depends = ["dep1"] + +sp2 = pmpkg("dep1") +sp2.files = ["bin/dep1"] +sp2.depends = ["dep2"] + +sp3 = pmpkg("dep2") +sp3.files = ["bin/dep2"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p); + +self.args = "-S dummy" + +self.addrule("PKG_VERSION=dummy|1.0-2") +self.addrule("PKG_DEPENDS=dummy|dep1") +for f in sp1.files: + self.addrule("FILE_EXIST=%s" % f) +self.addrule("PKG_DEPENDS=dep1|dep2") +self.addrule("PKG_REQUIREDBY=dep1|dummy") +self.addrule("PKG_REQUIREDBY=dep2|dep1") hunk ./pactest/tests/sync020.py 1 +self.description = "Install a group from a sync db" + +sp1 = pmpkg("pkg1") +sp1.groups = ["grp"] + +sp2 = pmpkg("pkg2") +sp2.groups = ["grp"] + +sp3 = pmpkg("pkg3") +sp3.groups = ["grp"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p); + +self.args = "-S grp" + +self.addrule("PACMAN_RETCODE=0") +for p in sp1, sp2, sp3: + self.addrule("PKG_EXIST=%s" % p.name) hunk ./pactest/tests/sync021.py 1 +self.description = "Install a group from a sync db, with a package in IgnorePkg" + +sp1 = pmpkg("pkg1") +sp1.groups = ["grp"] + +sp2 = pmpkg("pkg2") +sp2.groups = ["grp"] + +sp3 = pmpkg("pkg3") +sp3.groups = ["grp"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p); + +self.option["ignorepkg"] = ["pkg2"] + +self.args = "-S grp" + +self.addrule("PACMAN_RETCODE=0") +for p in sp1, sp2, sp3: + self.addrule("PKG_EXIST=%s" % p.name) hunk ./pactest/tests/sync040.py 1 +self.description = "Install two targets with a conflict" + +sp1 = pmpkg("pkg1") +sp1.conflicts = ["pkg2"] + +sp2 = pmpkg("pkg2") + +for p in sp1, sp2: + self.addpkg2db("sync", p); + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=1") +for p in sp1, sp2: + self.addrule("!PKG_EXIST=%s" % p.name) hunk ./pactest/tests/sync041.py 1 +self.description = "Install two conflicting targets" + +sp1 = pmpkg("pkg1") +sp1.conflicts = ["pkg2"] + +sp2 = pmpkg("pkg2") +sp2.conflicts = ["pkg1"] + +for p in sp1, sp2: + self.addpkg2db("sync", p); + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync042.py 1 +self.description = "Install a sync package conflicting with a local one" + +sp = pmpkg("pkg1") +sp.conflicts = ["pkg2"] +self.addpkg2db("sync", sp); + +lp = pmpkg("pkg2") +self.addpkg2db("local", lp); + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync043.py 1 +self.description = "Install a sync package conflicting with a local one" + +sp = pmpkg("pkg1") +sp.conflicts = ["pkg2"] +self.addpkg2db("sync", sp); + +lp = pmpkg("pkg2") +self.addpkg2db("local", lp); + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync050.py 1 +self.description = "Install a virtual target (provided by a sync package)" + +sp1 = pmpkg("pkg1") +sp1.provides = ["pkg2"] +self.addpkg2db("sync", sp1); + +self.args = "-S pkg2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") hunk ./pactest/tests/sync100.py 1 +self.description = "Sysupgrade with a newer sync package" + +sp = pmpkg("dummy", "1.0-2") +lp = pmpkg("dummy") + +self.addpkg2db("sync", sp) +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-2") hunk ./pactest/tests/sync101.py 1 +self.description = "Sysupgrade with same version for local and sync packages" + +sp = pmpkg("dummy") +lp = pmpkg("dummy") + +self.addpkg2db("sync", sp) +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_MODIFIED=dummy") hunk ./pactest/tests/sync102.py 1 +self.description = "Sysupgrade with a newer local package" + +sp = pmpkg("dummy", "0.9-1") +lp = pmpkg("dummy") + +self.addpkg2db("sync", sp) +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_MODIFIED=dummy") hunk ./pactest/tests/sync103.py 1 +self.description = "Sysupgrade with a local package not existing in sync db" + +sp = pmpkg("spkg") + +self.addpkg2db("sync", sp) + +lp = pmpkg("lpkg") + +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_MODIFIED=lpkg") hunk ./pactest/tests/sync110.py 1 +self.description = "Sysupgrade of a package pulling new dependencies" + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.depends = ["pkg2"] + +sp2 = pmpkg("pkg2") +sp2.depends = ["pkg3"] + +sp3 = pmpkg("pkg3") + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg1") +self.addpkg2db("local", lp1) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +for p in sp2, sp3: + self.addrule("PKG_REASON=%s|1" % p.name) hunk ./pactest/tests/sync120.py 1 +self.description = "Sysupgrade of packages in 'IgnorePkg'" + +sp1 = pmpkg("pkg1", "1.0-2") +sp2 = pmpkg("pkg2", "1.0-2") + +for p in sp1, sp2: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg1") +lp2 = pmpkg("pkg2") + +for p in lp1, lp2: + self.addpkg2db("local", p) + +self.option["ignorepkg"] = ["pkg2"] + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("!PKG_MODIFIED=pkg2") hunk ./pactest/tests/sync130.py 1 +self.description = "Sysupgrade with a sync package replacing a local one" + +sp = pmpkg("pkg2") +sp.replaces = ["pkg1"] + +self.addpkg2db("sync", sp) + +lp = pmpkg("pkg1") + +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") hunk ./pactest/tests/sync131.py 1 +self.description = "Sysupgrade with a sync package replacing a set of local ones" + +sp = pmpkg("pkg4") +sp.replaces = ["pkg1", "pkg2", "pkg3"] + +self.addpkg2db("sync", sp) + +lp1 = pmpkg("pkg1") +lp2 = pmpkg("pkg2") + +for p in lp1, lp2: + self.addpkg2db("local", p) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg4") +for p in lp1, lp2: + self.addrule("!PKG_EXIST=%s" % p.name) hunk ./pactest/tests/sync132.py 1 +self.description = "Sysupgrade with a replacement for a local package out of date" + +sp1 = pmpkg("pkg1") +sp1.replaces = ["pkg2"] +sp2 = pmpkg("pkg2", "2.0-1") + +for p in sp1, sp2: + self.addpkg2db("sync", p) + +lp = pmpkg("pkg2") + +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync133.py 1 +self.description = "Sysupgrade with a sync package replacing a local one in 'IgnorePkg'" + +sp = pmpkg("pkg2") +sp.replaces = ["pkg1"] + +self.addpkg2db("sync", sp) + +lp = pmpkg("pkg1") + +self.addpkg2db("local", lp) + +self.option["ignorepkg"] = ["pkg1"] + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync134.py 1 +self.description = "Sysupgrade with a set of sync packages replacing a set local one" + +sp1 = pmpkg("pkg2") +sp1.replaces = ["pkg1"] + +sp2 = pmpkg("pkg3") +sp2.replaces = ["pkg1"] + +for p in sp1, sp2: + self.addpkg2db("sync", p) + +lp = pmpkg("pkg1") + +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +for p in sp1, sp2: + self.addrule("PKG_EXIST=%s" % p.name) hunk ./pactest/tests/sync135.py 1 +self.description = "Sysupgrade with a set of sync packages replacing a set of local ones" + +sp1 = pmpkg("pkg2") +sp1.replaces = ["pkg1"] + +sp2 = pmpkg("pkg3") +sp2.replaces = ["pkg1"] + +sp3 = pmpkg("pkg4") +sp3.replaces = ["pkg1", "pkg0"] + +sp4 = pmpkg("pkg5") +sp4.replaces = ["pkg0"] + +for p in sp1, sp2, sp3, sp4: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg1") + +lp2 = pmpkg("pkg0") + +for p in lp1, lp2: + self.addpkg2db("local", p) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +for p in lp1, lp2: + self.addrule("!PKG_EXIST=%s" % p.name) +for p in sp1, sp2, sp3, sp4: + self.addrule("PKG_EXIST=%s" % p.name) hunk ./pactest/tests/sync200.py 1 +self.description = "Synchronize database" + +sp1 = pmpkg("spkg1", "1.0-1") +sp1.depends = ["spkg2"] +sp2 = pmpkg("spkg2", "2.0-1") +sp2.depends = ["spkg3"] +sp3 = pmpkg("spkg3", "3.0-1") +sp3.depends = ["spkg1"] + +for sp in sp1, sp2, sp3: + self.addpkg2db("sync", sp) + +self.args = "-Sy" + +self.addrule("PACMAN_RETCODE=0") hunk ./pactest/tests/sync890.py 1 +self.description = "conflict 'db vs targ'" + +sp = pmpkg("pkg3") + +self.addpkg2db("sync", sp) + +lp1 = pmpkg("pkg1") + +lp2 = pmpkg("pkg2") +lp2.conflicts = ["pkg3"] + +for p in lp1, lp2: + self.addpkg2db("local", p) + +self.args = "-S pkg3" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") hunk ./pactest/tests/sync891.py 1 +self.description = "conflict 'db vs targ'" + +sp1 = pmpkg("pkg2") +sp2 = pmpkg("pkg3") + +for p in sp1, sp2: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg1") + +lp2 = pmpkg("pkg2") +lp2.conflicts = ["pkg3"] + +for p in lp1, lp2: + self.addpkg2db("local", p) + +self.args = "-S pkg2 pkg3" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") hunk ./pactest/tests/sync892.py 1 +self.description = "conflict 'targ vs targ' and 'db vs targ'" + +sp1 = pmpkg("pkg2") +sp1.conflicts = ["pkg1"] + +sp2 = pmpkg("pkg3") + +for p in sp1, sp2: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg1") + +lp2 = pmpkg("pkg2") +lp2.conflicts = ["pkg3"] + +for p in lp1, lp2: + self.addpkg2db("local", p) + +self.args = "-S pkg2 pkg3" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") hunk ./pactest/tests/sync893.py 1 +self.description = "conflict (bug)" + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.conflicts = ["pkg2"] +self.addpkg2db("sync", sp1); + +sp2 = pmpkg("pkg2", "1.0-2") +self.addpkg2db("sync", sp2) + +lp1 = pmpkg("pkg1") +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync897.py 1 +self.description = "System upgrade" + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.conflicts = ["pkg2"] +sp1.provides = ["pkg2"] +self.addpkg2db("sync", sp1); + +sp2 = pmpkg("pkg2", "1.0-2") +self.addpkg2db("sync", sp2) + +lp1 = pmpkg("pkg1") +lp1.conflicts = ["pkg2"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pkg3") +lp3.conflicts = ["pkg1"] +self.addpkg2db("local", lp3) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync898.py 1 +self.description = "System upgrade" + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.conflicts = ["pkg2"] +sp1.provides = ["pkg2"] +self.addpkg2db("sync", sp1); + +sp2 = pmpkg("pkg2", "1.0-2") +self.addpkg2db("sync", sp2) + +lp1 = pmpkg("pkg1") +self.addpkg2db("local", lp1) + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_MODIFIED=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync899.py 1 +self.description = "System upgrade" + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.conflicts = ["pkg2"] +sp1.provides = ["pkg2"] +self.addpkg2db("sync", sp1); + +lp1 = pmpkg("pkg1") +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/sync990.py 1 +self.description = "Sync a package pulling a dependency conflicting with a target" + +sp1 = pmpkg("pkg1") +sp1.depends = ["pkg3"] + +sp2 = pmpkg("pkg2") + +sp3 = pmpkg("pkg3") +sp3.conflicts = ["pkg2"] +sp3.provides = ["pkg2"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p) + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg3") hunk ./pactest/tests/sync992.py 1 +self.description = "Sync a package pulling a conflicting dependency" + +sp1 = pmpkg("pkg1") +sp1.depends = ["pkg3"] + +sp2 = pmpkg("pkg2") + +sp3 = pmpkg("pkg3") +sp3.conflicts = ["pkg2"] +sp3.provides = ["pkg2"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg2", "0.1-1") +self.addpkg2db("local", lp1) + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") hunk ./pactest/tests/sync999.py 1 +self.description = "System upgrade" + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.conflicts = ["pkg2"] +sp1.provides = ["pkg2"] +self.addpkg2db("sync", sp1); + +sp2 = pmpkg("pkg2", "1.0-2") +self.addpkg2db("sync", sp2) + +lp1 = pmpkg("pkg1") +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") hunk ./pactest/tests/upgrade001.py 1 +self.description = "Upgrade a package (newer version)" + +lp = pmpkg("dummy") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.0-2") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_MODIFIED=dummy") +self.addrule("PKG_VERSION=dummy|1.0-2") +for f in lp.files: + self.addrule("FILE_MODIFIED=%s" % f) hunk ./pactest/tests/upgrade002.py 1 +self.description = "Upgrade a package (same version)" + +lp = pmpkg("dummy") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_MODIFIED=dummy") +self.addrule("PKG_VERSION=dummy|1.0-1") +for f in lp.files: + self.addrule("FILE_MODIFIED=%s" % f) hunk ./pactest/tests/upgrade003.py 1 +self.description = "Upgrade a package (lesser version)" + +lp = pmpkg("dummy", "1.0-2") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_MODIFIED=dummy") +self.addrule("PKG_VERSION=dummy|1.0-1") +for f in lp.files: + self.addrule("FILE_MODIFIED=%s" % f) hunk ./pactest/tests/upgrade004.py 1 +self.description = "Upgrade a package (not installed)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_EXIST=dummy") +for f in p.files: + self.addrule("FILE_EXIST=%s" % f) hunk ./pactest/tests/upgrade010.py 1 +self.description = "Upgrade a package, with a file in NoUpgrade" + +lp = pmpkg("dummy") +lp.files = ["etc/dummy.conf"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.0-2") +p.files = ["etc/dummy.conf"] +self.addpkg(p) + +self.option["noupgrade"] = ["etc/dummy.conf"] + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_VERSION=dummy|1.0-2") +self.addrule("!FILE_MODIFIED=etc/dummy.conf") +self.addrule("FILE_PACNEW=etc/dummy.conf") hunk ./pactest/tests/upgrade020.py 1 +self.description = "Upgrade a package, with a file in 'backup' (new modified)" + +lp = pmpkg("dummy") +lp.files = ["etc/dummy.conf"] +lp.backup = ["etc/dummy.conf"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.0-2") +p.files = ["etc/dummy.conf*"] +p.backup = ["etc/dummy.conf"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_VERSION=dummy|1.0-2") +self.addrule("FILE_MODIFIED=etc/dummy.conf") +self.addrule("!FILE_PACNEW=etc/dummy.conf") hunk ./pactest/tests/upgrade021.py 1 +self.description = "Upgrade a package, with a file in 'backup' (local modified, new unchanged)" + +lp = pmpkg("dummy") +lp.files = ["etc/dummy.conf*"] +lp.backup = ["etc/dummy.conf"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.0-2") +p.files = ["etc/dummy.conf"] +p.backup = ["etc/dummy.conf"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_VERSION=dummy|1.0-2") +self.addrule("!FILE_MODIFIED=etc/dummy.conf") +self.addrule("!FILE_PACNEW=etc/dummy.conf") hunk ./pactest/tests/upgrade022.py 1 +self.description = "Upgrade a package, with a file in 'backup' (local and new modified)" + +lp = pmpkg("dummy") +lp.files = ["etc/dummy.conf"] +lp.backup = ["etc/dummy.conf*"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.0-2") +p.files = ["etc/dummy.conf**"] +p.backup = ["etc/dummy.conf"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_VERSION=dummy|1.0-2") +self.addrule("!FILE_MODIFIED=etc/dummy.conf") +self.addrule("FILE_PACNEW=etc/dummy.conf") hunk ./pactest/tests/upgrade030.py 1 +self.description = "Upgrade packages with various reasons" + +lp1 = pmpkg("pkg1") +lp1.reason = 0 +lp2 = pmpkg("pkg2") +lp2.reason = 1 + +for p in lp1, lp2: + self.addpkg2db("local", p) + +p1 = pmpkg("pkg1", "1.0-2") +p2 = pmpkg("pkg2", "1.0-2") + +for p in p1, p2: + self.addpkg(p) + +self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) +#self.args = "-Qi %s" % " ".join([p.name for p in lp1, lp2]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_REASON=pkg1|0") +self.addrule("PKG_REASON=pkg2|1") hunk ./pactest/tests/upgrade040.py 1 +self.description = "file relocation 1" + +lp1 = pmpkg("dummy") +lp1.files = ["bin/dummy", + "usr/share/file"] + +lp2 = pmpkg("foobar") +lp2.files = ["bin/foobar"] + +for p in lp1, lp2: + self.addpkg2db("local", p) + +p1 = pmpkg("dummy") +p1.files = ["bin/dummy"] + +p2 = pmpkg("foobar") +p2.files = ["bin/foobar", + "usr/share/file"] + +for p in p1, p2: + self.addpkg(p) + +self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=0") hunk ./pactest/util.py 1 +#! /usr/bin/python +# +# Copyright (c) 2006 by Aurelien Foret +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + + +import sys +import os +import md5 +import stat + + +# ALPM +PM_ROOT = "/" +PM_DBPATH = "var/lib/pacman" +PM_CACHEDIR = "var/cache/pacman/pkg" +PM_LOCK = "/tmp/pacman.lck" +PM_EXT_PKG = ".fpm" +PM_EXT_DB = ".fdb" +PM_PACNEW = ".pacnew" +PM_PACORIG = ".pacorig" +PM_PACSAVE = ".pacsave" + +# Pacman +PACCONF = "etc/pacman.conf" + +# Pactest +TMPDIR = "tmp" +SYNCREPO = "var/pub" +LOGFILE = "var/log/pactest.log" + + +verbose = 0 +debug = 0 + + +def err(msg): + print "error: " + msg + sys.exit(1) + +def vprint(msg): + if verbose: + print msg + +def dbg(msg): + if debug: + print msg + + +# +# Methods to generate files +# + +def getfilename(name): + """ + """ + filename = "" + link = "" + if not name.find(" -> ") == -1: + filename, link = name.split(" -> ") + elif name[-1] == "*": + filename = name.rstrip("*") + else: + filename = name + return filename + +def mkfile(name, data = ""): + """ + """ + + isaltered = 0 + isdir = 0 + islink = 0 + link = "" + filename = "" + + if not name.find(" -> ") == -1: + islink = 1 + filename, link = name.split(" -> ") + elif name[-1] == "*": + isaltered = 1 + filename = name.rstrip("*") + else: + filename = name + if name[-1] == "/": + isdir = 1 + + if isdir: + path = filename + else: + path = os.path.dirname(filename) + try: + if path and not os.path.isdir(path): + os.makedirs(path, 0755) + except: + error("mkfile: could not create directory hierarchy '%s'" % path) + + if isdir: + return + if islink: + curdir = os.getcwd() + os.chdir(path) + os.symlink(link, os.path.basename(filename)) + os.chdir(curdir) + else: + fd = file(filename, "w") + if data: + fd.write(data) + if data[-1] != "\n": + fd.write("\n") + fd.close() + +def mkdescfile(filename, pkg): + """ + """ + + data = [] + + # desc + #data.append("pkgname = %s" % pkg.name) + #data.append("pkgver = %s" % pkg.version) + if pkg.desc: + data.append("pkgdesc = %s" % pkg.desc) + if pkg.url: + data.append("url = %s" % pkg.url) + if pkg.builddate: + data.append("builddate = %s" % pkg.builddate) + if pkg.packager: + data.append("packager = %s" % pkg.packager) + if pkg.size: + data.append("size = %s" % pkg.size) + if pkg.arch: + data.append("arch = %s" % pkg.arch) + for i in pkg.groups: + data.append("group = %s" % i) + for i in pkg.license: + data.append("license = %s" % i) + if pkg.md5sum: + data.append("md5sum = %s" % pkg.md5sum) + + # depends + for i in pkg.replaces: + data.append("replaces = %s" % i) + for i in pkg.depends: + data.append("depend = %s" % i) + for i in pkg.conflicts: + data.append("conflict = %s" % i) + for i in pkg.provides: + data.append("provides = %s" % i) + for i in pkg.backup: + data.append("backup = %s" % i) + if pkg.force: + data.append("force = 1") + + mkfile(filename, "\n".join(data)) + +def mkinstallfile(filename, install): + """ + """ + data = [] + for key, value in install.iteritems(): + if value: + data.append("%s() {\n%s\n}" % (key, value)) + + mkfile(filename, "\n".join(data)) + +def mkcfgfile(filename, root, option, db): + """ + """ + # Options + data = ["[options]"] + for key, value in option.iteritems(): + data.extend(["%s = %s" % (key, j) for j in value]) + + # Repositories + data.extend(["[%s]\n" \ + "server = file://%s\n" \ + % (value.treename, os.path.join(root, SYNCREPO, value.treename)) \ + for key, value in db.iteritems() if not key == "local"]) + + mkfile(os.path.join(root, filename), "\n".join(data)) + + +# +# MD5 helpers +# + +def getmd5sum(filename): + """ + """ + fd = open(filename, "rb") + checksum = md5.new() + while 1: + block = fd.read(1048576) + if not block: + break + checksum.update(block) + fd.close() + digest = checksum.digest() + return "%02x"*len(digest) % tuple(map(ord, digest)) + +def mkmd5sum(data): + """ + """ + checksum = md5.new() + checksum.update("%s\n" % data) + digest = checksum.digest() + return "%02x"*len(digest) % tuple(map(ord, digest)) + + +# +# Mtime helpers +# + +def getmtime(filename): + """ + """ + st = os.stat(filename) + return st[stat.ST_ATIME], st[stat.ST_MTIME], st[stat.ST_CTIME] + +def diffmtime(mt1, mt2): + """ORE: TBD + """ + return not mt1 == mt2 + + +# +# Miscellaneous +# + +def grep(filename, pattern): + found = 0 + fd = file(filename, "r") + while 1 and not found: + line = fd.readline() + if not line: + break + if line.find(pattern) != -1: + found = 1 + fd.close() + return found + + +if __name__ == "__main__": + pass } From vmiklos at frugalware.org Tue Sep 5 01:19:26 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 01:19:29 2006 Subject: [Frugalware-darcs] pacman: HACKING: update for make check Message-ID: <20060904231926.BFD7D4E8C0F@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904231743-e2957-0d8c29bed56bacd1f9c260d1dbb2da779974eeb1.gz; [HACKING: update for make check VMiklos **20060904231743] { hunk ./HACKING 11 -First grab Aurelien Foret's pactest from -http://aurelien.foret.free.fr/archlinux/pactest/src/pactest-0.3.tar.gz +Run the tests: hunk ./HACKING 13 -Then get the patch to add Frugalware support: -http://frugalware.org/~vmiklos/patches/pactest/pactest-0.3-frugalware.diff - -I assume that you extracted pactest under /pactest/pactest-0.3. - -Now run the tests: - -./pactest.py --test=tests/*.py -p ../../src/pacman/pacman --debug=-1 +make check hunk ./HACKING 18 -./pactest.py --test=tests/sync990.py -p ../../src/pacman/pacman --debug=-1 +cd pactest; python pactest.py --test=tests/sync990.py -p ../../src/pacman/pacman --debug=-1 } From vmiklos at frugalware.org Tue Sep 5 01:19:26 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 01:19:31 2006 Subject: [Frugalware-darcs] pacman: make check: call pactest Message-ID: <20060904231926.5BF374E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060904231641-e2957-b69610f76a710ce39e86188a3b0872463291eb03.gz; [make check: call pactest VMiklos **20060904231641] { hunk ./Makefile.am 14 - cd testsuite; sh runtests.sh + cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman --debug=-1 hunk ./bindings/python/Makefile.in 47 +check: + } From desco at frugalware.org Tue Sep 5 02:08:35 2006 From: desco at frugalware.org (Miklos Nemeth) Date: Tue Sep 5 02:08:37 2006 Subject: [Frugalware-darcs] frugalware-current: wxsqlite3-1.6.0-1-i686 Message-ID: <20060905000835.350404E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905000709-3083d-dc2b0eaab8ebd2978985eb1c99f804afd68e5cd1.gz; [wxsqlite3-1.6.0-1-i686 Miklos Nemeth **20060905000709 version bump ] { hunk ./source/lib-extra/wxsqlite3/FrugalBuild 6 -pkgver=1.5.3 +pkgver=1.6.0 hunk ./source/lib-extra/wxsqlite3/FrugalBuild 18 -sha1sums=('f4c8e7516c7f237f78fa4659c8696f215501b584') +sha1sums=('3f681e448399bfcc3d0058c89116c7583570b6b9') hunk ./source/lib-extra/wxsqlite3/FrugalBuild 23 - dos2unix * hunk ./source/lib-extra/wxsqlite3/FrugalBuild 31 +# optimization OK + } From vmiklos at frugalware.org Tue Sep 5 02:48:36 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 02:48:38 2006 Subject: [Frugalware-darcs] frugalware-current: libpng-1.2.12-2-i686 Message-ID: <20060905004836.7C2494E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905004629-e2957-44af2e7aafda5659804e585965ae3ac6ba58c8a5.gz; [libpng-1.2.12-2-i686 VMiklos **20060905004629 fix broken pngconf.h header ] { hunk ./source/lib/libpng/FrugalBuild 1 -# Last Modified: Mon, 03 Jul 2006 13:47:49 +0200 +# Last Modified: Tue, 05 Sep 2006 02:44:05 +0200 hunk ./source/lib/libpng/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/lib/libpng/FrugalBuild 16 -sha1sums=('44bd6821607ba09ac500279363871ad5974a01b5') +source=($source libpng-1.2.12-header.diff) hunk ./source/lib/libpng/FrugalBuild 26 +sha1sums=('44bd6821607ba09ac500279363871ad5974a01b5' \ + '2bb13a8eb62115998ab628948cab4f905dc5289e') + addfile ./source/lib/libpng/libpng-1.2.12-header.diff hunk ./source/lib/libpng/libpng-1.2.12-header.diff 1 +diff -Naur libpng-1.2.12.orig/pngconf.h libpng-1.2.12/pngconf.h +--- libpng-1.2.12.orig/pngconf.h 2006-06-27 22:22:34.000000000 +0200 ++++ libpng-1.2.12/pngconf.h 2006-09-05 02:33:48.000000000 +0200 +@@ -313,9 +313,9 @@ + # ifdef _SETJMP_H + /* If you encounter a compiler error here, see the explanation + * near the end of INSTALL. ++ * __png.h__ already includes setjmp.h; ++ * __dont__ include it again.; + */ +- __png.h__ already includes setjmp.h; +- __dont__ include it again.; + # endif + # endif /* __linux__ */ + } From vmiklos at frugalware.org Tue Sep 5 03:05:16 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 03:05:20 2006 Subject: [Frugalware-darcs] frugalware-current: subtitleripper-0.3_4-1-i686 Message-ID: <20060905010517.1FEDB4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905010311-e2957-2baa676f73d3042f745f57c07899e2dd3274e66c.gz; [subtitleripper-0.3_4-1-i686 VMiklos **20060905010311 new package ] { adddir ./source/xmultimedia-extra adddir ./source/xmultimedia-extra/subtitleripper addfile ./source/xmultimedia-extra/subtitleripper/FrugalBuild hunk ./source/xmultimedia-extra/subtitleripper/FrugalBuild 1 +# Last Modified: Tue, 05 Sep 2006 02:57:52 +0200 +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=subtitleripper +pkgver=0.3_4 +pkgrel=1 +pkgdesc="Converter for DVD subtitles into the popular srt or VobSub file format used by many avi players." +depends=('transcode' 'gocr') +groups=('xmultimedia-extra') +archs=('i686') +_F_sourceforge_ext=".tgz" +Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=48235|grep subtitleripper-|sed 's/.*subtitleripper-\([^ ]*\) .*/\1/;s/-/_/;q'" +source=($source subtitleripper-{makefile,netpbm}.diff) +_F_cd_path="$pkgname" +sha1sums=('d93ff3578dd5f722c8f4ef16bc0903eec5781a0d' \ + '0fbff8bbd3cc91a0dd385552d693d660864f40b1' \ + 'ffcd9df586588b5b2be8949d50fbdfcdfe4358a3') addfile ./source/xmultimedia-extra/subtitleripper/subtitleripper-makefile.diff hunk ./source/xmultimedia-extra/subtitleripper/subtitleripper-makefile.diff 1 +diff -Naur subtitleripper.orig/Makefile subtitleripper/Makefile +--- subtitleripper.orig/Makefile 2003-12-08 10:28:02.000000000 +0100 ++++ subtitleripper/Makefile 2006-09-05 02:21:47.000000000 +0200 +@@ -6,6 +6,8 @@ + DEFINES := + LIBS := -lm + INCLUDES := ++PREFIX ?= /usr ++DESTDIR ?= + + ### enable ppm support ### + DEFINES += -D_HAVE_LIB_PPM_ +@@ -96,6 +98,13 @@ + @rm -rf $(PACKAGE) + @mv $(PACKAGE)-$(VERSION)-$(RELEASE).tgz $(HOME)/ + ++install: ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++ install -m 755 pgm2txt $(DESTDIR)$(PREFIX)/bin/ ++ install -m 755 srttool $(DESTDIR)$(PREFIX)/bin/ ++ install -m 755 subtitle2pgm $(DESTDIR)$(PREFIX)/bin/ ++ install -m 755 subtitle2vobsub $(DESTDIR)$(PREFIX)/bin/ ++ + # Build a rpm package (tested for SuSE 7.3) + rpm: + @mkdir $(PACKAGE) addfile ./source/xmultimedia-extra/subtitleripper/subtitleripper-netpbm.diff hunk ./source/xmultimedia-extra/subtitleripper/subtitleripper-netpbm.diff 1 +diff -Naur subtitleripper.orig/Makefile subtitleripper/Makefile +--- subtitleripper.orig/Makefile 2003-12-08 10:28:02.000000000 +0100 ++++ subtitleripper/Makefile 2006-09-05 02:29:52.000000000 +0200 +@@ -7,9 +7,9 @@ + LIBS := -lm + INCLUDES := + +-### enable ppm support ### ++### enable netpbm support ### + DEFINES += -D_HAVE_LIB_PPM_ +-LIBS += -lppm ++LIBS += -lnetpbm + + ### enable PNG support ### + DEFINES += -D_HAVE_PNG_ } From crazy at frugalware.org Tue Sep 5 03:12:17 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 03:12:19 2006 Subject: [Frugalware-darcs] frugalware-current: nano-1.2.5-3-i686 Message-ID: <20060905011217.A0AD24E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905010859-f6986-deed32fb21000304f8d96882890c776f6e83302e.gz; [nano-1.2.5-3-i686 crazy **20060905010859 * recompiled * nano was reported in the forums to have 'bad sha1sums on DVD|CD|NET{installs}' ] { hunk ./source/apps/nano/FrugalBuild 1 -# Last Modified: Sat, 04 Mar 2006 22:59:11 +0100 +# Last Modified: Tue, 05 Sep 2006 03:08:14 +0200 hunk ./source/apps/nano/FrugalBuild 3 -# Maintainer: xbit +# Maintainer: crazy +# Contributor xbit hunk ./source/apps/nano/FrugalBuild 8 -pkgrel=2 +pkgrel=3 } From crazy at frugalware.org Tue Sep 5 03:16:45 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 03:16:48 2006 Subject: [Frugalware-darcs] frugalware-current: perl-io-socket-ssl-0.97-2-i686 Message-ID: <20060905011645.A557F4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905011341-f6986-8425f146aa1f4981b6022f93fb6ec2db73b20703.gz; [perl-io-socket-ssl-0.97-2-i686 crazy **20060905011341 * recompiled * perl-io-socket-ssl was reported in the forums to have 'bad sha1sums on DVD|CD|NET{installs}' ] { hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 1 -# Last Modified: Mon, 25 Jul 2005 08:15:34 +0200 +# Last Modified: Tue, 05 Sep 2006 03:13:22 +0200 hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 7 -pkgrel=1 +pkgrel=2 } From vmiklos at frugalware.org Tue Sep 5 03:26:20 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 03:26:24 2006 Subject: [Frugalware-darcs] examples: asm/hello.asm: initial import Message-ID: <20060905012621.C1D0A4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=examples;a=darcs_commitdiff;h=20060905012510-e2957-7ae07f793521987b94174bab6c2bbb71267b8393.gz; [asm/hello.asm: initial import VMiklos **20060905012510] { adddir ./asm addfile ./asm/hello.asm hunk ./asm/hello.asm 1 +;Copyright (c) 1999 Konstantin Boldyshev +; +;"hello, world" in assembly language for Linux +; +;to compile: +; +;nasm -f elf hello.asm +;ld -s -o hello hello.o + +section .text + global _start ;must be declared for linker (ld) + +_start: ;tell linker entry point + + mov edx,len ;message length + mov ecx,msg ;message to write + mov ebx,1 ;file descriptor (stdout) + mov eax,4 ;system call number (sys_write) + int 0x80 ;call kernel + + mov eax,1 ;system call number (sys_exit) + int 0x80 ;call kernel + +section .data + +msg db 'Hello, world!',0xa ;our dear string +len equ $ - msg ;length of our dear string } From vmiklos at frugalware.org Tue Sep 5 03:33:44 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 03:33:46 2006 Subject: [Frugalware-darcs] pacman: bindings/python: fix clean target Message-ID: <20060905013344.B8CCF4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060905005837-e2957-de940622b48004a9f8a1219c716067ce2abcfda7.gz; [bindings/python: fix clean target VMiklos **20060905005837] { hunk ./bindings/python/Makefile.in 42 - rm -f _alpm* alpm.{h,py*,_wrap*} + rm -f _alpm* alpm{.h,.py*,_wrap*} } From vmiklos at frugalware.org Tue Sep 5 03:35:51 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 03:35:56 2006 Subject: [Frugalware-darcs] frugalware-current: dvdshrink-2.6.1_7-1-i686 Message-ID: <20060905013551.6D79E4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905013205-e2957-5bfd9c4e294d98335662b1ae15f190a0f5077a66.gz; [dvdshrink-2.6.1_7-1-i686 VMiklos **20060905013205 new package ] { adddir ./source/xmultimedia-extra/dvdshrink addfile ./source/xmultimedia-extra/dvdshrink/FrugalBuild hunk ./source/xmultimedia-extra/dvdshrink/FrugalBuild 1 +# Last Modified: Tue, 05 Sep 2006 03:30:46 +0200 +# Compiling Time: 0.02 SBU +# Maintainer: VMiklos + +pkgname=dvdshrink +pkgver=2.6.1_7 +pkgrel=1 +pkgdesc="Allows you to create fair-use archival copies of DVD content on single-layer writable DVDs." +depends=('transcode' 'subtitleripper' 'cdrtools' 'dvdauthor' 'dvd+rw-tools' 'perl-gtk2') +groups=('xmultimedia-extra') +archs=('i686') +_F_sourceforge_prefix="Version-" +Finclude sourceforge +source=(${source/.tar/mdk.tar} dvdshrink-{destdir,nointeractive}.diff) + +build() +{ + Fcd $pkgname + Fpatchall + ./install.sh $Fdestdir || return 1 +} + +sha1sums=('05af5c937e6f0da14b3f11389f1973db43991e25' \ + '19e18ef58d6a608af3d6ae50e6ae5b201b1290b4' \ + '59999e58d8d52e141622f1293fa680caa76394b6') addfile ./source/xmultimedia-extra/dvdshrink/dvdshrink-destdir.diff hunk ./source/xmultimedia-extra/dvdshrink/dvdshrink-destdir.diff 1 +diff -Naur dvdshrink.orig/install.sh dvdshrink/install.sh +--- dvdshrink.orig/install.sh 2005-03-28 06:32:58.000000000 +0200 ++++ dvdshrink/install.sh 2006-09-05 03:14:11.000000000 +0200 +@@ -13,6 +13,11 @@ + exit + fi + ++if [ $# -eq 1 ] ++then ++ DESTDIR=$1 ++fi ++ + function testistring { + INP=`echo $1 | tr 'a-z' 'A-Z'` + TST=`echo $2 | tr 'a-z' 'A-Z'` +@@ -63,14 +68,15 @@ + echo "Creating application directories if needed" + for DIR in doc applications; do + if [ ! -d /usr/share/$DIR/dvdshrink ]; then +- mkdir -p /usr/share/$DIR/dvdshrink ++ mkdir -p $DESTDIR/usr/share/$DIR/dvdshrink + fi + done + + echo + echo "Installing files" +-cp usr/bin/* /usr/bin +-cp -R usr/share/* /usr/share ++mkdir -p $DESTDIR/usr/bin ++cp -a usr/bin/* $DESTDIR/usr/bin ++cp -R usr/share/* $DESTDIR/usr/share + + echo + echo "Removing rc files if they exist" addfile ./source/xmultimedia-extra/dvdshrink/dvdshrink-nointeractive.diff hunk ./source/xmultimedia-extra/dvdshrink/dvdshrink-nointeractive.diff 1 +diff -Naur dvdshrink.orig/install.sh dvdshrink/install.sh +--- dvdshrink.orig/install.sh 2005-03-28 06:32:58.000000000 +0200 ++++ dvdshrink/install.sh 2006-09-05 01:50:20.000000000 +0200 +@@ -41,7 +41,8 @@ + if [ $BAD -gt 0 ]; then + echo + echo " One or more of the utilities that DVDShrink requires are not installed or" +- echo -n " are not executable. Continue the installation? (y/n) " ++ echo -n " are not executable." ++ exit 1 + read YN + if [ -z $YN ]; then exit; fi + if [ `testistring $YN 'n'` -eq 1 ]; then exit; fi } From crazy at frugalware.org Tue Sep 5 07:53:11 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 07:53:15 2006 Subject: [Frugalware-darcs] frugalware-current: libpng-1.2.12-2-i686 Message-ID: <20060905055311.B75A24E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905054851-f6986-6b49708b803671b05704eb80ef98659e7bfb14a4.gz; [libpng-1.2.12-2-i686 crazy **20060905054851 * this fu*** syncpkgd really nervs me * FU**** SOMEONE ADD A FU**** CHECK TO STOP * THIS FU*** TOOL DELETE 'VALID' *FPM'S FROM * THE REPOS!! ] { hunk ./source/lib/libpng/FrugalBuild 1 -# Last Modified: Tue, 05 Sep 2006 02:44:05 +0200 +# Last Modified: Tue, 05 Sep 2006 07:48:35 +0200 } From crazy at frugalware.org Tue Sep 5 09:15:41 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 09:15:43 2006 Subject: [Frugalware-darcs] frugalware-current: k3d-0.6.1.0-1-i686 Message-ID: <20060905071541.2220E4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905071312-f6986-9f313e3d00ffb25e3fc96502d164a1801d74781b.gz; [k3d-0.6.1.0-1-i686 crazy **20060905071312 * Version bump ] { hunk ./source/xapps-extra/k3d/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 07:18:23 +0200 +# Last Modified: Tue, 05 Sep 2006 09:04:47 +0200 hunk ./source/xapps-extra/k3d/FrugalBuild 7 -pkgver=0.6.0.0 -pkgrel=2 +pkgver=0.6.1.0 +pkgrel=1 hunk ./source/xapps-extra/k3d/FrugalBuild 20 -sha1sums=('602b3d862b8b39cc0d5b682b2aa9cd1fabfd6c21' \ +sha1sums=('60c9edf85252dab372755ee46b6dfb89b002a889' \ hunk ./source/xapps-extra/k3d/FrugalBuild 22 + } From crazy at frugalware.org Tue Sep 5 09:21:14 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 09:21:17 2006 Subject: [Frugalware-darcs] frugalware-current: x264-20060903-2-i686 Message-ID: <20060905072114.7DF924E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905071837-f6986-a3bf48c1c6957ed6dc2584d621745c7708d08994.gz; [x264-20060903-2-i686 crazy **20060905071837 * relbump ( syncpkgd broke it ) ] { hunk ./source/xmultimedia/x264/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 15:51:02 +0200 +# Last Modified: Tue, 05 Sep 2006 09:09:13 +0200 hunk ./source/xmultimedia/x264/FrugalBuild 8 -pkgrel=1 +pkgrel=2 } From krics at linuxforum.hu Tue Sep 5 09:36:42 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Sep 5 09:36:50 2006 Subject: [Frugalware-darcs] frugalware-current: xterm-219-1-x86_64 Message-ID: <20060905073642.491664E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905073652-d209c-7268e1a327394f4ac6d41e7151322d731d0edefb.gz; [xterm-219-1-x86_64 Christian Hamar alias krix **20060905073652 * Version bump ] { hunk ./source/x11/xterm/FrugalBuild 1 -# Last Modified: Mon, 28 Aug 2006 21:41:46 +0200 +# Last Modified: Tue, 05 Sep 2006 09:35:07 +0200 hunk ./source/x11/xterm/FrugalBuild 6 -pkgver=218 +pkgver=219 hunk ./source/x11/xterm/FrugalBuild 16 -sha1sums=('6b7c6d0efc4230eba154d710cc0293c646dbfb3d') +sha1sums=('8db15cd4e8ec34822397caf6678e0cd2d36bf3cb') } From crazy at frugalware.org Tue Sep 5 09:37:25 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 09:37:26 2006 Subject: [Frugalware-darcs] frugalware-current: perl-io-socket-ssl-0.97-3-i686 Message-ID: <20060905073725.833434E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905073348-f6986-c00419acb74b7bff45114c99a3a4303fa2730cdf.gz; [perl-io-socket-ssl-0.97-3-i686 crazy **20060905073348 * relbump again * removed the make test from FB does not work in chroot because it need the netkit-* package which we can't install in chroot as makedepend :o ] { hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 1 -# Last Modified: Tue, 05 Sep 2006 03:13:22 +0200 +# Last Modified: Tue, 05 Sep 2006 09:33:29 +0200 hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 21 - - make test hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 22 - } From vmiklos at frugalware.org Tue Sep 5 12:41:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 12:41:35 2006 Subject: [Frugalware-darcs] frugalware-current: gnormalize-0.50-1-i686 Message-ID: <20060905104132.A8BA04E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905103904-e2957-9b5cd96e3389fec6389eb7a4362d84a0a4cc904e.gz; [gnormalize-0.50-1-i686 VMiklos **20060905103904 version bump added necessary _F_sourceforge_prefix ] { hunk ./source/xapps-extra/gnormalize/FrugalBuild 1 -# Last Modified: Sat, 08 Apr 2006 23:24:10 +0200 +# Last Modified: Tue, 05 Sep 2006 12:35:50 +0200 hunk ./source/xapps-extra/gnormalize/FrugalBuild 6 -pkgver=0.49 +pkgver=0.50 hunk ./source/xapps-extra/gnormalize/FrugalBuild 13 +_F_sourceforge_prefix="gnormalize-" hunk ./source/xapps-extra/gnormalize/FrugalBuild 27 -sha1sums=('f83ccb43e3c3ea80a517ce989b03974affc7e790' \ +sha1sums=('abf392d5f563e89f4850aade10290203ba3d160e' \ } From krics at linuxforum.hu Tue Sep 5 15:37:58 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Sep 5 15:38:03 2006 Subject: [Frugalware-darcs] frugalware-current: svn2cl-0.7-1-x86_64 Message-ID: <20060905133758.1C5F34E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905133745-d209c-885713c7b90bde60f56c769257b8976dc0262679.gz; [svn2cl-0.7-1-x86_64 Christian Hamar alias krix **20060905133745 * New package / Initial import ] { adddir ./source/apps-extra/svn2cl addfile ./source/apps-extra/svn2cl/FrugalBuild hunk ./source/apps-extra/svn2cl/FrugalBuild 1 +# Last Modified: Tue, 05 Sep 2006 15:37:21 +0200 +# Compiling Time: 0.00 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=svn2cl +pkgver=0.7 +pkgrel=1 +pkgdesc="Creates a Changelog from subversion log" +url="http://ch.tudelft.nl/~arthur/svn2cl/" +depends=() +rodepends=('subversion') +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://ch.tudelft.nl/~arthur/svn2cl/downloads.html | grep -m 1 tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" +source=(http://ch.tudelft.nl/~arthur/svn2cl/$pkgname-$pkgver.tar.gz \ + fix-xsl-search-path.patch) +sha1sums=('5df6f04ee1bd0cd869961d54b33acb49fa7c9218' \ + 'bd65200ceb8445746d62383db880664f2ab52988') + +build() { + Fcd + Fpatchall + Fmkdir /usr/share/$pkgname + Fmkdir /usr/man/man1 + Fmkdir /usr/bin + Ffilerel *.xsl /usr/share/$pkgname/ + Ffilerel *.css /usr/share/$pkgname/ + Ffilerel svn2cl.1 /usr/man/man1/ + Fexerel svn2cl.sh /usr/bin/svn2cl +} + +# optimalization OK addfile ./source/apps-extra/svn2cl/fix-xsl-search-path.patch hunk ./source/apps-extra/svn2cl/fix-xsl-search-path.patch 1 +diff -Naur svn2cl-0.7.orig/svn2cl.sh svn2cl-0.7/svn2cl.sh +--- svn2cl-0.7.orig/svn2cl.sh 2006-09-05 15:19:10.000000000 +0200 ++++ svn2cl-0.7/svn2cl.sh 2006-09-05 15:20:04.000000000 +0200 +@@ -195,7 +195,7 @@ + done + dir=`dirname $prog` + dir=`cd $dir && pwd` +-XSL="$dir/svn2${OUTSTYLE}.xsl" ++XSL="/usr/share/svn2cl/svn2${OUTSTYLE}.xsl" + + # check if the authors file is formatted as a legacy + # colon separated file } From krics at linuxforum.hu Tue Sep 5 15:47:39 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Sep 5 15:47:40 2006 Subject: [Frugalware-darcs] frugalware-current: mplayer-1.0pre8-5-x86_64 Message-ID: <20060905134739.248BA4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905134645-d209c-20829fc39263cb3ab12dd838918649d46c17e74b.gz; [mplayer-1.0pre8-5-x86_64 Christian Hamar alias krix **20060905134645 * Release bump * Rebuilded with new x264 * Added some (maybe working or not) patch to compile with new x264 * Added openal to depends() ] { hunk ./source/xapps/mplayer/FrugalBuild 1 -# Last modified: Wed, 30 Aug 2006 14:25:00 +0200 +# Last modified: Tue, 05 Sep 2006 15:44:29 +0200 hunk ./source/xapps/mplayer/FrugalBuild 8 -pkgrel=4 +pkgrel=5 hunk ./source/xapps/mplayer/FrugalBuild 13 - 'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2' 'x264' 'dejavu-ttf') + 'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2' 'x264>=20060903' 'dejavu-ttf' \ + 'openal') hunk ./source/xapps/mplayer/FrugalBuild 18 -install=$pkgname.install hunk ./source/xapps/mplayer/FrugalBuild 29 - $pkgname-1.0pre7-lzo2.patch.bz2) + $pkgname-1.0pre7-lzo2.patch.bz2 fix-newer-x264.patch) hunk ./source/xapps/mplayer/FrugalBuild 38 - '45c4adbe6ab3063b68938c813966948aebf15ce3') + '45c4adbe6ab3063b68938c813966948aebf15ce3' \ + 'fd01f3df7a94c31f542747420fd9fe040043229c') hunk ./source/xapps/mplayer/FrugalBuild 50 + Fpatch fix-newer-x264.patch hunk ./source/xapps/mplayer/FrugalBuild 56 - make DESTDIR=$Fdestdir install + make DESTDIR=$Fdestdir install || Fdie addfile ./source/xapps/mplayer/fix-newer-x264.patch hunk ./source/xapps/mplayer/fix-newer-x264.patch 1 +diff -Naur MPlayer-1.0pre8.orig/libavcodec/x264.c MPlayer-1.0pre8/libavcodec/x264.c +--- MPlayer-1.0pre8.orig/libavcodec/x264.c 2006-09-05 15:07:05.000000000 +0200 ++++ MPlayer-1.0pre8/libavcodec/x264.c 2006-09-05 15:07:38.000000000 +0200 +@@ -148,7 +148,7 @@ + + // if neither crf nor cqp modes are selected we have to enable the RC + // we do it this way because we cannot check if the bitrate has been set +- if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1; ++ /* Removed */ + + x4->params.i_bframe = avctx->max_b_frames; + x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; +diff -Naur MPlayer-1.0pre8.orig/libmpcodecs/ve_x264.c MPlayer-1.0pre8/libmpcodecs/ve_x264.c +--- MPlayer-1.0pre8.orig/libmpcodecs/ve_x264.c 2006-09-05 15:07:05.000000000 +0200 ++++ MPlayer-1.0pre8/libmpcodecs/ve_x264.c 2006-09-05 15:07:17.000000000 +0200 +@@ -275,7 +275,7 @@ + "VBV requires both vbv_maxrate and vbv_bufsize.\n"); + return 0; + } +- mod->param.rc.b_cbr = 1; ++ /* Removed */ + mod->param.rc.i_bitrate = bitrate; + mod->param.rc.f_rate_tolerance = ratetol; + mod->param.rc.i_vbv_max_bitrate = vbv_maxrate; } From krics at linuxforum.hu Tue Sep 5 16:29:56 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Sep 5 16:29:59 2006 Subject: [Frugalware-darcs] frugalware-current: added mplayer to x264 rebuilds Message-ID: <20060905142956.387C24F0002@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905141809-d209c-bfa8b4499052c1a2074b0df9869e9e8646d4296b.gz; [added mplayer to x264 rebuilds Christian Hamar alias krix **20060905141809] { hunk ./docs/tech/rebuild.txt 207 + +x264 +----- + +mplayer + } From krics at linuxforum.hu Tue Sep 5 16:29:56 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Sep 5 16:30:03 2006 Subject: [Frugalware-darcs] frugalware-current: perl-io-socket-ssl-0.999-2-x86_64 Message-ID: <20060905142956.8A1954F04E3@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905142950-d209c-fc439c3e0663cc4d52a545b0acbf97568498e37c.gz; [perl-io-socket-ssl-0.999-2-x86_64 Christian Hamar alias krix **20060905142950 * Removed package from devel-extra * (Moved to devel) * Relbump because of move ] { hunk ./source/devel-extra/perl-io-socket-ssl/FrugalBuild 1 -# Last Modified: Thu, 31 Aug 2006 09:15:43 +0200 -# Compiling Time: 0.1 SBU -# Maintainer: Christian Hamar alias krix - -modname=IO-Socket-SSL -modauthor=S/SU/SULLR -pkgver=0.999 -pkgrel=1 -pkgdesc="Perl extension Nearly transparent SSL encapsulation for IO::Socket::INET" -depends=('perl' 'perl-net-ssleay>=1.30') -groups=('devel-extra') -Finclude perl -archs=('i686' 'x86_64') -sha1sums=('3cc057880e5f56bf79bbf2d8b289b082adb02cea') rmfile ./source/devel-extra/perl-io-socket-ssl/FrugalBuild rmdir ./source/devel-extra/perl-io-socket-ssl hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 1 -# Last Modified: Tue, 05 Sep 2006 09:33:29 +0200 -# Compiling Time: ~0.1 SBU -# Maintainer: Zsolt Szalai +# Last Modified: Tue, 05 Sep 2006 16:29:25 +0200 +# Compiling Time: 0.1 SBU +# Maintainer: Christian Hamar alias krix hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 5 -pkgname=perl-io-socket-ssl -pkgver=0.97 -pkgrel=3 -pkgdesc="Nearly transparent SSL encapsulation for IO::Socket::INET." -url="http://cpan.org/" -makedepends=('perl') -depends=('perl' 'perl-net-ssleay') +modname=IO-Socket-SSL +modauthor=S/SU/SULLR +pkgver=0.999 +pkgrel=2 +pkgdesc="Perl extension Nearly transparent SSL encapsulation for IO::Socket::INET" +depends=('perl' 'perl-net-ssleay>=1.30') +groups=('devel') +Finclude perl hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 15 -up2date="lynx -dump 'http://search.cpan.org/~behroozi/' |grep 't-SSL' |sed 's/.*SSL-\(.*\) N.*/\1/;1 q'" -source=(http://search.cpan.org/CPAN/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-$pkgver.tar.gz) -sha1sums=('122b2dc0a5f44b4c843375b9e37159847c1d5127') - -build() { - cd $startdir/src/IO-Socket-SSL-$pkgver - perl Makefile.PL - make || return 1 - make install DESTDIR=$startdir/pkg - mv $startdir/pkg/usr/lib/perl5/site_perl/?.?.? \ - $startdir/pkg/usr/lib/perl5/site_perl/current - rm -rf $startdir/pkg/usr/lib/perl5/?.?.? - find $startdir/pkg/usr/lib/perl5/site_perl/current/ -name .packlist -exec rm {} \; -} +sha1sums=('3cc057880e5f56bf79bbf2d8b289b082adb02cea') } From crazy at frugalware.org Tue Sep 5 16:32:02 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 16:32:03 2006 Subject: [Frugalware-darcs] frugalware-current: libpng-1.2.12-4-i686 Message-ID: <20060905143202.745074F0002@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905142909-f6986-54b75ce91406ec5a7e8dc1028077795ed11ded4f.gz; [libpng-1.2.12-4-i686 crazy **20060905142909 * and up to -4 :-D ] { hunk ./source/lib/libpng/FrugalBuild 1 -# Last Modified: Tue, 05 Sep 2006 12:16:49 +0530 +# Last Modified: Tue, 05 Sep 2006 16:26:48 +0200 hunk ./source/lib/libpng/FrugalBuild 8 -pkgrel=3 +pkgrel=4 } From alex at alex-smith.me.uk Tue Sep 5 17:46:22 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 17:46:25 2006 Subject: [Frugalware-darcs] frugalware-current: libgda-1.9.103-1-x86_64 Message-ID: <20060905154622.A682B4F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905164403-46e39-c099b26ab9db5b84bf060b98acd0faf69cfd5833.gz; [libgda-1.9.103-1-x86_64 AlexExtreme **20060905164403 * Version bump * Converted to use gnome-scriptlet * Removed no longer needed build() ] { hunk ./source/gnome/libgda/FrugalBuild 1 -# Last modified: Fri, 28 Oct 2005 11:13:57 +0200 -# Compiling time: ~1.56 SBU -# Maintainer: Laszlo Dvornik +# Last modified: Tue, 05 Sep 2006 17:40:30 +0100 +# Compiling time: 1.56 SBU +# Maintainer: AlexExtreme hunk ./source/gnome/libgda/FrugalBuild 6 -pkgver=1.9.102 +pkgver=1.9.103 hunk ./source/gnome/libgda/FrugalBuild 10 -depends=('glib2' 'libxslt' 'readline' 'popt' 'scrollkeeper') -makedepends=('intltool' 'perl-xml' 'db' 'postgresql' 'unixodbc' 'mysql' 'sqlite3' 'openldap' 'gtk-doc') +depends=('glib2' 'libxslt' 'readline' 'popt' 'scrollkeeper' 'libpq' 'libmysqlclient' 'libldap' 'sqlite3') +makedepends=('intltool' 'perl-xml' 'db' 'unixodbc' 'gtk-doc' 'openldap' 'mysql' 'postgresql') hunk ./source/gnome/libgda/FrugalBuild 14 -options=('scriptlet') -nondevel=1 -Finclude gnome -sha1sums=('6ad5ee58a4716b7d6a71a4dd9ba1767a2606b522') - -build() -{ - Fmake --enable-gtk-doc --with-sqlite=/usr - # Disable scrollkeeper in Makefile. - Fsed '^.*\-scrollkeeper-update.*$' '' doc/Makefile - Fmakeinstall -} - +Finclude gnome gnome-scriptlet +sha1sums=('aecb607b095c18c1d1cf8d40e632ac257030a796') +Fconfopts="$Fconfopts --enable-gtk-doc --with-sqlite=/usr" hunk ./source/gnome/libgda/libgda.install 1 -post_install() { - echo -n "updating scrollkeeper catalogue... " - scrollkeeper-update -p /var/lib/scrollkeeper > /dev/null 2>&1 - echo "done." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -op=$1 -shift - -$op $* rmfile ./source/gnome/libgda/libgda.install } From alex at alex-smith.me.uk Tue Sep 5 18:06:05 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 18:06:19 2006 Subject: [Frugalware-darcs] frugalware-current: libgnomedb-1.9.103-1-x86_64 Message-ID: <20060905160607.32DEA4F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905170405-46e39-735dd0b70efcc8593a2260d7c30634daee60b2c4.gz; [libgnomedb-1.9.103-1-x86_64 AlexExtreme **20060905170405 * Version bump * Added patches from crazy to fix this weird CFLAGS stuff ] { hunk ./source/gnome/libgnomedb/FrugalBuild 1 -# Last modified: Wed, 28 Jun 2006 12:17:31 +0200 +# Last modified: Tue, 05 Sep 2006 18:00:11 +0100 hunk ./source/gnome/libgnomedb/FrugalBuild 3 -# Maintainer: Laszlo Dvornik +# Maintainer: AlexExtreme hunk ./source/gnome/libgnomedb/FrugalBuild 6 -pkgver=1.9.102 +pkgver=1.9.103 hunk ./source/gnome/libgnomedb/FrugalBuild 19 -sha1sums=('bfb1db30d7c49c0908927c84df9636599c23299d') +source=(${source[@]} fix-reconf-warnings.patch use-am_cppflags.patch) +sha1sums=('dd8de680efcdc6cfe237991f27f9d8f19f070684' \ + 'e4a33c1f22ba2be131b6088844609d31b0ff797e' \ + 'f240689596889918513761f55f8619ae7f7761a6') hunk ./source/gnome/libgnomedb/FrugalBuild 25 - Fconf --enable-gtk-doc - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" Makefile - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" control-center/Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" control-center/Makefile - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" glade/Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" glade/Makefile - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" libgnomedb/Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" libgnomedb/Makefile - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" libgnomedb/Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" libgnomedb/Makefile - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" po/Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" po/Makefile - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" testing/Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" testing/Makefile - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" extra/Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" extra/Makefile - Fsed "CFLAGS = -Wall -g" "CFLAGS = -Wall $CFLAGS" libgnomedb/graph/Makefile - Fsed "\(.*\)_CFLAGS = \(.*\)" "\1_CFLAGS = $CFLAGS \2" libgnomedb/graph/Makefile - make || return 1 - # Disable scrollkeeper in Makefile. - sed -i 's|^.*\-scrollkeeper-update.*$||' doc/Makefile - Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 + Fcd + Fpatchall + Fautoreconf + Fbuild_slice_scrollkeeper + Fmake + Fmakeinstall addfile ./source/gnome/libgnomedb/fix-reconf-warnings.patch hunk ./source/gnome/libgnomedb/fix-reconf-warnings.patch 1 +diff -Naur libgnomedb-1.9.103/configure.in libgnomedb-1.9.103-p/configure.in +--- libgnomedb-1.9.103/configure.in 2006-08-29 15:23:39.000000000 +0200 ++++ libgnomedb-1.9.103-p/configure.in 2006-09-04 23:12:46.497790376 +0200 +@@ -43,7 +43,6 @@ + AC_ISC_POSIX + AC_PROG_CC + AC_STDC_HEADERS +-AC_ARG_PROGRAM + AM_PROG_LIBTOOL + AC_PROG_MAKE_SET + addfile ./source/gnome/libgnomedb/use-am_cppflags.patch hunk ./source/gnome/libgnomedb/use-am_cppflags.patch 1 +diff -Naur libgnomedb-1.9.103/control-center/Makefile.am libgnomedb-1.9.103-p/control-center/Makefile.am +--- libgnomedb-1.9.103/control-center/Makefile.am 2006-08-29 15:23:39.000000000 +0200 ++++ libgnomedb-1.9.103-p/control-center/Makefile.am 2006-09-04 22:23:42.584333248 +0200 +@@ -1,6 +1,6 @@ + bin_PROGRAMS=gnome-database-properties + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(LIBGNOMEDB_CFLAGS) \ +diff -Naur libgnomedb-1.9.103/extra/Makefile.am libgnomedb-1.9.103-p/extra/Makefile.am +--- libgnomedb-1.9.103/extra/Makefile.am 2006-08-29 15:23:43.000000000 +0200 ++++ libgnomedb-1.9.103-p/extra/Makefile.am 2006-09-04 22:24:07.397561064 +0200 +@@ -1,4 +1,4 @@ +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(LIBGNOMEDB_CFLAGS) \ +diff -Naur libgnomedb-1.9.103/glade/Makefile.am libgnomedb-1.9.103-p/glade/Makefile.am +--- libgnomedb-1.9.103/glade/Makefile.am 2006-08-29 15:23:43.000000000 +0200 ++++ libgnomedb-1.9.103-p/glade/Makefile.am 2006-09-04 22:26:21.584161600 +0200 +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -DG_LOG_DOMAIN=\"GnomeDB\" \ +diff -Naur libgnomedb-1.9.103/libgnomedb/data-entries/plugins/Makefile.am libgnomedb-1.9.103-p/libgnomedb/data-entries/plugins/Makefile.am +--- libgnomedb-1.9.103/libgnomedb/data-entries/plugins/Makefile.am 2006-08-31 20:43:25.000000000 +0200 ++++ libgnomedb-1.9.103-p/libgnomedb/data-entries/plugins/Makefile.am 2006-09-04 22:33:47.258408816 +0200 +@@ -1,7 +1,7 @@ + plugin_LTLIBRARIES = libgnomedb_entry_builtin_plugins.la + plugindir = $(libdir)/$(PACKAGE)/plugins + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) -I$(srcdir)/.. \ + -I$(top_builddir) \ + $(LIBGNOMEDB_CFLAGS) \ +diff -Naur libgnomedb-1.9.103/libgnomedb/graph/Makefile.am libgnomedb-1.9.103-p/libgnomedb/graph/Makefile.am +--- libgnomedb-1.9.103/libgnomedb/graph/Makefile.am 2006-08-29 15:23:43.000000000 +0200 ++++ libgnomedb-1.9.103-p/libgnomedb/graph/Makefile.am 2006-09-04 22:34:10.985801704 +0200 +@@ -2,7 +2,7 @@ + + SUBDIRS = + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) -I$(srcdir)/.. \ + -I$(top_builddir) \ + $(LIBGNOMEDB_CFLAGS) \ +diff -Naur libgnomedb-1.9.103/libgnomedb/Makefile.am libgnomedb-1.9.103-p/libgnomedb/Makefile.am +--- libgnomedb-1.9.103/libgnomedb/Makefile.am 2006-09-01 22:37:35.000000000 +0200 ++++ libgnomedb-1.9.103-p/libgnomedb/Makefile.am 2006-09-04 22:32:43.137156728 +0200 +@@ -2,7 +2,7 @@ + + SUBDIRS = . data-entries graph + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(LIBGNOMEDB_CFLAGS) \ +diff -Naur libgnomedb-1.9.103/testing/Makefile.am libgnomedb-1.9.103-p/testing/Makefile.am +--- libgnomedb-1.9.103/testing/Makefile.am 2006-08-29 15:23:50.000000000 +0200 ++++ libgnomedb-1.9.103-p/testing/Makefile.am 2006-09-04 22:34:38.858564400 +0200 +@@ -8,7 +8,7 @@ + endif + + noinst_PROGRAMS = $(test_progs) +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(LIBGNOMEDB_CFLAGS) \ } From alex at alex-smith.me.uk Tue Sep 5 19:42:56 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 19:43:01 2006 Subject: [Frugalware-darcs] frugalware-current: libsexy-0.1.10-1-x86_64 Message-ID: <20060905174256.C20944F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905183934-46e39-8f94f6b80ea39b63a4295447b256093b690bdf14.gz; [libsexy-0.1.10-1-x86_64 AlexExtreme **20060905183934 * Version bump ] { hunk ./source/gnome/libsexy/FrugalBuild 1 -# Last modified: Sun, 03 Sep 2006 08:57:10 +0100 +# Last modified: Tue, 05 Sep 2006 19:38:33 +0100 hunk ./source/gnome/libsexy/FrugalBuild 6 -pkgver=0.1.9 +pkgver=0.1.10 hunk ./source/gnome/libsexy/FrugalBuild 17 -sha1sums=('f499e98a178b8d932805f190200c60c05e3b6333') +sha1sums=('a7a39fa38d25039c7d3e219cbeb9690f065e7ef7') } From crazy at frugalware.org Tue Sep 5 21:19:07 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 21:19:09 2006 Subject: [Frugalware-darcs] frugalware-current: fontconfig-2.3.96-2-i686 Message-ID: <20060905191907.CC7B84F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905191448-f6986-97d6ef022f4ed04ff2d401c39733fafb2b4b7763.gz; [fontconfig-2.3.96-2-i686 crazy **20060905191448 * relbump * removed the tmp hack patch fixed in git now :P * added tons fixes from git to fix the weird crashes with gimp,kde and other * closes #1102,#1104,#1105 ] { addfile ./source/lib/fontconfig/fontconfig-from-git-fixes.patch hunk ./source/lib/fontconfig/tmp-mute-saw-weird-warning.patch 1 -diff -Naur fontconfig-2.3.96/src/fcxml.c fontconfig-2.3.96-p/src/fcxml.c ---- fontconfig-2.3.96/src/fcxml.c 2006-09-03 08:12:01.000000000 +0200 -+++ fontconfig-2.3.96-p/src/fcxml.c 2006-09-04 05:42:33.971217112 +0200 -@@ -545,8 +545,9 @@ - if ((value == FcTypeLangSet && type == FcTypeString) || - (value == FcTypeString && type == FcTypeLangSet)) - return; -- FcConfigMessage (parse, FcSevereWarning, "saw %s, expected %s", -+ /* FcConfigMessage (parse, FcSevereWarning, "saw %s, expected %s", - FcTypeName (value), FcTypeName (type)); -+ */ - } - } - rmfile ./source/lib/fontconfig/tmp-mute-saw-weird-warning.patch hunk ./source/lib/fontconfig/FrugalBuild 1 -# Last modified: Mon, 04 Sep 2006 21:52:27 +0200 +# Last modified: Tue, 05 Sep 2006 20:47:03 +0200 hunk ./source/lib/fontconfig/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/lib/fontconfig/FrugalBuild 20 - tmp-mute-saw-weird-warning.patch \ - fcarch.tmpl.h-x86_64.patch) + fcarch.tmpl.h-x86_64.patch \ + fontconfig-from-git-fixes.patch) hunk ./source/lib/fontconfig/FrugalBuild 29 - '8ea9a225bc6aa75d037d9b77e5f3db9acc969008' \ - '041a7694053901ea4dfd6ae98477667c550d7312') + '041a7694053901ea4dfd6ae98477667c550d7312' \ + 'b90257f34b2ff78f1b75a613c4c55c7e1e2acfe9') hunk ./source/lib/fontconfig/FrugalBuild 36 + Fcd + Fpatchall + Fautoreconf hunk ./source/lib/fontconfig/FrugalBuild 40 - Fbuild --with-add-fonts=/usr/lib/X11/fonts --enable-libxml2 + Fmake --with-add-fonts=/usr/lib/X11/fonts --enable-libxml2 + Fmakeinstall hunk ./source/lib/fontconfig/fontconfig-from-git-fixes.patch 1 +diff -Naur fontconfig-2.3.96/b/src/makealias fontconfig-2.3.96-p/b/src/makealias +--- fontconfig-2.3.96/b/src/makealias 1970-01-01 01:00:00.000000000 +0100 ++++ fontconfig-2.3.96-p/b/src/makealias 2006-09-05 20:40:14.561299712 +0200 +@@ -0,0 +1,24 @@ ++#!/bin/sh ++SRCDIR=$1 ++shift ++HEAD=fcalias.h ++TAIL=fcaliastail.h ++rm -f $HEAD $TAIL ++sed -n -e '/^FcPublic /,+1p' "$@" | sed -e '/^FcPublic /d' -e 's/ *(.*$//' | ++while read name; do ++ case $name in ++ FcCacheDir|FcCacheSubdir) ++ ;; ++ *) ++ alias="IA__$name" ++ hattr='__attribute((visibility("hidden")))' ++ echo "extern __typeof ($name) $alias $hattr;" >> $HEAD ++ echo "#define $name $alias" >> $HEAD ++ grep -l -w '^'$name "$SRCDIR"/*.c | sed -e 's/^.*\/\([^.]*\)\.c/#ifdef __\1__/' >> $TAIL ++ echo "#undef $name" >> $TAIL ++ cattr='__attribute((alias("'$alias'"), visibility("default")))' ++ echo "extern __typeof ($name) $name $cattr;" >> $TAIL ++ echo "#endif" >> $TAIL ++ ;; ++ esac ++done +diff -Naur fontconfig-2.3.96/configure.in fontconfig-2.3.96-p/configure.in +--- fontconfig-2.3.96/configure.in 2006-09-03 23:34:49.000000000 +0200 ++++ fontconfig-2.3.96-p/configure.in 2006-09-05 20:40:21.360266112 +0200 +@@ -38,11 +38,14 @@ + + dnl libtool versioning + +-LT_CURRENT=1 +-LT_REVISION=4 ++dnl bump revision when fixing bugs ++dnl bump current and age, reset revision to zero when adding APIs ++dnl bump current, leave age, reset revision to zero when changing/removing APIS ++LT_CURRENT=2 ++LT_REVISION=0 + AC_SUBST(LT_CURRENT) + AC_SUBST(LT_REVISION) +-LT_AGE=0 ++LT_AGE=1 + + LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" + AC_SUBST(LT_VERSION_INFO) +diff -Naur fontconfig-2.3.96/fc-arch/Makefile.am fontconfig-2.3.96-p/fc-arch/Makefile.am +--- fontconfig-2.3.96/fc-arch/Makefile.am 2006-08-28 18:36:47.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-arch/Makefile.am 2006-09-05 20:40:21.360266112 +0200 +@@ -47,4 +47,11 @@ + rm -f $(TARG) + ./fc-arch${EXEEXT} $(ARCHITECTURE) < $(STMPL) > $(TARG) + +-CLEANFILES=$(TARG) ++ALIAS_FILES = fcalias.h fcaliastail.h ++ ++BUILT_SOURCES = $(ALIAS_FILES) ++ ++$(ALIAS_FILES): ++ touch $(ALIAS_FILES) ++ ++CLEANFILES=$(TARG) $(ALIAS_FILES) +diff -Naur fontconfig-2.3.96/fc-cache/fc-cache.c fontconfig-2.3.96-p/fc-cache/fc-cache.c +--- fontconfig-2.3.96/fc-cache/fc-cache.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-cache/fc-cache.c 2006-09-05 20:40:21.361265960 +0200 +@@ -31,7 +31,7 @@ + #define HAVE_GETOPT 1 + #endif + +-#include "fcint.h" ++#include + #include + #include + #include +@@ -130,15 +130,14 @@ + static int + scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose) + { +- int ret = 0; +- const FcChar8 *dir; +- FcFontSet *set; +- FcStrSet *subdirs; +- FcStrList *sublist; +- FcCache *cache; +- struct stat statb; +- FcBool was_valid; +- int i; ++ int ret = 0; ++ const FcChar8 *dir; ++ FcStrSet *subdirs; ++ FcStrList *sublist; ++ FcCache *cache; ++ struct stat statb; ++ FcBool was_valid; ++ int i; + + /* + * Now scan all of the directories into separate databases +@@ -223,19 +222,17 @@ + } + } + +- set = FcCacheSet (cache); +- + if (was_valid) + { + if (verbose) + printf ("skipping, %d fonts, %d dirs\n", +- set->nfont, cache->dirs_count); ++ FcCacheNumFont (cache), FcCacheNumSubdir (cache)); + } + else + { + if (verbose) + printf ("caching, %d fonts, %d dirs\n", +- set->nfont, cache->dirs_count); ++ FcCacheNumFont (cache), FcCacheNumSubdir (cache)); + + if (!FcDirCacheValid (dir)) + { +@@ -253,7 +250,7 @@ + FcDirCacheUnload (cache); + continue; + } +- for (i = 0; i < cache->dirs_count; i++) ++ for (i = 0; i < FcCacheNumSubdir (cache); i++) + FcStrSetAdd (subdirs, FcCacheSubdir (cache, i)); + + FcDirCacheUnload (cache); +@@ -264,7 +261,6 @@ + { + fprintf (stderr, "%s: Can't create subdir list\n", dir); + ret++; +- FcDirCacheUnload (cache); + continue; + } + FcStrSetAdd (processed_dirs, dir); +@@ -311,7 +307,7 @@ + while ((ent = readdir (d))) + { + FcChar8 *file_name; +- FcChar8 *target_dir; ++ const FcChar8 *target_dir; + + if (ent->d_name[0] == '.') + continue; +diff -Naur fontconfig-2.3.96/fc-case/Makefile.am fontconfig-2.3.96-p/fc-case/Makefile.am +--- fontconfig-2.3.96/fc-case/Makefile.am 2006-08-27 23:36:51.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-case/Makefile.am 2006-09-05 20:40:21.361265960 +0200 +@@ -52,5 +52,12 @@ + rm -f $(TARG) + ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG) + +-CLEANFILES=$(TARG) ++ALIAS_FILES = fcalias.h fcaliastail.h ++ ++BUILT_SOURCES = $(ALIAS_FILES) ++ ++$(ALIAS_FILES): ++ touch $(ALIAS_FILES) ++ ++CLEANFILES=$(TARG) $(ALIAS_FILES) + +diff -Naur fontconfig-2.3.96/fc-cat/fc-cat.c fontconfig-2.3.96-p/fc-cat/fc-cat.c +--- fontconfig-2.3.96/fc-cat/fc-cat.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-cat/fc-cat.c 2006-09-05 20:40:21.363265656 +0200 +@@ -31,10 +31,11 @@ + #define HAVE_GETOPT 1 + #endif + +-#include "../src/fccache.c" ++#include + #include "../fc-arch/fcarch.h" + #include + #include ++#include + #include + #include + #include +@@ -173,20 +174,20 @@ + */ + + static const FcChar8 * +-file_base_name (const char *cache, const FcChar8 *file) ++file_base_name (const FcChar8 *cache, const FcChar8 *file) + { +- const FcChar8 *cache_slash; +- int cache_len = strlen (cache); ++ int cache_len = strlen ((char *) cache); + +- if (!strncmp (cache, file, cache_len) && file[cache_len] == '/') ++ if (!strncmp ((char *) cache, (char *) file, cache_len) && file[cache_len] == '/') + return file + cache_len + 1; + return file; + } + ++#define FC_FONT_FILE_DIR ((FcChar8 *) ".dir") ++ + static FcBool +-cache_print_set (FcFontSet *set, FcStrSet *dirs, char *base_name, FcBool verbose) ++cache_print_set (FcFontSet *set, FcStrSet *dirs, const FcChar8 *base_name, FcBool verbose) + { +- FcPattern *font; + FcChar8 *name, *dir; + const FcChar8 *file, *base; + int ret; +@@ -219,9 +220,7 @@ + + for (n = 0; n < set->nfont; n++) + { +- FcPattern **fonts = FcFontSetFonts (set); +- FcPattern *encoded_font = fonts[n]; +- FcPattern *font = FcEncodedOffsetToPtr (set, encoded_font, FcPattern); ++ FcPattern *font = set->fonts[n]; + + if (FcPatternGetString (font, FC_FILE, 0, (FcChar8 **) &file) != FcResultMatch) + goto bail3; +@@ -321,7 +320,7 @@ + { + for (; i < argc; i++) + { +- if (!FcStrSetAddFilename (args, argv[i])) ++ if (!FcStrSetAddFilename (args, (const FcChar8 *) argv[i])) + { + fprintf (stderr, "%s: malloc failure\n", argv[0]); + return 1; +@@ -356,8 +355,6 @@ + while ((arg = FcStrListNext (arglist))) + { + int j; +- off_t size; +- intptr_t *cache_dirs; + FcChar8 *cache_file = NULL; + struct stat file_stat; + +@@ -373,17 +370,12 @@ + } + + dirs = FcStrSetCreate (); +- fs = FcCacheSet (cache); +- cache_dirs = FcCacheDirs (cache); +- for (j = 0; j < cache->dirs_count; j++) ++ fs = FcCacheCopySet (cache); ++ for (j = 0; j < FcCacheNumSubdir (cache); j++) + { +- FcStrSetAdd (dirs, FcOffsetToPtr (cache_dirs, +- cache_dirs[j], +- FcChar8)); ++ FcStrSetAdd (dirs, FcCacheSubdir (cache, j)); + if (recurse) +- FcStrSetAdd (args, FcOffsetToPtr (cache_dirs, +- cache_dirs[j], +- FcChar8)); ++ FcStrSetAdd (args, FcCacheSubdir (cache, j)); + } + + if (verbose) +@@ -398,6 +390,7 @@ + + FcStrSetDestroy (dirs); + ++ FcFontSetDestroy (fs); + FcDirCacheUnload (cache); + if (cache_file) + FcStrFree (cache_file); +diff -Naur fontconfig-2.3.96/fc-cat/Makefile.am fontconfig-2.3.96-p/fc-cat/Makefile.am +--- fontconfig-2.3.96/fc-cat/Makefile.am 2006-09-01 00:44:36.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-cat/Makefile.am 2006-09-05 20:40:21.363265656 +0200 +@@ -27,7 +27,7 @@ + + SGML = ${FC_CAT_SRC}/fc-cat.sgml + +-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) ++INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) + + bin_PROGRAMS=fc-cat + +diff -Naur fontconfig-2.3.96/fc-glyphname/Makefile.am fontconfig-2.3.96-p/fc-glyphname/Makefile.am +--- fontconfig-2.3.96/fc-glyphname/Makefile.am 2006-08-27 23:36:51.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-glyphname/Makefile.am 2006-09-05 20:40:21.364265504 +0200 +@@ -47,5 +47,12 @@ + rm -f $(TARG) + ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG) + +-CLEANFILES=$(TARG) ++ALIAS_FILES = fcalias.h fcaliastail.h ++ ++BUILT_SOURCES = $(ALIAS_FILES) ++ ++$(ALIAS_FILES): ++ touch $(ALIAS_FILES) ++ ++CLEANFILES=$(TARG) $(ALIAS_FILES) + +diff -Naur fontconfig-2.3.96/fc-lang/fc-lang.c fontconfig-2.3.96-p/fc-lang/fc-lang.c +--- fontconfig-2.3.96/fc-lang/fc-lang.c 2006-09-01 10:24:41.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-lang/fc-lang.c 2006-09-05 20:40:21.365265352 +0200 +@@ -22,7 +22,6 @@ + * PERFORMANCE OF THIS SOFTWARE. + */ + +-#include "fcint.h" + #include "fccharset.c" + #include "fcstr.c" + #include "fcserialize.c" +@@ -48,6 +47,16 @@ + { + } + ++FcPrivate void ++FcCacheObjectReference (void *object) ++{ ++} ++ ++FcPrivate void ++FcCacheObjectDereference (void *object) ++{ ++} ++ + int FcDebugVal; + + FcChar8 * +diff -Naur fontconfig-2.3.96/fc-lang/Makefile.am fontconfig-2.3.96-p/fc-lang/Makefile.am +--- fontconfig-2.3.96/fc-lang/Makefile.am 2006-08-27 23:36:51.000000000 +0200 ++++ fontconfig-2.3.96-p/fc-lang/Makefile.am 2006-09-05 20:40:21.364265504 +0200 +@@ -46,4 +46,11 @@ + rm -f $(TARG) + ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG) + +-CLEANFILES=$(TARG) ++ALIAS_FILES = fcalias.h fcaliastail.h ++ ++BUILT_SOURCES = $(ALIAS_FILES) ++ ++$(ALIAS_FILES): ++ touch $(ALIAS_FILES) ++ ++CLEANFILES = $(TARG) $(ALIAS_FILES) +diff -Naur fontconfig-2.3.96/fontconfig/fcfreetype.h fontconfig-2.3.96-p/fontconfig/fcfreetype.h +--- fontconfig-2.3.96/fontconfig/fcfreetype.h 2006-08-27 23:36:52.000000000 +0200 ++++ fontconfig-2.3.96-p/fontconfig/fcfreetype.h 2006-09-05 20:40:21.366265200 +0200 +@@ -27,21 +27,25 @@ + #include + #include FT_FREETYPE_H + ++#ifndef FcPublic ++#define FcPublic ++#endif ++ + _FCFUNCPROTOBEGIN + +-FT_UInt ++FcPublic FT_UInt + FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4); + +-FcCharSet * ++FcPublic FcCharSet * + FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing); + +-FcCharSet * ++FcPublic FcCharSet * + FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks); + +-FcResult ++FcPublic FcResult + FcPatternGetFTFace (const FcPattern *p, const char *object, int n, FT_Face *f); + +-FcBool ++FcPublic FcBool + FcPatternAddFTFace (FcPattern *p, const char *object, const FT_Face f); + + _FCFUNCPROTOEND +diff -Naur fontconfig-2.3.96/fontconfig/fontconfig.h fontconfig-2.3.96-p/fontconfig/fontconfig.h +--- fontconfig-2.3.96/fontconfig/fontconfig.h 2006-09-03 23:35:01.000000000 +0200 ++++ fontconfig-2.3.96-p/fontconfig/fontconfig.h 2006-09-05 20:40:21.367265048 +0200 +@@ -25,6 +25,9 @@ + #ifndef _FONTCONFIG_H_ + #define _FONTCONFIG_H_ + ++#include ++#include ++#include + #include + + #if defined(__GNUC__) && (__GNUC__ >= 4) +@@ -33,6 +36,10 @@ + #define FC_ATTRIBUTE_SENTINEL(x) + #endif + ++#ifndef FcPublic ++#define FcPublic ++#endif ++ + typedef unsigned char FcChar8; + typedef unsigned short FcChar16; + typedef unsigned int FcChar32; +@@ -271,169 +278,207 @@ + + typedef struct _FcStrSet FcStrSet; + +-_FCFUNCPROTOBEGIN ++typedef struct _FcCache FcCache; + +-FcBool +-FcDirCacheValid (const FcChar8 *cache_file); ++_FCFUNCPROTOBEGIN + + /* fcblanks.c */ +-FcBlanks * ++FcPublic FcBlanks * + FcBlanksCreate (void); + +-void ++FcPublic void + FcBlanksDestroy (FcBlanks *b); + +-FcBool ++FcPublic FcBool + FcBlanksAdd (FcBlanks *b, FcChar32 ucs4); + +-FcBool ++FcPublic FcBool + FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4); + ++/* fccache.c */ ++ ++FcPublic const FcChar8 * ++FcCacheDir(const FcCache *c); ++ ++FcPublic FcFontSet * ++FcCacheCopySet(const FcCache *c); ++ ++FcPublic const FcChar8 * ++FcCacheSubdir (const FcCache *c, int i); ++ ++FcPublic int ++FcCacheNumSubdir (const FcCache *c); ++ ++FcPublic int ++FcCacheNumFont (const FcCache *c); ++ ++FcBool ++FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config); ++ ++FcPublic FcBool ++FcDirCacheValid (const FcChar8 *cache_file); ++ + /* fccfg.c */ +-FcChar8 * ++FcPublic FcChar8 * + FcConfigHome (void); + +-FcBool ++FcPublic FcBool + FcConfigEnableHome (FcBool enable); + +-FcChar8 * ++FcPublic FcChar8 * + FcConfigFilename (const FcChar8 *url); + +-FcConfig * ++FcPublic FcConfig * + FcConfigCreate (void); + +-void ++FcPublic void + FcConfigDestroy (FcConfig *config); + +-FcBool ++FcPublic FcBool + FcConfigSetCurrent (FcConfig *config); + +-FcConfig * ++FcPublic FcConfig * + FcConfigGetCurrent (void); + +-FcBool ++FcPublic FcBool + FcConfigUptoDate (FcConfig *config); + +-FcBool ++FcPublic FcBool + FcConfigBuildFonts (FcConfig *config); + +-FcStrList * ++FcPublic FcStrList * + FcConfigGetFontDirs (FcConfig *config); + +-FcStrList * ++FcPublic FcStrList * + FcConfigGetConfigDirs (FcConfig *config); + +-FcStrList * ++FcPublic FcStrList * + FcConfigGetConfigFiles (FcConfig *config); + +-FcChar8 * ++FcPublic FcChar8 * + FcConfigGetCache (FcConfig *config); + +-FcBlanks * ++FcPublic FcBlanks * + FcConfigGetBlanks (FcConfig *config); + +-int ++FcPublic FcStrList * ++FcConfigGetCacheDirs (FcConfig *config); ++ ++FcPublic int + FcConfigGetRescanInverval (FcConfig *config); + +-FcBool ++FcPublic FcBool + FcConfigSetRescanInverval (FcConfig *config, int rescanInterval); + +-FcFontSet * ++FcPublic FcFontSet * + FcConfigGetFonts (FcConfig *config, + FcSetName set); + +-FcBool ++FcPublic FcBool + FcConfigAppFontAddFile (FcConfig *config, + const FcChar8 *file); + +-FcBool ++FcPublic FcBool + FcConfigAppFontAddDir (FcConfig *config, + const FcChar8 *dir); + +-void ++FcPublic void + FcConfigAppFontClear (FcConfig *config); + +-FcBool ++FcPublic FcBool + FcConfigSubstituteWithPat (FcConfig *config, + FcPattern *p, + FcPattern *p_pat, + FcMatchKind kind); + +-FcBool ++FcPublic FcBool + FcConfigSubstitute (FcConfig *config, + FcPattern *p, + FcMatchKind kind); + + /* fccharset.c */ +-FcCharSet * ++FcPublic FcCharSet* + FcCharSetCreate (void); + +-void ++/* deprecated alias for FcCharSetCreate */ ++FcPublic FcCharSet * ++FcCharSetNew (void); ++ ++FcPublic void + FcCharSetDestroy (FcCharSet *fcs); + +-FcBool ++FcPublic FcBool + FcCharSetAddChar (FcCharSet *fcs, FcChar32 ucs4); + +-FcCharSet * ++FcPublic FcCharSet* + FcCharSetCopy (FcCharSet *src); + +-FcBool ++FcPublic FcBool + FcCharSetEqual (const FcCharSet *a, const FcCharSet *b); + +-FcCharSet * ++FcPublic FcCharSet* + FcCharSetIntersect (const FcCharSet *a, const FcCharSet *b); + +-FcCharSet * ++FcPublic FcCharSet* + FcCharSetUnion (const FcCharSet *a, const FcCharSet *b); + +-FcCharSet * ++FcPublic FcCharSet* + FcCharSetSubtract (const FcCharSet *a, const FcCharSet *b); + +-FcBool ++FcPublic FcBool + FcCharSetHasChar (const FcCharSet *fcs, FcChar32 ucs4); + +-FcChar32 ++FcPublic FcChar32 + FcCharSetCount (const FcCharSet *a); + +-FcChar32 ++FcPublic FcChar32 + FcCharSetIntersectCount (const FcCharSet *a, const FcCharSet *b); + +-FcChar32 ++FcPublic FcChar32 + FcCharSetSubtractCount (const FcCharSet *a, const FcCharSet *b); + +-FcBool ++FcPublic FcBool + FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b); + + #define FC_CHARSET_MAP_SIZE (256/32) + #define FC_CHARSET_DONE ((FcChar32) -1) + +-FcChar32 ++FcPublic FcChar32 + FcCharSetFirstPage (const FcCharSet *a, + FcChar32 map[FC_CHARSET_MAP_SIZE], + FcChar32 *next); + +-FcChar32 ++FcPublic FcChar32 + FcCharSetNextPage (const FcCharSet *a, + FcChar32 map[FC_CHARSET_MAP_SIZE], + FcChar32 *next); + ++/* ++ * old coverage API, rather hard to use correctly ++ */ ++ ++FcPublic FcChar32 ++FcCharSetCoverage (const FcCharSet *a, FcChar32 page, FcChar32 *result); + + /* fcdbg.c */ +-void ++FcPublic void + FcValuePrint (const FcValue v); + +-void ++FcPublic void + FcPatternPrint (const FcPattern *p); + +-void ++FcPublic void + FcFontSetPrint (const FcFontSet *s); + + /* fcdefault.c */ +-void ++FcPublic void + FcDefaultSubstitute (FcPattern *pattern); + + /* fcdir.c */ +-FcBool ++FcPublic FcBool ++FcFileIsDir (const FcChar8 *file); ++ ++FcPublic FcBool + FcFileScan (FcFontSet *set, + FcStrSet *dirs, + FcFileCache *cache, +@@ -441,7 +486,7 @@ + const FcChar8 *file, + FcBool force); + +-FcBool ++FcPublic FcBool + FcDirScan (FcFontSet *set, + FcStrSet *dirs, + FcFileCache *cache, +@@ -449,147 +494,159 @@ + const FcChar8 *dir, + FcBool force); + +-FcBool ++FcPublic FcBool + FcDirSave (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir); + ++FcPublic FcCache * ++FcDirCacheLoad (const FcChar8 *dir, FcConfig *config, FcChar8 **cache_file); ++ ++FcPublic FcCache * ++FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config); ++ ++FcPublic FcCache * ++FcDirCacheLoadFile (const FcChar8 *cache_file, struct stat *file_stat); ++ ++FcPublic void ++FcDirCacheUnload (FcCache *cache); ++ + /* fcfreetype.c */ +-FcPattern * ++FcPublic FcPattern * + FcFreeTypeQuery (const FcChar8 *file, int id, FcBlanks *blanks, int *count); + + /* fcfs.c */ + +-FcFontSet * ++FcPublic FcFontSet * + FcFontSetCreate (void); + +-void ++FcPublic void + FcFontSetDestroy (FcFontSet *s); + +-FcBool ++FcPublic FcBool + FcFontSetAdd (FcFontSet *s, FcPattern *font); + + /* fcinit.c */ +-FcConfig * ++FcPublic FcConfig * + FcInitLoadConfig (void); + +-FcConfig * ++FcPublic FcConfig * + FcInitLoadConfigAndFonts (void); + +-FcBool ++FcPublic FcBool + FcInit (void); + +-void ++FcPublic void + FcFini (void); + +-int ++FcPublic int + FcGetVersion (void); + +-FcBool ++FcPublic FcBool + FcInitReinitialize (void); + +-FcBool ++FcPublic FcBool + FcInitBringUptoDate (void); + + /* fclang.c */ +-FcLangSet * ++FcPublic FcLangSet* + FcLangSetCreate (void); + +-void ++FcPublic void + FcLangSetDestroy (FcLangSet *ls); + +-FcLangSet * ++FcPublic FcLangSet* + FcLangSetCopy (const FcLangSet *ls); + +-FcBool ++FcPublic FcBool + FcLangSetAdd (FcLangSet *ls, const FcChar8 *lang); + +-FcLangResult ++FcPublic FcLangResult + FcLangSetHasLang (const FcLangSet *ls, const FcChar8 *lang); + +-FcLangResult ++FcPublic FcLangResult + FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb); + +-FcBool ++FcPublic FcBool + FcLangSetContains (const FcLangSet *lsa, const FcLangSet *lsb); + +-FcBool ++FcPublic FcBool + FcLangSetEqual (const FcLangSet *lsa, const FcLangSet *lsb); + +-FcChar32 ++FcPublic FcChar32 + FcLangSetHash (const FcLangSet *ls); + + /* fclist.c */ +-FcObjectSet * ++FcPublic FcObjectSet * + FcObjectSetCreate (void); + +-FcBool ++FcPublic FcBool + FcObjectSetAdd (FcObjectSet *os, const char *object); + +-void ++FcPublic void + FcObjectSetDestroy (FcObjectSet *os); + +-FcObjectSet * ++FcPublic FcObjectSet * + FcObjectSetVaBuild (const char *first, va_list va); + +-FcObjectSet * ++FcPublic FcObjectSet * + FcObjectSetBuild (const char *first, ...) FC_ATTRIBUTE_SENTINEL(0); + +-FcFontSet * ++FcPublic FcFontSet * + FcFontSetList (FcConfig *config, + FcFontSet **sets, + int nsets, + FcPattern *p, + FcObjectSet *os); + +-FcFontSet * ++FcPublic FcFontSet * + FcFontList (FcConfig *config, + FcPattern *p, + FcObjectSet *os); + + /* fcatomic.c */ + +-FcAtomic * ++FcPublic FcAtomic * + FcAtomicCreate (const FcChar8 *file); + +-FcBool ++FcPublic FcBool + FcAtomicLock (FcAtomic *atomic); + +-FcChar8 * ++FcPublic FcChar8 * + FcAtomicNewFile (FcAtomic *atomic); + +-FcChar8 * ++FcPublic FcChar8 * + FcAtomicOrigFile (FcAtomic *atomic); + +-FcBool ++FcPublic FcBool + FcAtomicReplaceOrig (FcAtomic *atomic); + +-void ++FcPublic void + FcAtomicDeleteNew (FcAtomic *atomic); + +-void ++FcPublic void + FcAtomicUnlock (FcAtomic *atomic); + +-void ++FcPublic void + FcAtomicDestroy (FcAtomic *atomic); + + /* fcmatch.c */ +-FcPattern * ++FcPublic FcPattern * + FcFontSetMatch (FcConfig *config, + FcFontSet **sets, + int nsets, + FcPattern *p, + FcResult *result); + +-FcPattern * ++FcPublic FcPattern * + FcFontMatch (FcConfig *config, + FcPattern *p, + FcResult *result); + +-FcPattern * ++FcPublic FcPattern * + FcFontRenderPrepare (FcConfig *config, + FcPattern *pat, + FcPattern *font); + +-FcFontSet * ++FcPublic FcFontSet * + FcFontSetSort (FcConfig *config, + FcFontSet **sets, + int nsets, +@@ -598,192 +655,198 @@ + FcCharSet **csp, + FcResult *result); + +-FcFontSet * ++FcPublic FcFontSet * + FcFontSort (FcConfig *config, + FcPattern *p, + FcBool trim, + FcCharSet **csp, + FcResult *result); + +-void ++FcPublic void + FcFontSetSortDestroy (FcFontSet *fs); + + /* fcmatrix.c */ +-FcMatrix * ++FcPublic FcMatrix * + FcMatrixCopy (const FcMatrix *mat); + +-FcBool ++FcPublic FcBool + FcMatrixEqual (const FcMatrix *mat1, const FcMatrix *mat2); + +-void ++FcPublic void + FcMatrixMultiply (FcMatrix *result, const FcMatrix *a, const FcMatrix *b); + +-void ++FcPublic void + FcMatrixRotate (FcMatrix *m, double c, double s); + +-void ++FcPublic void + FcMatrixScale (FcMatrix *m, double sx, double sy); + +-void ++FcPublic void + FcMatrixShear (FcMatrix *m, double sh, double sv); + + /* fcname.c */ + +-FcBool ++FcPublic FcBool + FcNameRegisterObjectTypes (const FcObjectType *types, int ntype); + +-FcBool ++FcPublic FcBool + FcNameUnregisterObjectTypes (const FcObjectType *types, int ntype); + +-const FcObjectType * ++FcPublic const FcObjectType * + FcNameGetObjectType (const char *object); + +-FcBool ++FcPublic FcBool + FcNameRegisterConstants (const FcConstant *consts, int nconsts); + +-FcBool ++FcPublic FcBool + FcNameUnregisterConstants (const FcConstant *consts, int nconsts); + +-const FcConstant * ++FcPublic const FcConstant * + FcNameGetConstant (FcChar8 *string); + +-FcBool ++FcPublic FcBool + FcNameConstant (FcChar8 *string, int *result); + +-FcPattern * ++FcPublic FcPattern * + FcNameParse (const FcChar8 *name); + +-FcChar8 * ++FcPublic FcChar8 * + FcNameUnparse (FcPattern *pat); + + /* fcpat.c */ +-FcPattern * ++FcPublic FcPattern * + FcPatternCreate (void); + +-FcPattern * ++FcPublic FcPattern * + FcPatternDuplicate (const FcPattern *p); + +-void ++FcPublic void + FcPatternReference (FcPattern *p); + +-void ++FcPublic void + FcValueDestroy (FcValue v); + +-FcBool ++FcPublic FcBool + FcValueEqual (FcValue va, FcValue vb); + +-FcValue ++FcPublic FcValue + FcValueSave (FcValue v); + +-void ++FcPublic void + FcPatternDestroy (FcPattern *p); + +-FcBool ++FcPublic FcBool + FcPatternEqual (const FcPattern *pa, const FcPattern *pb); + +-FcBool ++FcPublic FcBool + FcPatternEqualSubset (const FcPattern *pa, const FcPattern *pb, const FcObjectSet *os); + +-FcChar32 ++FcPublic FcChar32 + FcPatternHash (const FcPattern *p); + +-FcBool ++FcPublic FcBool + FcPatternAdd (FcPattern *p, const char *object, FcValue value, FcBool append); + +-FcBool ++FcPublic FcBool + FcPatternAddWeak (FcPattern *p, const char *object, FcValue value, FcBool append); + +-FcResult ++FcPublic FcResult + FcPatternGet (const FcPattern *p, const char *object, int id, FcValue *v); + +-FcBool ++FcPublic FcBool + FcPatternDel (FcPattern *p, const char *object); + +-FcBool ++FcPublic FcBool + FcPatternRemove (FcPattern *p, const char *object, int id); + +-FcBool ++FcPublic FcBool + FcPatternAddInteger (FcPattern *p, const char *object, int i); + +-FcBool ++FcPublic FcBool + FcPatternAddDouble (FcPattern *p, const char *object, double d); + +-FcBool ++FcPublic FcBool + FcPatternAddString (FcPattern *p, const char *object, const FcChar8 *s); + +-FcBool ++FcPublic FcBool + FcPatternAddMatrix (FcPattern *p, const char *object, const FcMatrix *s); + +-FcBool ++FcPublic FcBool + FcPatternAddCharSet (FcPattern *p, const char *object, const FcCharSet *c); + +-FcBool ++FcPublic FcBool + FcPatternAddBool (FcPattern *p, const char *object, FcBool b); + +-FcBool ++FcPublic FcBool + FcPatternAddLangSet (FcPattern *p, const char *object, const FcLangSet *ls); + +-FcResult ++FcPublic FcResult + FcPatternGetInteger (const FcPattern *p, const char *object, int n, int *i); + +-FcResult ++FcPublic FcResult + FcPatternGetDouble (const FcPattern *p, const char *object, int n, double *d); + +-FcResult ++FcPublic FcResult + FcPatternGetString (const FcPattern *p, const char *object, int n, FcChar8 ** s); + +-FcResult ++FcPublic FcResult + FcPatternGetMatrix (const FcPattern *p, const char *object, int n, FcMatrix **s); + +-FcResult ++FcPublic FcResult + FcPatternGetCharSet (const FcPattern *p, const char *object, int n, FcCharSet **c); + +-FcResult ++FcPublic FcResult + FcPatternGetBool (const FcPattern *p, const char *object, int n, FcBool *b); + +-FcResult ++FcPublic FcResult + FcPatternGetLangSet (const FcPattern *p, const char *object, int n, FcLangSet **ls); + +-FcPattern * ++FcPublic FcPattern * + FcPatternVaBuild (FcPattern *orig, va_list va); + +-FcPattern * ++FcPublic FcPattern * + FcPatternBuild (FcPattern *orig, ...) FC_ATTRIBUTE_SENTINEL(0); + + /* fcstr.c */ + +-FcChar8 * ++FcPublic FcChar8 * + FcStrCopy (const FcChar8 *s); + +-FcChar8 * ++FcPublic FcChar8 * + FcStrCopyFilename (const FcChar8 *s); + ++FcPublic FcChar8 * ++FcStrPlus (const FcChar8 *s1, const FcChar8 *s2); ++ ++FcPublic void ++FcStrFree (FcChar8 *s); ++ + /* These are ASCII only, suitable only for pattern element names */ + #define FcIsUpper(c) ((0101 <= (c) && (c) <= 0132)) + #define FcIsLower(c) ((0141 <= (c) && (c) <= 0172)) + #define FcToLower(c) (FcIsUpper(c) ? (c) - 0101 + 0141 : (c)) + +-FcChar8 * ++FcPublic FcChar8 * + FcStrDowncase (const FcChar8 *s); + +-int ++FcPublic int + FcStrCmpIgnoreCase (const FcChar8 *s1, const FcChar8 *s2); + +-int ++FcPublic int + FcStrCmp (const FcChar8 *s1, const FcChar8 *s2); + +-const FcChar8 * ++FcPublic const FcChar8 * + FcStrStrIgnoreCase (const FcChar8 *s1, const FcChar8 *s2); + +-const FcChar8 * ++FcPublic const FcChar8 * + FcStrStr (const FcChar8 *s1, const FcChar8 *s2); + +-int ++FcPublic int + FcUtf8ToUcs4 (const FcChar8 *src_orig, + FcChar32 *dst, + int len); + +-FcBool ++FcPublic FcBool + FcUtf8Len (const FcChar8 *string, + int len, + int *nchar, +@@ -791,61 +854,61 @@ + + #define FC_UTF8_MAX_LEN 6 + +-int ++FcPublic int + FcUcs4ToUtf8 (FcChar32 ucs4, + FcChar8 dest[FC_UTF8_MAX_LEN]); + +-int ++FcPublic int + FcUtf16ToUcs4 (const FcChar8 *src_orig, + FcEndian endian, + FcChar32 *dst, + int len); /* in bytes */ + +-FcBool ++FcPublic FcBool + FcUtf16Len (const FcChar8 *string, + FcEndian endian, + int len, /* in bytes */ + int *nchar, + int *wchar); + +-FcChar8 * ++FcPublic FcChar8 * + FcStrDirname (const FcChar8 *file); + +-FcChar8 * ++FcPublic FcChar8 * + FcStrBasename (const FcChar8 *file); + +-FcStrSet * ++FcPublic FcStrSet * + FcStrSetCreate (void); + +-FcBool +-FcStrSetMember (FcStrSet *set, const FcChar8 *s); ++FcPublic FcBool ++FcStrSetMember (FcPublic FcStrSet *set, const FcChar8 *s); + +-FcBool +-FcStrSetEqual (FcStrSet *sa, FcStrSet *sb); ++FcPublic FcBool ++FcStrSetEqual (FcPublic FcStrSet *sa, FcPublic FcStrSet *sb); + +-FcBool +-FcStrSetAdd (FcStrSet *set, const FcChar8 *s); ++FcPublic FcBool ++FcStrSetAdd (FcPublic FcStrSet *set, const FcChar8 *s); + +-FcBool +-FcStrSetAddFilename (FcStrSet *set, const FcChar8 *s); ++FcPublic FcBool ++FcStrSetAddFilename (FcPublic FcStrSet *set, const FcChar8 *s); + +-FcBool +-FcStrSetDel (FcStrSet *set, const FcChar8 *s); ++FcPublic FcBool ++FcStrSetDel (FcPublic FcStrSet *set, const FcChar8 *s); + +-void +-FcStrSetDestroy (FcStrSet *set); ++FcPublic void ++FcStrSetDestroy (FcPublic FcStrSet *set); + +-FcStrList * +-FcStrListCreate (FcStrSet *set); ++FcPublic FcStrList * ++FcStrListCreate (FcPublic FcStrSet *set); + +-FcChar8 * ++FcPublic FcChar8 * + FcStrListNext (FcStrList *list); + +-void ++FcPublic void + FcStrListDone (FcStrList *list); + + /* fcxml.c */ +-FcBool ++FcPublic FcBool + FcConfigParseAndLoad (FcConfig *config, const FcChar8 *file, FcBool complain); + + _FCFUNCPROTOEND +diff -Naur fontconfig-2.3.96/INSTALL fontconfig-2.3.96-p/INSTALL +--- fontconfig-2.3.96/INSTALL 2006-09-03 23:57:43.000000000 +0200 ++++ fontconfig-2.3.96-p/INSTALL 2006-09-05 20:40:21.359266264 +0200 +@@ -31,7 +31,7 @@ + 7. make Changelog-2.3.xx + git-log 2.3.(xx-1).. > ChangeLog-2.3.xx + +- 8. Copy ChangeLog-2.3.xx and fontconfig-2.2.xx.tar.gz to ++ 8. Copy ChangeLog-2.3.xx and fontconfig-2.3.xx.tar.gz to + + freedesktop.org:/srv/fontconfig.freedesktop.org/www/release + +diff -Naur fontconfig-2.3.96/src/fcatomic.c fontconfig-2.3.96-p/src/fcatomic.c +--- fontconfig-2.3.96/src/fcatomic.c 2006-08-27 23:36:52.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcatomic.c 2006-09-05 20:40:21.368264896 +0200 +@@ -211,3 +211,6 @@ + + free (atomic); + } ++#define __fcatomic__ ++#include "fcaliastail.h" ++#undef __fcatomic__ +diff -Naur fontconfig-2.3.96/src/fcblanks.c fontconfig-2.3.96-p/src/fcblanks.c +--- fontconfig-2.3.96/src/fcblanks.c 2006-08-27 23:36:52.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcblanks.c 2006-09-05 20:40:21.368264896 +0200 +@@ -90,3 +90,6 @@ + return FcTrue; + return FcFalse; + } ++#define __fcblanks__ ++#include "fcaliastail.h" ++#undef __fcblanks__ +diff -Naur fontconfig-2.3.96/src/fccache.c fontconfig-2.3.96-p/src/fccache.c +--- fontconfig-2.3.96/src/fccache.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fccache.c 2006-09-05 20:40:21.369264744 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #if defined(HAVE_MMAP) || defined(__CYGWIN__) + # include + # include +@@ -134,7 +135,7 @@ + */ + static FcBool + FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, +- FcBool (*callback) (int fd, off_t size, void *closure), ++ FcBool (*callback) (int fd, struct stat *stat, void *closure), + void *closure, FcChar8 **cache_file_ret) + { + int fd = -1; +@@ -162,7 +163,7 @@ + if (fd >= 0) { + if (dir_stat.st_mtime <= file_stat.st_mtime) + { +- ret = (*callback) (fd, file_stat.st_size, closure); ++ ret = (*callback) (fd, &file_stat, closure); + if (ret) + { + if (cache_file_ret) +@@ -185,23 +186,245 @@ + #define FC_CACHE_MIN_MMAP 1024 + + /* ++ * Skip list element, make sure the 'next' pointer is the last thing ++ * in the structure, it will be allocated large enough to hold all ++ * of the necessary pointers ++ */ ++ ++typedef struct _FcCacheSkip FcCacheSkip; ++ ++struct _FcCacheSkip { ++ FcCache *cache; ++ int ref; ++ intptr_t size; ++ dev_t cache_dev; ++ ino_t cache_ino; ++ time_t cache_mtime; ++ FcCacheSkip *next[1]; ++}; ++ ++/* ++ * The head of the skip list; pointers for every possible level ++ * in the skip list, plus the largest level in the list ++ */ ++ ++#define FC_CACHE_MAX_LEVEL 16 ++ ++static FcCacheSkip *fcCacheChains[FC_CACHE_MAX_LEVEL]; ++static int fcCacheMaxLevel; ++ ++/* ++ * Generate a random level number, distributed ++ * so that each level is 1/4 as likely as the one before ++ * ++ * Note that level numbers run 1 <= level <= MAX_LEVEL ++ */ ++static int ++random_level (void) ++{ ++ /* tricky bit -- each bit is '1' 75% of the time */ ++ long int bits = random () | random (); ++ int level = 0; ++ ++ while (++level < FC_CACHE_MAX_LEVEL) ++ { ++ if (bits & 1) ++ break; ++ bits >>= 1; ++ } ++ return level; ++} ++ ++/* ++ * Insert cache into the list ++ */ ++static FcBool ++FcCacheInsert (FcCache *cache, struct stat *cache_stat) ++{ ++ FcCacheSkip **update[FC_CACHE_MAX_LEVEL]; ++ FcCacheSkip *s, **next; ++ int i, level; ++ ++ /* ++ * Find links along each chain ++ */ ++ next = fcCacheChains; ++ for (i = fcCacheMaxLevel; --i >= 0; ) ++ { ++ for (; (s = next[i]); next = s->next) ++ if (s->cache > cache) ++ break; ++ update[i] = &next[i]; ++ } ++ ++ /* ++ * Create new list element ++ */ ++ level = random_level (); ++ if (level > fcCacheMaxLevel) ++ { ++ level = fcCacheMaxLevel + 1; ++ update[fcCacheMaxLevel] = &fcCacheChains[fcCacheMaxLevel]; ++ fcCacheMaxLevel = level; ++ } ++ ++ s = malloc (sizeof (FcCacheSkip) + (level - 1) * sizeof (FcCacheSkip *)); ++ if (!s) ++ return FcFalse; ++ ++ s->cache = cache; ++ s->size = cache->size; ++ s->ref = 1; ++ s->cache_dev = cache_stat->st_dev; ++ s->cache_ino = cache_stat->st_ino; ++ s->cache_mtime = cache_stat->st_mtime; ++ ++ /* ++ * Insert into all fcCacheChains ++ */ ++ for (i = 0; i < level; i++) ++ { ++ s->next[i] = *update[i]; ++ *update[i] = s; ++ } ++ return FcTrue; ++} ++ ++static FcCacheSkip * ++FcCacheFindByAddr (void *object) ++{ ++ int i; ++ FcCacheSkip **next = fcCacheChains; ++ FcCacheSkip *s; ++ ++ /* ++ * Walk chain pointers one level at a time ++ */ ++ for (i = fcCacheMaxLevel; --i >= 0;) ++ while (next[i] && (char *) object >= ((char *) next[i]->cache + next[i]->size)) ++ next = next[i]->next; ++ /* ++ * Here we are ++ */ ++ s = next[0]; ++ if (s && (char *) object < ((char *) s->cache + s->size)) ++ return s; ++ return NULL; ++} ++ ++static void ++FcCacheRemove (FcCache *cache) ++{ ++ FcCacheSkip **update[FC_CACHE_MAX_LEVEL]; ++ FcCacheSkip *s, **next; ++ int i; ++ ++ /* ++ * Find links along each chain ++ */ ++ next = fcCacheChains; ++ for (i = fcCacheMaxLevel; --i >= 0; ) ++ { ++ for (; (s = next[i]); next = s->next) ++ if (s->cache >= cache) ++ break; ++ update[i] = &next[i]; ++ } ++ s = next[0]; ++ for (i = 0; i < fcCacheMaxLevel && *update[i] == s; i++) ++ *update[i] = s->next[i]; ++ while (fcCacheMaxLevel > 0 && fcCacheChains[fcCacheMaxLevel - 1] == NULL) ++ fcCacheMaxLevel--; ++ free (s); ++} ++ ++static FcCache * ++FcCacheFindByStat (struct stat *cache_stat) ++{ ++ FcCacheSkip *s; ++ ++ for (s = fcCacheChains[0]; s; s = s->next[0]) ++ if (s->cache_dev == cache_stat->st_dev && ++ s->cache_ino == cache_stat->st_ino && ++ s->cache_mtime == cache_stat->st_mtime) ++ { ++ s->ref++; ++ return s->cache; ++ } ++ return NULL; ++} ++ ++static void ++FcDirCacheDispose (FcCache *cache) ++{ ++ switch (cache->magic) { ++ case FC_CACHE_MAGIC_ALLOC: ++ free (cache); ++ break; ++ case FC_CACHE_MAGIC_MMAP: ++#if defined(HAVE_MMAP) || defined(__CYGWIN__) ++ munmap (cache, cache->size); ++#elif defined(_WIN32) ++ UnmapViewOfFile (cache); ++#endif ++ break; ++ } ++ FcCacheRemove (cache); ++} ++ ++void ++FcCacheObjectReference (void *object) ++{ ++ FcCacheSkip *skip = FcCacheFindByAddr (object); ++ ++ if (skip) ++ skip->ref++; ++} ++ ++void ++FcCacheObjectDereference (void *object) ++{ ++ FcCacheSkip *skip = FcCacheFindByAddr (object); ++ ++ if (skip) ++ { ++ skip->ref--; ++ if (skip->ref <= 0) ++ FcDirCacheDispose (skip->cache); ++ } ++} ++ ++void ++FcCacheFini (void) ++{ ++ int i; ++ ++ for (i = 0; i < FC_CACHE_MAX_LEVEL; i++) ++ assert (fcCacheChains[i] == NULL); ++ assert (fcCacheMaxLevel == 0); ++} ++ ++/* + * Map a cache file into memory + */ + static FcCache * +-FcDirCacheMapFd (int fd, off_t size) ++FcDirCacheMapFd (int fd, struct stat *fd_stat) + { +- FcCache *cache = NULL; ++ FcCache *cache; + FcBool allocated = FcFalse; + +- if (size < sizeof (FcCache)) ++ if (fd_stat->st_size < sizeof (FcCache)) + return NULL; ++ cache = FcCacheFindByStat (fd_stat); ++ if (cache) ++ return cache; + /* + * For small cache files, just read them into memory + */ +- if (size >= FC_CACHE_MIN_MMAP) ++ if (fd_stat->st_size >= FC_CACHE_MIN_MMAP) + { + #if defined(HAVE_MMAP) || defined(__CYGWIN__) +- cache = mmap (0, size, PROT_READ, MAP_SHARED, fd, 0); ++ cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0); + #elif defined(_WIN32) + { + HANDLE hFileMap; +@@ -219,11 +442,11 @@ + } + if (!cache) + { +- cache = malloc (size); ++ cache = malloc (fd_stat->st_size); + if (!cache) + return NULL; + +- if (read (fd, cache, size) != size) ++ if (read (fd, cache, fd_stat->st_size) != fd_stat->st_size) + { + free (cache); + return NULL; +@@ -232,14 +455,15 @@ + } + if (cache->magic != FC_CACHE_MAGIC_MMAP || + cache->version < FC_CACHE_CONTENT_VERSION || +- cache->size != size) ++ cache->size != fd_stat->st_size || ++ !FcCacheInsert (cache, fd_stat)) + { + if (allocated) + free (cache); + else + { + #if defined(HAVE_MMAP) || defined(__CYGWIN__) +- munmap (cache, size); ++ munmap (cache, fd_stat->st_size); + #elif defined(_WIN32) + UnmapViewOfFile (cache); + #endif +@@ -255,26 +479,24 @@ + } + + void ++FcDirCacheReference (FcCache *cache, int nref) ++{ ++ FcCacheSkip *skip = FcCacheFindByAddr (cache); ++ ++ if (skip) ++ skip->ref += nref; ++} ++ ++void + FcDirCacheUnload (FcCache *cache) + { +- switch (cache->magic) { +- case FC_CACHE_MAGIC_ALLOC: +- free (cache); +- break; +- case FC_CACHE_MAGIC_MMAP: +-#if defined(HAVE_MMAP) || defined(__CYGWIN__) +- munmap (cache, cache->size); +-#elif defined(_WIN32) +- UnmapViewOfFile (cache); +-#endif +- break; +- } ++ FcCacheObjectDereference (cache); + } + + static FcBool +-FcDirCacheMapHelper (int fd, off_t size, void *closure) ++FcDirCacheMapHelper (int fd, struct stat *fd_stat, void *closure) + { +- FcCache *cache = FcDirCacheMapFd (fd, size); ++ FcCache *cache = FcDirCacheMapFd (fd, fd_stat); + + if (!cache) + return FcFalse; +@@ -303,7 +525,7 @@ + fd = FcDirCacheOpenFile (cache_file, file_stat); + if (fd < 0) + return NULL; +- cache = FcDirCacheMapFd (fd, file_stat->st_size); ++ cache = FcDirCacheMapFd (fd, file_stat); + close (fd); + return cache; + } +@@ -313,11 +535,10 @@ + * the magic number and the size field + */ + static FcBool +-FcDirCacheValidateHelper (int fd, off_t size, void *closure) ++FcDirCacheValidateHelper (int fd, struct stat *fd_stat, void *closure) + { + FcBool ret = FcTrue; + FcCache c; +- struct stat file_stat; + + if (read (fd, &c, sizeof (FcCache)) != sizeof (FcCache)) + ret = FcFalse; +@@ -325,9 +546,7 @@ + ret = FcFalse; + else if (c.version < FC_CACHE_CONTENT_VERSION) + ret = FcFalse; +- else if (fstat (fd, &file_stat) < 0) +- ret = FcFalse; +- else if (file_stat.st_size != c.size) ++ else if (fd_stat->st_size != c.size) + ret = FcFalse; + return ret; + } +@@ -576,6 +795,54 @@ + } + + /* ++ * Hokey little macro trick to permit the definitions of C functions ++ * with the same name as CPP macros ++ */ ++#define args(x...) (x) ++ ++const FcChar8 * ++FcCacheDir args(const FcCache *c) ++{ ++ return FcCacheDir (c); ++} ++ ++FcFontSet * ++FcCacheCopySet args(const FcCache *c) ++{ ++ FcFontSet *old = FcCacheSet (c); ++ FcFontSet *new = FcFontSetCreate (); ++ int i; ++ ++ if (!new) ++ return NULL; ++ for (i = 0; i < old->nfont; i++) ++ if (!FcFontSetAdd (new, FcFontSetFont (old, i))) ++ { ++ FcFontSetDestroy (new); ++ return NULL; ++ } ++ return new; ++} ++ ++const FcChar8 * ++FcCacheSubdir args(const FcCache *c, int i) ++{ ++ return FcCacheSubdir (c, i); ++} ++ ++int ++FcCacheNumSubdir args(const FcCache *c) ++{ ++ return c->dirs_count; ++} ++ ++int ++FcCacheNumFont args(const FcCache *c) ++{ ++ return FcCacheSet(c)->nfont; ++} ++ ++/* + * This code implements the MD5 message-digest algorithm. + * The algorithm is due to Ron Rivest. This code was + * written by Colin Plumb in 1993, no copyright is claimed. +@@ -818,3 +1085,6 @@ + buf[2] += c; + buf[3] += d; + } ++#define __fccache__ ++#include "fcaliastail.h" ++#undef __fccache__ +diff -Naur fontconfig-2.3.96/src/fccfg.c fontconfig-2.3.96-p/src/fccfg.c +--- fontconfig-2.3.96/src/fccfg.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fccfg.c 2006-09-05 20:40:21.370264592 +0200 +@@ -90,8 +90,6 @@ + for (set = FcSetSystem; set <= FcSetApplication; set++) + config->fonts[set] = 0; + +- config->caches = NULL; +- + config->rescanTime = time(0); + config->rescanInterval = 30; + +@@ -197,7 +195,6 @@ + FcConfigDestroy (FcConfig *config) + { + FcSetName set; +- FcCacheList *cl, *cl_next; + + if (config == _fcConfig) + _fcConfig = 0; +@@ -221,13 +218,6 @@ + if (config->fonts[set]) + FcFontSetDestroy (config->fonts[set]); + +- for (cl = config->caches; cl; cl = cl_next) +- { +- cl_next = cl->next; +- FcDirCacheUnload (cl->cache); +- free (cl); +- } +- + free (config); + FcMemFree (FC_MEM_CONFIG, sizeof (FcConfig)); + } +@@ -239,26 +229,18 @@ + FcBool + FcConfigAddCache (FcConfig *config, FcCache *cache) + { +- FcCacheList *cl = malloc (sizeof (FcCacheList)); + FcFontSet *fs; + intptr_t *dirs; + int i; + + /* +- * Add to cache list +- */ +- if (!cl) +- return FcFalse; +- cl->cache = cache; +- cl->next = config->caches; +- config->caches = cl; +- +- /* + * Add fonts + */ + fs = FcCacheSet (cache); + if (fs) + { ++ int nref = 0; ++ + for (i = 0; i < fs->nfont; i++) + { + FcPattern *font = FcFontSetFont (fs, i); +@@ -280,8 +262,10 @@ + if (!FcConfigAcceptFont (config, font)) + continue; + ++ nref++; + FcFontSetAdd (config->fonts[FcSetSystem], font); + } ++ FcDirCacheReference (cache, nref); + } + + /* +@@ -338,6 +322,7 @@ + if (!cache) + continue; + FcConfigAddCache (config, cache); ++ FcDirCacheUnload (cache); + } + + FcStrListDone (dirlist); +@@ -1979,3 +1964,6 @@ + return FcFalse; + return FcTrue; + } ++#define __fccfg__ ++#include "fcaliastail.h" ++#undef __fccfg__ +diff -Naur fontconfig-2.3.96/src/fccharset.c fontconfig-2.3.96-p/src/fccharset.c +--- fontconfig-2.3.96/src/fccharset.c 2006-09-03 21:10:32.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fccharset.c 2006-09-05 20:40:21.371264440 +0200 +@@ -44,9 +44,6 @@ + } + + FcCharSet * +-FcCharSetNew (void); +- +-FcCharSet * + FcCharSetNew (void) + { + return FcCharSetCreate (); +@@ -58,7 +55,10 @@ + int i; + + if (fcs->ref == FC_REF_CONSTANT) ++ { ++ FcCacheObjectDereference (fcs); + return; ++ } + if (--fcs->ref > 0) + return; + for (i = 0; i < fcs->num; i++) +@@ -309,6 +309,8 @@ + { + if (src->ref != FC_REF_CONSTANT) + src->ref++; ++ else ++ FcCacheObjectReference (src); + return src; + } + +@@ -693,8 +695,6 @@ + /* + * old coverage API, rather hard to use correctly + */ +-FcChar32 +-FcCharSetCoverage (const FcCharSet *a, FcChar32 page, FcChar32 *result); + + FcChar32 + FcCharSetCoverage (const FcCharSet *a, FcChar32 page, FcChar32 *result) +@@ -1358,3 +1358,6 @@ + + return cs_serialized; + } ++#define __fccharset__ ++#include "fcaliastail.h" ++#undef __fccharset__ +diff -Naur fontconfig-2.3.96/src/fcdbg.c fontconfig-2.3.96-p/src/fcdbg.c +--- fontconfig-2.3.96/src/fcdbg.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcdbg.c 2006-09-05 20:40:21.372264288 +0200 +@@ -412,3 +412,6 @@ + FcDebugVal = 0; + } + } ++#define __fcdbg__ ++#include "fcaliastail.h" ++#undef __fcdbg__ +diff -Naur fontconfig-2.3.96/src/fcdefault.c fontconfig-2.3.96-p/src/fcdefault.c +--- fontconfig-2.3.96/src/fcdefault.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcdefault.c 2006-09-05 20:40:21.372264288 +0200 +@@ -166,3 +166,6 @@ + FcPatternObjectAddInteger (pattern, FC_HINT_STYLE_OBJECT, FC_HINT_FULL); + } + } ++#define __fcdefault__ ++#include "fcaliastail.h" ++#undef __fcdefault__ +diff -Naur fontconfig-2.3.96/src/fcdir.c fontconfig-2.3.96-p/src/fcdir.c +--- fontconfig-2.3.96/src/fcdir.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcdir.c 2006-09-05 20:40:21.372264288 +0200 +@@ -292,3 +292,6 @@ + { + return FcFalse; /* XXX deprecated */ + } ++#define __fcdir__ ++#include "fcaliastail.h" ++#undef __fcdir__ +diff -Naur fontconfig-2.3.96/src/fcfreetype.c fontconfig-2.3.96-p/src/fcfreetype.c +--- fontconfig-2.3.96/src/fcfreetype.c 2006-09-03 08:14:38.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcfreetype.c 2006-09-05 20:40:21.378263376 +0200 +@@ -2952,3 +2952,7 @@ + ftglue_free(memory, gpostags); + return complex; + } ++ ++#define __fcfreetype__ ++#include "fcaliastail.h" ++#undef __fcfreetype__ +diff -Naur fontconfig-2.3.96/src/fcfs.c fontconfig-2.3.96-p/src/fcfs.c +--- fontconfig-2.3.96/src/fcfs.c 2006-08-30 06:42:34.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcfs.c 2006-09-05 20:40:21.378263376 +0200 +@@ -130,3 +130,6 @@ + + return s_serialize; + } ++#define __fcfs__ ++#include "fcaliastail.h" ++#undef __fcfs__ +diff -Naur fontconfig-2.3.96/src/fcinit.c fontconfig-2.3.96-p/src/fcinit.c +--- fontconfig-2.3.96/src/fcinit.c 2006-09-01 08:11:10.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcinit.c 2006-09-05 20:40:21.379263224 +0200 +@@ -121,6 +121,7 @@ + FcConfigDestroy (_fcConfig); + + FcPatternFini (); ++ FcCacheFini (); + } + + /* +@@ -262,3 +263,6 @@ + FcMemReport (); + } + } ++#define __fcinit__ ++#include "fcaliastail.h" ++#undef __fcinit__ +diff -Naur fontconfig-2.3.96/src/fcint.h fontconfig-2.3.96-p/src/fcint.h +--- fontconfig-2.3.96/src/fcint.h 2006-09-03 21:10:32.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcint.h 2006-09-05 20:40:21.380263072 +0200 +@@ -48,14 +48,12 @@ + #include + #include + #include ++#include "fcalias.h" + + #ifndef FC_CONFIG_PATH + #define FC_CONFIG_PATH "fonts.conf" + #endif + +-#define FC_FONT_FILE_INVALID ((FcChar8 *) ".") +-#define FC_FONT_FILE_DIR ((FcChar8 *) ".dir") +- + #ifdef _WIN32 + #define FC_SEARCH_PATH_SEPARATOR ';' + #else +@@ -113,6 +111,15 @@ + #define FC_BANK_FIRST 1 + #define FC_BANK_LANGS 0xfcfcfcfc + ++/* slim_internal.h */ ++#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) ++#define FcPrivate __attribute__((__visibility__("hidden"))) ++#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) ++#define FcPrivate __hidden ++#else /* not gcc >= 3.3 and not Sun Studio >= 8 */ ++#define FcPrivate ++#endif ++ + typedef enum _FcValueBinding { + FcValueBindingWeak, FcValueBindingStrong, FcValueBindingSame + } FcValueBinding; +@@ -306,7 +313,7 @@ + int size; + } FcStrBuf; + +-typedef struct _FcCache { ++struct _FcCache { + int magic; /* FC_CACHE_MAGIC_MMAP or FC_CACHE_ALLOC */ + int version; /* FC_CACHE_CONTENT_VERSION */ + intptr_t size; /* size of file */ +@@ -314,13 +321,15 @@ + intptr_t dirs; /* offset to subdirs */ + int dirs_count; /* number of subdir strings */ + intptr_t set; /* offset to font set */ +-} FcCache; ++}; + ++#undef FcCacheDir ++#undef FcCacheSubdir + #define FcCacheDir(c) FcOffsetMember(c,dir,FcChar8) + #define FcCacheDirs(c) FcOffsetMember(c,dirs,intptr_t) + #define FcCacheSet(c) FcOffsetMember(c,set,FcFontSet) +-#define FcCacheSubdir(c,i) FcOffsetToPtr (FcCacheDirs(cache),\ +- FcCacheDirs(cache)[i], \ ++#define FcCacheSubdir(c,i) FcOffsetToPtr (FcCacheDirs(c),\ ++ FcCacheDirs(c)[i], \ + FcChar8) + + /* +@@ -413,11 +422,6 @@ + FcChar32 *blanks; + }; + +-typedef struct _FcCacheList { +- struct _FcCacheList *next; +- FcCache *cache; +-} FcCacheList; +- + struct _FcConfig { + /* + * File names loaded from the configuration -- saved here as the +@@ -469,11 +473,6 @@ + */ + FcFontSet *fonts[FcSetApplication + 1]; + /* +- * Font cache information is mapped from cache files +- * the configuration is destroyed, the files need to be unmapped +- */ +- FcCacheList *caches; +- /* + * Fontconfig can periodically rescan the system configuration + * and font directories. This rescanning occurs when font + * listing requests are made, but no more often than rescanInterval +@@ -483,7 +482,7 @@ + int rescanInterval; /* interval between scans */ + }; + +-extern FcConfig *_fcConfig; ++extern FcPrivate FcConfig *_fcConfig; + + typedef struct _FcFileTime { + time_t time; +@@ -499,208 +498,198 @@ + + /* fccache.c */ + +-FcBool +-FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config); +- +-void +-FcDirCacheUnload (FcCache *cache); +- +-FcCache * ++FcPrivate FcCache * + FcDirCacheScan (const FcChar8 *dir, FcConfig *config); + +-FcCache * +-FcDirCacheLoad (const FcChar8 *dir, FcConfig *config, FcChar8 **cache_file); +- +-FcCache * +-FcDirCacheLoadFile (const FcChar8 *cache_file, struct stat *file_stat); +- +-FcBool +-FcDirCacheValid (const FcChar8 *dir); +- +-FcCache * ++FcPrivate FcCache * + FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, FcStrSet *dirs); + +-FcBool ++FcPrivate FcBool + FcDirCacheWrite (FcCache *cache, FcConfig *config); + ++FcPrivate void ++FcCacheObjectReference (void *object); ++ ++FcPrivate void ++FcCacheObjectDereference (void *object); ++ ++FcPrivate void ++FcCacheFini (void); ++ ++FcPrivate void ++FcDirCacheReference (FcCache *cache, int nref); ++ + /* fccfg.c */ + +-FcBool ++FcPrivate FcBool + FcConfigAddConfigDir (FcConfig *config, + const FcChar8 *d); + +-FcBool ++FcPrivate FcBool + FcConfigAddFontDir (FcConfig *config, + const FcChar8 *d); + +-FcBool ++FcPrivate FcBool + FcConfigAddDir (FcConfig *config, + const FcChar8 *d); + +-FcBool ++FcPrivate FcBool + FcConfigAddCacheDir (FcConfig *config, + const FcChar8 *d); + +-FcStrList * +-FcConfigGetCacheDirs (FcConfig *config); +- +-FcBool ++FcPrivate FcBool + FcConfigAddConfigFile (FcConfig *config, + const FcChar8 *f); + +-FcBool ++FcPrivate FcBool + FcConfigAddBlank (FcConfig *config, + FcChar32 blank); + +-FcBool ++FcPrivate FcBool + FcConfigAddEdit (FcConfig *config, + FcTest *test, + FcEdit *edit, + FcMatchKind kind); + +-void ++FcPrivate void + FcConfigSetFonts (FcConfig *config, + FcFontSet *fonts, + FcSetName set); + +-FcBool ++FcPrivate FcBool + FcConfigCompareValue (const FcValue *m, + FcOp op, + const FcValue *v); + +-FcBool ++FcPrivate FcBool + FcConfigGlobAdd (FcConfig *config, + const FcChar8 *glob, + FcBool accept); + +-FcBool ++FcPrivate FcBool + FcConfigAcceptFilename (FcConfig *config, + const FcChar8 *filename); + +-FcBool ++FcPrivate FcBool + FcConfigPatternsAdd (FcConfig *config, + FcPattern *pattern, + FcBool accept); + +-FcBool ++FcPrivate FcBool + FcConfigAcceptFont (FcConfig *config, + const FcPattern *font); + +-FcFileTime ++FcPrivate FcFileTime + FcConfigModifiedTime (FcConfig *config); + +-FcBool ++FcPrivate FcBool + FcConfigAddCache (FcConfig *config, FcCache *cache); + + /* fcserialize.c */ +-intptr_t ++FcPrivate intptr_t + FcAlignSize (intptr_t size); + +-FcSerialize * ++FcPrivate FcSerialize * + FcSerializeCreate (void); + +-void ++FcPrivate void + FcSerializeDestroy (FcSerialize *serialize); + +-FcBool ++FcPrivate FcBool + FcSerializeAlloc (FcSerialize *serialize, const void *object, int size); + +-intptr_t ++FcPrivate intptr_t + FcSerializeReserve (FcSerialize *serialize, int size); + +-intptr_t ++FcPrivate intptr_t + FcSerializeOffset (FcSerialize *serialize, const void *object); + +-void * ++FcPrivate void * + FcSerializePtr (FcSerialize *serialize, const void *object); + +-FcBool ++FcPrivate FcBool + FcLangSetSerializeAlloc (FcSerialize *serialize, const FcLangSet *l); + +-FcLangSet * ++FcPrivate FcLangSet * + FcLangSetSerialize(FcSerialize *serialize, const FcLangSet *l); + + /* fccharset.c */ +-void ++FcPrivate void + FcLangCharSetPopulate (void); + +-FcCharSetFreezer * ++FcPrivate FcCharSetFreezer * + FcCharSetFreezerCreate (void); + +-const FcCharSet * ++FcPrivate const FcCharSet * + FcCharSetFreeze (FcCharSetFreezer *freezer, const FcCharSet *fcs); + +-void ++FcPrivate void + FcCharSetFreezerDestroy (FcCharSetFreezer *freezer); + +-FcBool ++FcPrivate FcBool + FcNameUnparseCharSet (FcStrBuf *buf, const FcCharSet *c); + +-FcCharSet * ++FcPrivate FcCharSet * + FcNameParseCharSet (FcChar8 *string); + +-FcCharLeaf * ++FcPrivate FcCharLeaf * + FcCharSetFindLeafCreate (FcCharSet *fcs, FcChar32 ucs4); + +-FcBool ++FcPrivate FcBool + FcCharSetSerializeAlloc(FcSerialize *serialize, const FcCharSet *cs); + +-FcCharSet * ++FcPrivate FcCharSet * + FcCharSetSerialize(FcSerialize *serialize, const FcCharSet *cs); + +-FcChar16 * ++FcPrivate FcChar16 * + FcCharSetGetNumbers(const FcCharSet *c); + + /* fcdbg.c */ +-void ++FcPrivate void + FcValueListPrint (const FcValueListPtr l); + +-void ++FcPrivate void + FcLangSetPrint (const FcLangSet *ls); + +-void ++FcPrivate void + FcOpPrint (FcOp op); + +-void ++FcPrivate void + FcTestPrint (const FcTest *test); + +-void ++FcPrivate void + FcExprPrint (const FcExpr *expr); + +-void ++FcPrivate void + FcEditPrint (const FcEdit *edit); + +-void ++FcPrivate void + FcSubstPrint (const FcSubst *subst); + +-void ++FcPrivate void + FcCharSetPrint (const FcCharSet *c); + +-extern int FcDebugVal; ++extern FcPrivate int FcDebugVal; + +-static inline int +-FcDebug (void) { return FcDebugVal; } ++#define FcDebug() (FcDebugVal) + +-void ++FcPrivate void + FcInitDebug (void); + + /* fcdefault.c */ +-FcChar8 * ++FcPrivate FcChar8 * + FcGetDefaultLang (void); + + /* fcdir.c */ + +-FcBool +-FcFileIsDir (const FcChar8 *file); +- +-FcBool ++FcPrivate FcBool + FcFileScanConfig (FcFontSet *set, + FcStrSet *dirs, + FcBlanks *blanks, + const FcChar8 *file, + FcConfig *config); + +-FcBool ++FcPrivate FcBool + FcDirScanConfig (FcFontSet *set, + FcStrSet *dirs, + FcBlanks *blanks, +@@ -708,123 +697,120 @@ + FcBool force, + FcConfig *config); + +-FcCache * +-FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config); +- + /* fcfont.c */ +-int ++FcPrivate int + FcFontDebug (void); + + /* fcfreetype.c */ +-FcBool ++FcPrivate FcBool + FcFreeTypeIsExclusiveLang (const FcChar8 *lang); + +-FcBool ++FcPrivate FcBool + FcFreeTypeHasLang (FcPattern *pattern, const FcChar8 *lang); + +-FcChar32 ++FcPrivate FcChar32 + FcFreeTypeUcs4ToPrivate (FcChar32 ucs4, const FcCharMap *map); + +-FcChar32 ++FcPrivate FcChar32 + FcFreeTypePrivateToUcs4 (FcChar32 private, const FcCharMap *map); + +-const FcCharMap * ++FcPrivate const FcCharMap * + FcFreeTypeGetPrivateMap (FT_Encoding encoding); + + /* fcfs.c */ + +-FcBool ++FcPrivate FcBool + FcFontSetSerializeAlloc (FcSerialize *serialize, const FcFontSet *s); + +-FcFontSet * ++FcPrivate FcFontSet * + FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s); + + /* fcgram.y */ +-int ++FcPrivate int + FcConfigparse (void); + +-int ++FcPrivate int + FcConfigwrap (void); + +-void ++FcPrivate void + FcConfigerror (char *fmt, ...); + +-char * ++FcPrivate char * + FcConfigSaveField (const char *field); + +-void ++FcPrivate void + FcTestDestroy (FcTest *test); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateInteger (int i); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateDouble (double d); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateString (const FcChar8 *s); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateMatrix (const FcMatrix *m); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateBool (FcBool b); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateNil (void); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateField (const char *field); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateConst (const FcChar8 *constant); + +-FcExpr * ++FcPrivate FcExpr * + FcExprCreateOp (FcExpr *left, FcOp op, FcExpr *right); + +-void ++FcPrivate void + FcExprDestroy (FcExpr *e); + +-void ++FcPrivate void + FcEditDestroy (FcEdit *e); + + /* fcinit.c */ + +-void ++FcPrivate void + FcMemReport (void); + +-void ++FcPrivate void + FcMemAlloc (int kind, int size); + +-void ++FcPrivate void + FcMemFree (int kind, int size); + + /* fclang.c */ +-FcLangSet * ++FcPrivate FcLangSet * + FcFreeTypeLangSet (const FcCharSet *charset, + const FcChar8 *exclusiveLang); + +-FcLangResult ++FcPrivate FcLangResult + FcLangCompare (const FcChar8 *s1, const FcChar8 *s2); + +-const FcCharSet * ++FcPrivate const FcCharSet * + FcCharSetForLang (const FcChar8 *lang); + +-FcLangSet * ++FcPrivate FcLangSet * + FcLangSetPromote (const FcChar8 *lang); + +-FcLangSet * ++FcPrivate FcLangSet * + FcNameParseLangSet (const FcChar8 *string); + +-FcBool ++FcPrivate FcBool + FcNameUnparseLangSet (FcStrBuf *buf, const FcLangSet *ls); + +-FcChar8 * ++FcPrivate FcChar8 * + FcNameUnparseEscaped (FcPattern *pat, FcBool escape); + + /* fclist.c */ + +-FcBool ++FcPrivate FcBool + FcListPatternMatchAny (const FcPattern *p, + const FcPattern *font); + +@@ -878,190 +864,184 @@ + #define FC_EMBEDDED_BITMAP_OBJECT 39 + #define FC_DECORATIVE_OBJECT 40 + +-FcBool ++FcPrivate FcBool + FcNameBool (const FcChar8 *v, FcBool *result); + +-FcBool ++FcPrivate FcBool + FcObjectValidType (FcObject object, FcType type); + +-FcObject ++FcPrivate FcObject + FcObjectFromName (const char * name); + +-const char * ++FcPrivate const char * + FcObjectName (FcObject object); + +-FcBool ++FcPrivate FcBool + FcObjectInit (void); + +-void ++FcPrivate void + FcObjectFini (void); + + #define FcObjectCompare(a, b) ((int) a - (int) b) + + /* fcpat.c */ + +-FcValue ++FcPrivate FcValue + FcValueCanonicalize (const FcValue *v); + +-void ++FcPrivate void + FcValueListDestroy (FcValueListPtr l); + +-FcPatternElt * ++FcPrivate FcPatternElt * + FcPatternObjectFindElt (const FcPattern *p, FcObject object); + +-FcPatternElt * ++FcPrivate FcPatternElt * + FcPatternObjectInsertElt (FcPattern *p, FcObject object); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddWithBinding (FcPattern *p, + FcObject object, + FcValue value, + FcValueBinding binding, + FcBool append); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAdd (FcPattern *p, FcObject object, FcValue value, FcBool append); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddWeak (FcPattern *p, FcObject object, FcValue value, FcBool append); + +-FcResult ++FcPrivate FcResult + FcPatternObjectGet (const FcPattern *p, FcObject object, int id, FcValue *v); + +-FcBool ++FcPrivate FcBool + FcPatternObjectDel (FcPattern *p, FcObject object); + +-FcBool ++FcPrivate FcBool + FcPatternObjectRemove (FcPattern *p, FcObject object, int id); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddInteger (FcPattern *p, FcObject object, int i); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddDouble (FcPattern *p, FcObject object, double d); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddString (FcPattern *p, FcObject object, const FcChar8 *s); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddMatrix (FcPattern *p, FcObject object, const FcMatrix *s); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddCharSet (FcPattern *p, FcObject object, const FcCharSet *c); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddBool (FcPattern *p, FcObject object, FcBool b); + +-FcBool ++FcPrivate FcBool + FcPatternObjectAddLangSet (FcPattern *p, FcObject object, const FcLangSet *ls); + +-FcResult ++FcPrivate FcResult + FcPatternObjectGetInteger (const FcPattern *p, FcObject object, int n, int *i); + +-FcResult ++FcPrivate FcResult + FcPatternObjectGetDouble (const FcPattern *p, FcObject object, int n, double *d); + +-FcResult ++FcPrivate FcResult + FcPatternObjectGetString (const FcPattern *p, FcObject object, int n, FcChar8 ** s); + +-FcResult ++FcPrivate FcResult + FcPatternObjectGetMatrix (const FcPattern *p, FcObject object, int n, FcMatrix **s); + +-FcResult ++FcPrivate FcResult + FcPatternObjectGetCharSet (const FcPattern *p, FcObject object, int n, FcCharSet **c); + +-FcResult ++FcPrivate FcResult + FcPatternObjectGetBool (const FcPattern *p, FcObject object, int n, FcBool *b); + +-FcResult ++FcPrivate FcResult + FcPatternObjectGetLangSet (const FcPattern *p, FcObject object, int n, FcLangSet **ls); + +-void ++FcPrivate void + FcPatternFini (void); + +-FcBool ++FcPrivate FcBool + FcPatternAppend (FcPattern *p, FcPattern *s); + +-const FcChar8 * ++FcPrivate const FcChar8 * + FcStrStaticName (const FcChar8 *name); + +-FcChar32 ++FcPrivate FcChar32 + FcStringHash (const FcChar8 *s); + +-FcBool ++FcPrivate FcBool + FcPatternSerializeAlloc (FcSerialize *serialize, const FcPattern *pat); + +-FcPattern * ++FcPrivate FcPattern * + FcPatternSerialize (FcSerialize *serialize, const FcPattern *pat); + +-FcBool ++FcPrivate FcBool + FcValueListSerializeAlloc (FcSerialize *serialize, const FcValueList *pat); + +-FcValueList * ++FcPrivate FcValueList * + FcValueListSerialize (FcSerialize *serialize, const FcValueList *pat); + + /* fcrender.c */ + + /* fcmatrix.c */ + +-extern const FcMatrix FcIdentityMatrix; ++extern FcPrivate const FcMatrix FcIdentityMatrix; + +-void ++FcPrivate void + FcMatrixFree (FcMatrix *mat); + + /* fcstr.c */ +-void ++FcPrivate void + FcStrSetSort (FcStrSet * set); + +-FcChar8 * +-FcStrPlus (const FcChar8 *s1, const FcChar8 *s2); +- +-void +-FcStrFree (FcChar8 *s); +- +-void ++FcPrivate void + FcStrBufInit (FcStrBuf *buf, FcChar8 *init, int size); + +-void ++FcPrivate void + FcStrBufDestroy (FcStrBuf *buf); + +-FcChar8 * ++FcPrivate FcChar8 * + FcStrBufDone (FcStrBuf *buf); + +-FcBool ++FcPrivate FcBool + FcStrBufChar (FcStrBuf *buf, FcChar8 c); + +-FcBool ++FcPrivate FcBool + FcStrBufString (FcStrBuf *buf, const FcChar8 *s); + +-FcBool ++FcPrivate FcBool + FcStrBufData (FcStrBuf *buf, const FcChar8 *s, int len); + +-int ++FcPrivate int + FcStrCmpIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2); + +-const FcChar8 * ++FcPrivate const FcChar8 * + FcStrContainsIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2); + +-const FcChar8 * ++FcPrivate const FcChar8 * + FcStrContainsIgnoreCase (const FcChar8 *s1, const FcChar8 *s2); + +-FcBool ++FcPrivate FcBool + FcStrUsesHome (const FcChar8 *s); + +-FcChar8 * ++FcPrivate FcChar8 * + FcStrLastSlash (const FcChar8 *path); + +-FcChar32 ++FcPrivate FcChar32 + FcStrHashIgnoreCase (const FcChar8 *s); + +-FcChar8 * ++FcPrivate FcChar8 * + FcStrCanonFilename (const FcChar8 *s); + +-FcBool ++FcPrivate FcBool + FcStrSerializeAlloc (FcSerialize *serialize, const FcChar8 *str); + +-FcChar8 * ++FcPrivate FcChar8 * + FcStrSerialize (FcSerialize *serialize, const FcChar8 *str); + + #endif /* _FC_INT_H_ */ +diff -Naur fontconfig-2.3.96/src/fclang.c fontconfig-2.3.96-p/src/fclang.c +--- fontconfig-2.3.96/src/fclang.c 2006-08-30 10:59:27.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fclang.c 2006-09-05 20:40:21.381262920 +0200 +@@ -727,3 +727,6 @@ + *l_serialize = *l; + return l_serialize; + } ++#define __fclang__ ++#include "fcaliastail.h" ++#undef __fclang__ +diff -Naur fontconfig-2.3.96/src/fclist.c fontconfig-2.3.96-p/src/fclist.c +--- fontconfig-2.3.96/src/fclist.c 2006-08-30 13:07:44.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fclist.c 2006-09-05 20:40:21.381262920 +0200 +@@ -556,3 +556,6 @@ + sets[nsets++] = config->fonts[FcSetApplication]; + return FcFontSetList (config, sets, nsets, p, os); + } ++#define __fclist__ ++#include "fcaliastail.h" ++#undef __fclist__ +diff -Naur fontconfig-2.3.96/src/fcmatch.c fontconfig-2.3.96-p/src/fcmatch.c +--- fontconfig-2.3.96/src/fcmatch.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcmatch.c 2006-09-05 20:40:21.382262768 +0200 +@@ -835,3 +835,6 @@ + sets[nsets++] = config->fonts[FcSetApplication]; + return FcFontSetSort (config, sets, nsets, p, trim, csp, result); + } ++#define __fcmatch__ ++#include "fcaliastail.h" ++#undef __fcmatch__ +diff -Naur fontconfig-2.3.96/src/fcmatrix.c fontconfig-2.3.96-p/src/fcmatrix.c +--- fontconfig-2.3.96/src/fcmatrix.c 2006-08-27 23:57:12.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcmatrix.c 2006-09-05 20:40:21.382262768 +0200 +@@ -115,3 +115,6 @@ + r.yy = 1; + FcMatrixMultiply (m, &r, m); + } ++#define __fcmatrix__ ++#include "fcaliastail.h" ++#undef __fcmatrix__ +diff -Naur fontconfig-2.3.96/src/fcname.c fontconfig-2.3.96-p/src/fcname.c +--- fontconfig-2.3.96/src/fcname.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcname.c 2006-09-05 20:40:21.382262768 +0200 +@@ -879,3 +879,6 @@ + FcStrBufDestroy (&buf); + return 0; + } ++#define __fcname__ ++#include "fcaliastail.h" ++#undef __fcname__ +diff -Naur fontconfig-2.3.96/src/fcpat.c fontconfig-2.3.96-p/src/fcpat.c +--- fontconfig-2.3.96/src/fcpat.c 2006-09-03 21:10:32.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcpat.c 2006-09-05 20:40:21.383262616 +0200 +@@ -282,7 +282,13 @@ + int i; + FcPatternElt *elts; + +- if (p->ref == FC_REF_CONSTANT || --p->ref > 0) ++ if (p->ref == FC_REF_CONSTANT) ++ { ++ FcCacheObjectDereference (p); ++ return; ++ } ++ ++ if (--p->ref > 0) + return; + + elts = FcPatternElts (p); +@@ -938,6 +944,8 @@ + { + if (p->ref != FC_REF_CONSTANT) + p->ref++; ++ else ++ FcCacheObjectReference (p); + } + + FcPattern * +@@ -1200,3 +1208,6 @@ + } + return head_serialized; + } ++#define __fcpat__ ++#include "fcaliastail.h" ++#undef __fcpat__ +diff -Naur fontconfig-2.3.96/src/fcserialize.c fontconfig-2.3.96-p/src/fcserialize.c +--- fontconfig-2.3.96/src/fcserialize.c 2006-09-03 21:10:32.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcserialize.c 2006-09-05 20:40:21.383262616 +0200 +@@ -159,3 +159,6 @@ + strcpy ((char *) str_serialize, (const char *) str); + return str_serialize; + } ++#define __fcserialize__ ++#include "fcaliastail.h" ++#undef __fcserialize__ +diff -Naur fontconfig-2.3.96/src/fcstr.c fontconfig-2.3.96-p/src/fcstr.c +--- fontconfig-2.3.96/src/fcstr.c 2006-09-03 08:14:38.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcstr.c 2006-09-05 20:40:21.384262464 +0200 +@@ -1051,3 +1051,6 @@ + free (list); + } + ++#define __fcstr__ ++#include "fcaliastail.h" ++#undef __fcstr__ +diff -Naur fontconfig-2.3.96/src/fcxml.c fontconfig-2.3.96-p/src/fcxml.c +--- fontconfig-2.3.96/src/fcxml.c 2006-09-03 08:12:01.000000000 +0200 ++++ fontconfig-2.3.96-p/src/fcxml.c 2006-09-05 20:40:21.385262312 +0200 +@@ -545,6 +545,8 @@ + if ((value == FcTypeLangSet && type == FcTypeString) || + (value == FcTypeString && type == FcTypeLangSet)) + return; ++ if (type == (FcType) -1) ++ return; + FcConfigMessage (parse, FcSevereWarning, "saw %s, expected %s", + FcTypeName (value), FcTypeName (type)); + } +@@ -2491,3 +2493,6 @@ + } + return FcTrue; + } ++#define __fcxml__ ++#include "fcaliastail.h" ++#undef __fcxml__ +diff -Naur fontconfig-2.3.96/src/ftglue.c fontconfig-2.3.96-p/src/ftglue.c +--- fontconfig-2.3.96/src/ftglue.c 2006-08-27 23:57:12.000000000 +0200 ++++ fontconfig-2.3.96-p/src/ftglue.c 2006-09-05 20:40:21.387262008 +0200 +@@ -307,3 +307,6 @@ + } + + #undef QALLOC ++#define __ftglue__ ++#include "fcaliastail.h" ++#undef __ftglue__ +diff -Naur fontconfig-2.3.96/src/ftglue.h fontconfig-2.3.96-p/src/ftglue.h +--- fontconfig-2.3.96/src/ftglue.h 2006-08-27 23:57:12.000000000 +0200 ++++ fontconfig-2.3.96-p/src/ftglue.h 2006-09-05 20:40:21.388261856 +0200 +@@ -43,6 +43,8 @@ + #ifndef __OPENTYPE_FTGLUE_H__ + #define __OPENTYPE_FTGLUE_H__ + ++#include "fcint.h" ++ + #include + #include FT_FREETYPE_H + +@@ -58,7 +60,7 @@ + #define SET_ERR(c) ( (error = (c)) != 0 ) + + #ifndef FTGLUE_API +-#define FTGLUE_API(x) extern x ++#define FTGLUE_API(x) extern FcPrivate x + #endif + + #ifndef FTGLUE_APIDEF +diff -Naur fontconfig-2.3.96/src/makealias fontconfig-2.3.96-p/src/makealias +--- fontconfig-2.3.96/src/makealias 1970-01-01 01:00:00.000000000 +0100 ++++ fontconfig-2.3.96-p/src/makealias 2006-09-05 20:40:21.388261856 +0200 +@@ -0,0 +1,24 @@ ++#!/bin/sh ++SRCDIR=$1 ++shift ++HEAD=fcalias.h ++TAIL=fcaliastail.h ++rm -f $HEAD $TAIL ++sed -n -e '/^FcPublic /,+1p' "$@" | sed -e '/^FcPublic /d' -e 's/ *(.*$//' | ++while read name; do ++ case $name in ++ FcCacheDir|FcCacheSubdir) ++ ;; ++ *) ++ alias="IA__$name" ++ hattr='__attribute((visibility("hidden")))' ++ echo "extern __typeof ($name) $alias $hattr;" >> $HEAD ++ echo "#define $name $alias" >> $HEAD ++ grep -l -w '^'$name "$SRCDIR"/*.c | sed -e 's/^.*\/\([^.]*\)\.c/#ifdef __\1__/' >> $TAIL ++ echo "#undef $name" >> $TAIL ++ cattr='__attribute((alias("'$alias'"), visibility("default")))' ++ echo "extern __typeof ($name) $name $cattr;" >> $TAIL ++ echo "#endif" >> $TAIL ++ ;; ++ esac ++done +diff -Naur fontconfig-2.3.96/src/Makefile.am fontconfig-2.3.96-p/src/Makefile.am +--- fontconfig-2.3.96/src/Makefile.am 2006-08-30 06:56:35.000000000 +0200 ++++ fontconfig-2.3.96-p/src/Makefile.am 2006-09-05 20:40:21.368264896 +0200 +@@ -73,10 +73,14 @@ + -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ + -DFONTCONFIG_PATH='"$(CONFDIR)"' + +-EXTRA_DIST = fontconfig.def.in ++EXTRA_DIST = fontconfig.def.in makealias + + noinst_HEADERS=fcint.h + ++ALIAS_FILES = fcalias.h fcaliastail.h ++ ++BUILT_SOURCES = $(ALIAS_FILES) ++ + libfontconfig_la_SOURCES = \ + fcatomic.c \ + fcblanks.c \ +@@ -112,3 +116,12 @@ + + uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib + ++PUBLIC_FILES = \ ++ $(top_srcdir)/fontconfig/fontconfig.h \ ++ $(top_srcdir)/fontconfig/fcfreetype.h \ ++ $(top_srcdir)/fontconfig/fcprivate.h ++ ++$(ALIAS_FILES): $(top_srcdir)/src/makealias $(PUBLIC_FILES) ++ sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" $(PUBLIC_FILES) ++ ++CLEANFILES := $(ALIAS_FILES) } From alex at alex-smith.me.uk Tue Sep 5 21:32:08 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 21:32:11 2006 Subject: [Frugalware-darcs] xfce44: removed test file Message-ID: <20060905193208.EF2594F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060905203231-46e39-724a65addb6a547aefde2342ed319f53544fde94.gz; [removed test file AlexExtreme **20060905203231] { hunk ./source/test 1 -This is a test file rmfile ./source/test } From crazy at frugalware.org Tue Sep 5 21:35:53 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 21:35:55 2006 Subject: [Frugalware-darcs] frugalware-current: recordmydesktop-0.2.4-1-i686 Message-ID: <20060905193553.BE9134F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905193211-f6986-336078b517ddab85bb01093fef98d7e0156aa5f8.gz; [recordmydesktop-0.2.4-1-i686 crazy **20060905193211 * up2date() fix * s/autoconf.*/Fautoreconf/ ] { hunk ./source/xapps-extra/recordmydesktop/FrugalBuild 13 +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=172357|grep -m1 'recordmydesktop-\(.*\)'|sed 's/.*-\(.*\).t.*/\1/'" hunk ./source/xapps-extra/recordmydesktop/FrugalBuild 22 - autoreconf -fivs || Fdie + Fautoreconf } From alex at alex-smith.me.uk Tue Sep 5 21:42:25 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 21:42:27 2006 Subject: [Frugalware-darcs] xfce44: added dogensync tool to update the .fdb easily Message-ID: <20060905194225.813AE4F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060905204234-46e39-e1ddbfdd339a8be87241dfc360b119e53b8f7efd.gz; [added dogensync tool to update the .fdb easily AlexExtreme **20060905204234] { adddir ./tools addfile ./tools/dogensync hunk ./tools/dogensync 1 +#!/bin/bash + +[ -z "$myarch" ] && myarch=`arch` + +if [ "$1" == "--server" ]; then + arch=$myarch gensync -f source/ frugalware-${myarch}/xfce44.fdb +else + arch + echo "rebuilding .fdb..." + ssh frugalware.org "cd /home/ftp/pub/other/xfce44; tools/dogensync --server" +fi } From alex at alex-smith.me.uk Tue Sep 5 21:43:23 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 21:43:24 2006 Subject: [Frugalware-darcs] xfce44: fixed a mistake Message-ID: <20060905194323.1FEE44F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060905204350-46e39-10f10c6471b0c7757127e8a86ce560a014e26245.gz; [fixed a mistake AlexExtreme **20060905204350] { hunk ./tools/dogensync 6 + cd /home/ftp/pub/other/xfce44 } From alex at alex-smith.me.uk Tue Sep 5 21:49:51 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 21:49:57 2006 Subject: [Frugalware-darcs] frugalware-current: xfce4rc1.sh: added to main repo Message-ID: <20060905194952.0191C4F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905204757-46e39-a7bf6af94a952947c12d7703fccad820afeda66e.gz; [xfce4rc1.sh: added to main repo AlexExtreme **20060905204757 * i've done this because this file needs to be in $fst_root/source/include on the server for gensync to be able to create the .fdb properly in the xfce44 repo ] { addfile ./source/include/xfce4rc1.sh hunk ./source/include/xfce4rc1.sh 1 +#!/bin/sh + +# (c) 2006 Priyank +# (c) 2006 Alex Smith +# xfce4rc1.sh for Frugalware +# distributed under GPL License + +# DO NOT USE in -current! + +hpurl="http://www.xfce.org/" + +if [ -z $realname ] ; then + name=$pkgname +else + name=$realname +fi + +if echo ${groups[*]} | grep -q goodies ; then + dlurl="http://download.berlios.de/xfce-goodies/" + up2date="lynx -dump http://developer.berlios.de/project/showfiles.php?group_id=910|grep \"$name-.*tar.\(gz\|bz2\)$\"|sed 's/.*-\(.*\)\.t.*/\1/;q'" +else + preup2date=`lynx -dump http://www.xfce.org/archive | grep 'xfce-' | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p' | sed 's/[0-9][0-9]\. http:\/\/www\.xfce\.org\/archive\/xfce-//g' | sed 's/ //g' | sed 's/\///g'` + dlurl="$hpurl/archive/xfce-$preup2date/src/" + up2date="lynx -dump $hpurl/archive/xfce-$preup2date/src/ | grep $name | Flasttarbz2" +fi + +source=($dlurl/$name-$pkgver.tar.bz2) + } From alex at alex-smith.me.uk Tue Sep 5 21:51:01 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 21:51:04 2006 Subject: [Frugalware-darcs] xfce44: removed xfce4rc1.sh (see last commit in frugalware-current) Message-ID: <20060905195101.B72EA4F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060905205109-46e39-6974c1b1e21551a6fb3565188ad0bddc0e6b2ee0.gz; [removed xfce4rc1.sh (see last commit in frugalware-current) AlexExtreme **20060905205109] { hunk ./source/README 1 -To build Xfce4.4, you must copy xfce4rc1.sh into the source/include directory in your FST -then build the packages in this order. - hunk ./source/xfce4rc1.sh 1 -#!/bin/sh - -# (c) 2006 Priyank -# (c) 2006 Alex Smith -# xfce4rc1.sh for Frugalware -# distributed under GPL License - -hpurl="http://www.xfce.org/" - -if [ -z $realname ] ; then - name=$pkgname -else - name=$realname -fi - -if echo ${groups[*]} | grep -q goodies ; then - dlurl="http://download.berlios.de/xfce-goodies/" - up2date="lynx -dump http://developer.berlios.de/project/showfiles.php?group_id=910|grep \"$name-.*tar.\(gz\|bz2\)$\"|sed 's/.*-\(.*\)\.t.*/\1/;q'" -else - preup2date=`lynx -dump http://www.xfce.org/archive | grep 'xfce-' | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p' | sed 's/[0-9][0-9]\. http:\/\/www\.xfce\.org\/archive\/xfce-//g' | sed 's/ //g' | sed 's/\///g'` - dlurl="$hpurl/archive/xfce-$preup2date/src/" - up2date="lynx -dump $hpurl/archive/xfce-$preup2date/src/ | grep $name | Flasttarbz2" -fi - -source=($dlurl/$name-$pkgver.tar.bz2) - rmfile ./source/xfce4rc1.sh } From alex at alex-smith.me.uk Tue Sep 5 21:52:57 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 21:52:58 2006 Subject: [Frugalware-darcs] xfce44: fixed mistake in dogensync Message-ID: <20060905195257.747CA4F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060905205322-46e39-2ecf0baa0649917b1278f636ee807ac47b1729c1.gz; [fixed mistake in dogensync AlexExtreme **20060905205322] { hunk ./tools/dogensync 9 - arch hunk ./tools/dogensync 10 - ssh frugalware.org "cd /home/ftp/pub/other/xfce44; tools/dogensync --server" + ssh frugalware.org "arch=${myarch} tools/dogensync --server" } From alex at alex-smith.me.uk Tue Sep 5 21:54:38 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 21:54:40 2006 Subject: [Frugalware-darcs] xfce44: bleh, another typo fix Message-ID: <20060905195438.AFE584F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060905205503-46e39-ac29df6002eb8cc7e45f867cbeb4799e89de2608.gz; [bleh, another typo fix AlexExtreme **20060905205503] { hunk ./tools/dogensync 10 - ssh frugalware.org "arch=${myarch} tools/dogensync --server" + ssh frugalware.org "cd /home/ftp/pub/other/xfce44; myarch=${myarch} tools/dogensync --server" } From alex at alex-smith.me.uk Tue Sep 5 22:02:11 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 22:02:14 2006 Subject: [Frugalware-darcs] xfce44: xfce4-dev-tools-4.3.99.1-1-x86_64 Message-ID: <20060905200211.EDE484F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060905210211-46e39-5064479d581674298fcea95b8787fdc5aad643b5.gz; [xfce4-dev-tools-4.3.99.1-1-x86_64 AlexExtreme **20060905210211 * Added x86_64 to archs() ] { hunk ./source/xfce4-dev-tools/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 16:40:27 +0530 +# Last Modified: Tue, 05 Sep 2006 22:01:10 +0100 hunk ./source/xfce4-dev-tools/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From alex at alex-smith.me.uk Tue Sep 5 22:07:43 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 22:07:43 2006 Subject: [Frugalware-darcs] xfce44: libxfce4util: added x86_64 to archs Message-ID: <20060905200743.298954F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060905210741-46e39-fda4139f56ace80546f1054fb9443d59f6e96240.gz; [libxfce4util: added x86_64 to archs AlexExtreme **20060905210741] { hunk ./source/libxfce4util/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 16:56:09 +0530 +# Last Modified: Tue, 05 Sep 2006 22:06:19 +0100 hunk ./source/libxfce4util/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') } From alex at alex-smith.me.uk Tue Sep 5 22:17:00 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Sep 5 22:17:01 2006 Subject: [Frugalware-darcs] frugalware-current: mono-1.1.17.1-2-x86_64 Message-ID: <20060905201700.215284F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905211447-46e39-ac409e5dc352d9ff3e694c47fed81f59042c1d0f.gz; [mono-1.1.17.1-2-x86_64 AlexExtreme **20060905211447 * Added libgdiplus support * Switch to new init system * Bleh, I could have SWORN i pushed this... ] { move ./source/devel/mono/rc.mono ./source/devel/mono/rc.mono.old move ./source/devel/mono/rc.mono.new ./source/devel/mono/rc.mono hunk ./source/devel/mono/FrugalBuild 1 -# Last modified: Fri, 01 Sep 2006 20:00:13 +0200 +# Last modified: Mon, 04 Sep 2006 17:20:46 +0100 hunk ./source/devel/mono/FrugalBuild 7 -mainver=1.1 -pkgrel=1 +pkgrel=2 hunk ./source/devel/mono/FrugalBuild 10 -depends=('glib2' 'zlib') +depends=('glib2' 'zlib' 'libgdiplus>=1.1.17') hunk ./source/devel/mono/FrugalBuild 14 +Finclude mono hunk ./source/devel/mono/FrugalBuild 16 -source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.gz rc.mono) +source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.gz rc.mono rc.mono-hu.po) hunk ./source/devel/mono/FrugalBuild 18 - '5ad25490e70b0d1f48b855c3287d962b3bd453be') - -build() -{ - export MONO_SHARED_DIR=$Fdestdir/weird - mkdir -p $MONO_SHARED_DIR - - Fpatchall - - Fmake --with-tls=__thread - Fmakeinstall - rm -rf $MONO_SHARED_DIR - - # Init scripts. - Frcd -} + '143399121fac3d5dc47fb07e8dec4ded182a14bd' \ + '6c19f98462d7bb1ecba79a3ad284ea02a1eac2ec') +Fconfopts="$Fconfopts --with-tls=__thread --with-libgdiplus=installed" hunk ./source/devel/mono/rc.mono 4 -# (c) 2004 - 2005 Laszlo Dvornik +# (c) 2006 Alex Smith hunk ./source/devel/mono/rc.mono 11 -source /lib/initscripts/functions hunk ./source/devel/mono/rc.mono 12 +TEXTDOMAINDIR=/lib/initscripts/messages +source /lib/initscripts/functions hunk ./source/devel/mono/rc.mono 15 -actions=(restart start stop) +actions=(start stop restart) hunk ./source/devel/mono/rc.mono 22 - echo ':CLR:M::MZ::/usr/bin/mono:' > Proc/sys/fs/binfmt_misc/register + echo ':CLR:M::MZ::/usr/bin/mono:' > /proc/sys/fs/binfmt_misc/register addfile ./source/devel/mono/rc.mono-hu.po hunk ./source/devel/mono/rc.mono-hu.po 1 +# Hungarian translations for rc.mono package. +# Copyright (C) 2006 Alex Smith +# This file is distributed under the same license as the rc.mono package. +# Alex Smith , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-04 16:45+0100\n" +"PO-Revision-Date: 2006-09-04 16:45+0100\n" +"Last-Translator: Alex Smith \n" +"Language-Team: Hungarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: rc.mono:19 +msgid "Registering .NET IL binaries with mono" +msgstr ".NET IL binárisok regisztrálása a mono-val" + +#: rc.mono:31 +msgid "Unregistering .NET IL binaries" +msgstr ".NET IL binárisok regisztrációjának eltávolítása" addfile ./source/devel/mono/rc.mono.pot hunk ./source/devel/mono/rc.mono.pot 1 +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-04 16:45+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: rc.mono:19 +msgid "Registering .NET IL binaries with mono" +msgstr "" + +#: rc.mono:31 +msgid "Unregistering .NET IL binaries" +msgstr "" } From crazy at frugalware.org Tue Sep 5 22:28:36 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 22:28:37 2006 Subject: [Frugalware-darcs] frugalware-current: gtk-recordmydesktop-0.1-1-i686 Message-ID: <20060905202836.1685C4F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905202554-f6986-17dc00526b80a318b2b873ffacd601917f441b9c.gz; [gtk-recordmydesktop-0.1-1-i686 crazy **20060905202554 * New package ] { adddir ./source/xapps-extra/gtk-recordmydesktop addfile ./source/xapps-extra/gtk-recordmydesktop/FrugalBuild addfile ./source/xapps-extra/gtk-recordmydesktop/fix-desktop-file.patch hunk ./source/xapps-extra/gtk-recordmydesktop/FrugalBuild 1 +# Last Modified: Tue, 05 Sep 2006 22:24:40 +0200 +# Compiling Time: 0.09 SBU +# Maintainer: crazy + +pkgname=gtk-recordmydesktop +pkgver=0.1 +pkgrel=1 +pkgdesc="A pyGtk frontend for recordMyDesktop." +url="http://recordmydesktop.sourceforge.net/" +depends=('pygtk') +rodepends=('recordmydesktop') +groups=('xapps-extra') +archs=('i686') +options=('scriptlet') +up2date="lynx -dump lynx -dump http://sourceforge.net/project/showfiles.php?group_id=172357|grep -m1 'gtk-recordMyDesktop-\(.*\).tar.gz'|sed 's/.*top-\(.*\).t.*/\1/'" +source=(http://heanet.dl.sourceforge.net/sourceforge/recordmydesktop/gtk-recordMyDesktop-$pkgver.tar.gz \ + fix-desktop-file.patch) +_F_cd_path="gtk-recordMyDesktop-$pkgver" +sha1sums=('4cae78d808b944ed0650d88297c2cebbf39d7fc7' \ + '877f36ab7dc98e5a6164730a6a75fe5805ec57fc') + +# optimization OK hunk ./source/xapps-extra/gtk-recordmydesktop/fix-desktop-file.patch 1 +diff -Naur gtk-recordMyDesktop-0.1/gtk-recordmydesktop.desktop gtk-recordMyDesktop-0.1-p/gtk-recordmydesktop.desktop +--- gtk-recordMyDesktop-0.1/gtk-recordmydesktop.desktop 2006-09-05 08:58:49.000000000 +0200 ++++ gtk-recordMyDesktop-0.1-p/gtk-recordmydesktop.desktop 2006-09-05 22:14:29.336643192 +0200 +@@ -1,10 +1,10 @@ + [Desktop Entry] + Encoding=UTF-8 +-_Name=gtk-recordMyDesktop +-_Comment=Frontend for recordMyDesktop ++Name=gtk-recordMyDesktop ++Comment=Frontend for recordMyDesktop + Exec=gtk-recordMyDesktop + Terminal=false + Type=Application + Icon=gtk-recordmydesktop.png +-Categories=GNOME;Application;AudioVideo; ++Categories=GNOME;KDE;Application;AudioVideo; + StartupNotify=false } From crazy at frugalware.org Tue Sep 5 23:01:00 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 23:01:08 2006 Subject: [Frugalware-darcs] frugalware-current: nano-1.9.99pre1-1-i686 Message-ID: <20060905210100.CBB964E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905204918-f6986-9c083dba74ffc9f7ccd81c39955c1aba31b660a9.gz; [nano-1.9.99pre1-1-i686 crazy **20060905204918 * Version bump to devel because the stable one has tons problems ( memleaks , segfaults , and other weird issues ) * confirmed to work fine on x86_64 from Alex * removed ( tmp ? ) ppc from archs() ( no idea whatever works or not on ppc , DNAku test pls and readd) * added a 'valid' nanorc and Frugalware defaults to it * added frugalbuild.nanorc ( supports all F* commands and the most _F_* just , just open some FB and have a look :P) * NOTE: any 'stable' /etc/nanorc | ~/.nanorc won't work right with the devel one * removed the README.Frugalware not needed anymore ] { hunk ./source/apps/nano/README.Frugalware 1 -Nano informations: - - -The nano install script has installed the file /etc/nanorc.sample which -is a sample configuration file for nano. To use this file you will need -to rename it to /etc/nanorc and edit it as needed. For more informationen -plese see 'man nano' and 'man nanorc'. - -Examples can be found at : - -http://gentoo-wiki.com/TIP_Nano_Context_Highlighting -http://ubuntuforums.org/showthread.php?t=62250 - - -Here an example for FrugalBuilds (is not complet now but work fine) :) - -syntax "frugalbuild" "^.*FrugalBuild$" -color green start="^" end="$" -color cyan "^.*(pkgname|pkgver|pkgrel|pkgdesc|force|url|license|up2date|install|source|groups|backup|depends|makedepends|conflicts|provides|replaces).*=.*$" -color brightcyan "\<(pkgname|pkgver|pkgrel|pkgdesc|force|url|license|install|source|md5sums|groups|backup|depends|makedepends|conflicts|provides|replaces)\>" -color cyan "\.install" -color brightwhite "=" "'" "\(" "\)" "\"" "#.*$" "\," "\{" "\}" -color brightcyan "(\$|\$\{|\$\()(pkgname|pkgver|pkgrel|pkgdesc|force|url|license|source|groups|backup|depends|makedepends|conflicts|provides|replaces|startdir) (|\}|\))" -color brightred "build\(\)" -color brightred "\<(configure|make)\>" -color red "\<(DESTDIR|PREFIX|prefix|sysconfdir|datadir|libdir|includedir|mandir)\>" -color blue "^. *F(build|cd|mkdir|doc|sed|prefix|sysconfdir|confopts|die|message)" -color brightred "\" -color brightyellow "\<(md5sums|sha1sums|archs)\>" rmfile ./source/apps/nano/README.Frugalware addfile ./source/apps/nano/frugalware.patch addfile ./source/apps/nano/misc-fixes.patch hunk ./source/apps/nano/FrugalBuild 1 -# Last Modified: Tue, 05 Sep 2006 03:08:14 +0200 -# Compiling Time: 0.08 SBU +# Last Modified: Tue, 05 Sep 2006 22:47:50 +0200 +# Compiling Time: 0.15 SBU hunk ./source/apps/nano/FrugalBuild 4 -# Contributor xbit hunk ./source/apps/nano/FrugalBuild 6 -pkgver=1.2.5 -pkgrel=3 -pkgdesc="free Pico clone with some new features" +pkgver=1.9.99pre1 +pkgrel=1 +pkgdesc="free Pico clone with some new features." hunk ./source/apps/nano/FrugalBuild 11 +makedepends=('cvs') hunk ./source/apps/nano/FrugalBuild 13 -archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $url|grep 'Latest Version'|tr -s ' '|cut -d ' ' -f 4" -source=($url/dist/v1.2/$pkgname-$pkgver.tar.gz README.Frugalware) -sha1sums=('ba55942aacf9f296a910d8f73afb7446f118830d' \ - '4de77bd9a5e6faa1a9fd00b6f7ba05d4eebc4f6d') +archs=('i686' 'x86_64') +up2date="lynx -dump $url|grep 'Latest Version'|sed 's/.*stable.* \(.*\) .*/\1/'" +source=($url/dist/v1.3/$pkgname-$pkgver.tar.gz \ + frugalware.patch misc-fixes.patch) hunk ./source/apps/nano/FrugalBuild 18 +sha1sums=('c11acb65d84df27f6c271a7d7767c6bb70f01dfa' \ + '364f5c6e44d8e81784fe9fefe9847b2a279d2c93' \ + '3d121e5dfc67f12c1d097807db658bd63e111402') hunk ./source/apps/nano/FrugalBuild 24 - Fbuild --sysconfdir=/etc --enable-color --enable-nanorc || return 1 - Ffilerel nanorc.sample /etc/nanorc - Fdocrel nanorc.sample - Fdoc README.Frugalware + Fcd + Fpatchall + Fautoreconf + Fmake \ + --sysconfdir=/etc \ + --enable-color \ + --enable-nanorc \ + --with-gnu-ld \ + --enable-multibuffer + Fmakeinstall + Ffilerel doc/nanorc.sample /etc/nanorc + Fdocrel doc/nanorc.sample hunk ./source/apps/nano/FrugalBuild 38 -# optimization ok +# optimization OK hunk ./source/apps/nano/frugalware.patch 1 +diff -Naur nano-1.9.99pre1/doc/nanorc.sample.in nano-1.9.99pre1-p/doc/nanorc.sample.in +--- nano-1.9.99pre1/doc/nanorc.sample.in 2006-07-31 01:46:22.000000000 +0200 ++++ nano-1.9.99pre1-p/doc/nanorc.sample.in 2006-09-05 02:31:20.000000000 +0200 +@@ -16,10 +16,10 @@ + ## ", ', ), >, ], and }. + + ## Use auto-indentation. +-# set autoindent ++#set autoindent + + ## Backup files to filename~. +-# set backup ++set backup + + ## The directory to put unique backup files in. + # set backupdir "" +@@ -35,7 +35,7 @@ + ## punctuation, optionally followed by closing brackets, can end + ## sentences. + ## +-# set brackets ""')>]}" ++set brackets ""')>]}" + + ## Do case sensitive searches by default. + # set casesensitive +@@ -45,7 +45,7 @@ + # set const + + ## Use cut to end of line by default. +-# set cut ++set cut + + ## Set the line length for wrapping text and justifying paragraphs. + ## If fill is 0 or less, the line length will be the screen width less +@@ -60,7 +60,7 @@ + ## searches. They cannot contain blank characters. The former set must + ## come before the latter set, and both must be in the same order. + ## +-# set matchbrackets "(<[{)>]}" ++set matchbrackets "(<[{)>]}" + + ## Use the blank line below the titlebar as extra editing space. + # set morespace +@@ -76,7 +76,7 @@ + ## separate buffer). You must have configured with --enable-multibuffer + ## for this to work. + ## +-# set multibuffer ++set multibuffer + + ## Don't convert files from DOS/Mac format. + # set noconvert +@@ -91,7 +91,7 @@ + # set nonewlines + + ## Don't wrap text at all. +-# set nowrap ++set nowrap + + ## Set operating directory. nano will not read or write files outside + ## this directory and its subdirectories. Also, the current directory +@@ -108,7 +108,7 @@ + ## punctuation, optionally followed by closing brackets, can end + ## sentences. + ## +-# set punct "!.?" ++set punct "!.?" + + ## Do quick statusbar blanking. Statusbar messages will disappear after + ## 1 keystroke instead of 26. Note that "const" overrides this. +@@ -129,7 +129,7 @@ + # set rebindkeypad + + ## Do extended regular expression searches by default. +-# set regexp ++set regexp + + ## Make the Home key smarter. When Home is pressed anywhere but at the + ## very beginning of non-whitespace characters on a line, the cursor +@@ -213,45 +213,51 @@ + ## + ## All regexes should be extended regular expressions. + ++## Frugalware Linux note: ++## DO _NOT_ USE @PKGDATADIR@ folder to modify ++## the X.nanorc files. + + ## Nanorc files +-# include "@PKGDATADIR@/nanorc.nanorc" ++include "@PKGDATADIR@/nanorc.nanorc" + + ## C/C++ +-# include "@PKGDATADIR@/c.nanorc" ++include "@PKGDATADIR@/c.nanorc" + + ## HTML +-# include "@PKGDATADIR@/html.nanorc" ++include "@PKGDATADIR@/html.nanorc" + + ## TeX +-# include "@PKGDATADIR@/tex.nanorc" ++include "@PKGDATADIR@/tex.nanorc" + + ## Quoted emails (under e.g. mutt) +-# include "@PKGDATADIR@/mutt.nanorc" ++include "@PKGDATADIR@/mutt.nanorc" + + ## Patch files +-# include "@PKGDATADIR@/patch.nanorc" ++include "@PKGDATADIR@/patch.nanorc" + + ## Manpages +-# include "@PKGDATADIR@/man.nanorc" ++include "@PKGDATADIR@/man.nanorc" + + ## Groff +-# include "@PKGDATADIR@/groff.nanorc" ++include "@PKGDATADIR@/groff.nanorc" + + ## Perl +-# include "@PKGDATADIR@/perl.nanorc" ++include "@PKGDATADIR@/perl.nanorc" + + ## Python +-# include "@PKGDATADIR@/python.nanorc" ++include "@PKGDATADIR@/python.nanorc" + + ## Ruby +-# include "@PKGDATADIR@/ruby.nanorc" ++include "@PKGDATADIR@/ruby.nanorc" + + ## Java +-# include "@PKGDATADIR@/java.nanorc" ++include "@PKGDATADIR@/java.nanorc" + + ## Assembler +-# include "@PKGDATADIR@/asm.nanorc" ++include "@PKGDATADIR@/asm.nanorc" + + ## Bourne shell scripts +-# include "@PKGDATADIR@/sh.nanorc" ++include "@PKGDATADIR@/sh.nanorc" ++ ++## FrugalBuild ++include "@PKGDATADIR@/frugalbuild.nanorc" +diff -Naur nano-1.9.99pre1/doc/syntax/frugalbuild.nanorc nano-1.9.99pre1-p/doc/syntax/frugalbuild.nanorc +--- nano-1.9.99pre1/doc/syntax/frugalbuild.nanorc 1970-01-01 01:00:00.000000000 +0100 ++++ nano-1.9.99pre1-p/doc/syntax/frugalbuild.nanorc 2006-09-05 07:01:52.000000000 +0200 +@@ -0,0 +1,40 @@ ++# (c) 2006 Gabriel Craciunescu ++# frugalbuild.nanorc for Frugalware ++# distributed under GPL License ++ ++syntax "frugalbuild" "^.*FrugalBuild$" ++color brightwhite start="^" end="$" ++color brightcyan "^(pkgname|pkgver|pkgrel|pkgdesc|url|license|source|groups|backup|depends)" ++color brightcyan "^(|makedepends|conflicts|provides|replaces|up2date|archs|stable|rodepends)" ++color magenta "^(subpkgs|subinstall|subdescs|subarchs|suboptions|subdepends|subgroups|subrodepends)" ++color magenta "^(sublicense|subreplaces|subremoves|subconflicts|subprovides|subbackup|subbackup|suboptions)" ++color brightred "\<(configure|make)\>" ++color brightcyan "\<(DESTDIR|PREFIX|prefix|sysconfdir|datadir|libdir|includedir|mandir)\>" ++color red "F(build|cd|mkdir|doc|docrel|sed|die|message|make|makeinstall|patch|patchall|rcd|rcd2|file|ln|filerel|chmod|split|rm|cp|cpr|mv)" ++color red "F(desktop|autoreconf|cprrel|acu|dirschmod|fileschmod|dirschown|fileschown|exerel|exe|iconrel|icon|deststrip|conf|nant|sort)" ++color red "F(unpack_makeself|autoconfize|lasttar|lasttgz|lasttarbz2|msgfmt)" ++color brightblue "\" ++color brightblue "\<(md5sums|sha1sums)\>" ++color brightblue "^(options)" ++color white """ "'" "(<|>|@|)" ++## sourceforge.sh ++color brightcyan "_F_sourceforge_(prefix|ext|mirror|dirname)" ++## util.sh ++color brightcyan "_F_(cd_path|conf_configure|conf_perl_pipefrom|rcd_name)" ++## kernel.sh ++color brightcyan "_F_kernel_(stable|rc|git|mm|vmlinuz|verbose|name|ver|dontsedarch)" ++## perl.sh ++color brightcyan "_F_perl_(sourcename|ext|url)" ++## scm.sh ++color brightcyan "_F_scm_(type|url|password|tag|module)" ++## kdeapps.sh ++color brightcyan "_F_kdeapps_(id|id2)" ++## gnome-scriptlet.sh ++color brightcyan "_F_gnome_(schemas|entries|desktop|scrollkeeper|mime|iconcache|name)" ++color red "Fbuild_(slice_scrollkeeper|gnome_scriptlet)" ++## some misc stuff ++icolor white "^# .*modified+:" ++icolor white "^# .*(Time|time)+:" ++icolor white "^# .*M.*r+:" ++icolor white "^# .*C.*r+:" ++ +diff -Naur nano-1.9.99pre1/doc/syntax/Makefile.am nano-1.9.99pre1-p/doc/syntax/Makefile.am +--- nano-1.9.99pre1/doc/syntax/Makefile.am 2006-06-01 20:35:39.000000000 +0200 ++++ nano-1.9.99pre1-p/doc/syntax/Makefile.am 2006-09-05 02:28:10.000000000 +0200 +@@ -11,6 +11,7 @@ + python.nanorc \ + ruby.nanorc \ + sh.nanorc \ +- tex.nanorc ++ tex.nanorc \ ++ frugalbuild.nanorc + + EXTRA_DIST = $(pkgdata_DATA) hunk ./source/apps/nano/misc-fixes.patch 1 +diff -Naur nano-1.9.99pre1/doc/syntax/java.nanorc nano-1.9.99pre1-p/doc/syntax/java.nanorc +--- nano-1.9.99pre1/doc/syntax/java.nanorc 2006-06-08 14:49:57.000000000 +0200 ++++ nano-1.9.99pre1-p/doc/syntax/java.nanorc 2006-09-05 07:04:55.000000000 +0200 +@@ -9,4 +9,4 @@ + color blue "//.*" + color blue start="/\*" end="\*/" + color brightblue start="/\*\*" end="\*/" +-color ,green "[[:space:]]+$" ++color green "[[:space:]]+$" +diff -Naur nano-1.9.99pre1/doc/syntax/sh.nanorc nano-1.9.99pre1-p/doc/syntax/sh.nanorc +--- nano-1.9.99pre1/doc/syntax/sh.nanorc 2006-06-08 14:49:57.000000000 +0200 ++++ nano-1.9.99pre1-p/doc/syntax/sh.nanorc 2006-09-05 07:05:15.000000000 +0200 +@@ -9,4 +9,4 @@ + color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>" + icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?" + color cyan "(^|[[:space:]])#.*$" +-color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'" ++#color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'" } From crazy at frugalware.org Tue Sep 5 23:22:40 2006 From: crazy at frugalware.org (crazy) Date: Tue Sep 5 23:22:42 2006 Subject: [Frugalware-darcs] frugalware-current: qt4-4.1.4-4-i686 Message-ID: <20060905212240.680564E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905211904-f6986-9bbe9505187f8a2708a96b140ac61dec4c6fc45d.gz; [qt4-4.1.4-4-i686 crazy **20060905211904 * up2date() fix ] { hunk ./source/kde-extra/qt4/FrugalBuild 17 -up2date="lynx -dump ftp://ftp.trolltech.com/qt/source/|grep 'qt-x11-opensource-src'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" +up2date="lynx -dump ftp://ftp.trolltech.com/qt/source/|grep 'qt-x11-opensource-src'|grep -v rc[1-9]|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" } From vmiklos at frugalware.org Tue Sep 5 23:27:21 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 23:27:23 2006 Subject: [Frugalware-darcs] frugalware-current: openssl-0.9.8-4-i686 Message-ID: <20060905212721.DE8D04E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905212456-e2957-245cefd5486e8f590d04fa4bc9c7670d678a4ed7.gz; [openssl-0.9.8-4-i686 VMiklos **20060905212456 bump to patchlevel 'c' workaround for smp build closes #1106 ] { hunk ./source/lib/openssl/FrugalBuild 1 -# Last Modified: Sun, 07 May 2006 13:12:00 +0200 +# Last Modified: Tue, 05 Sep 2006 23:21:33 +0200 hunk ./source/lib/openssl/FrugalBuild 8 -pkgextraver=b -pkgrel=3 +pkgextraver=c +pkgrel=4 hunk ./source/lib/openssl/FrugalBuild 21 - Fcd + unset MAKEFLAGS hunk ./source/lib/openssl/FrugalBuild 41 -sha1sums=('99565db630a044fa484d4f91006a31908f262246') +sha1sums=('d0798e5c7c4509d96224136198fa44f7f90e001d') } From vmiklos at frugalware.org Tue Sep 5 23:50:26 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Sep 5 23:50:28 2006 Subject: [Frugalware-darcs] setup: new package: madwifi-ng Message-ID: <20060905215026.76B944E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=setup;a=darcs_commitdiff;h=20060905215010-e2957-c77658dd082702f1bfdbe8d374f7975517a48aff.gz; [new package: madwifi-ng VMiklos **20060905215010] { hunk ./Makefile 55 - dropbear bastet readline acx100 shadow + dropbear bastet readline acx100 shadow madwifi-ng hunk ./Makefile 86 - shadow-$(SHADOWVER)-$(CARCH).fpm + shadow-$(SHADOWVER)-$(CARCH).fpm \ + madwifi-ng-$(MADWIFI-NGVER)-$(CARCH).fpm hunk ./Makefile 434 +madwifi-ng: + $(CLEANUP) + mkdir -p madwifi-ng/usr/bin + cd $(BDIR) && tar xf $(CDIR)/madwifi-ng-$(MADWIFI-NGVER)-$(CARCH).fpm; \ + cp -a lib ../madwifi-ng/; \ + cp -a usr/bin/wlanconfig ../madwifi-ng/usr/bin/ + hunk ./configure.py 15 - 'readline', 'acx100', 'shadow'] + 'readline', 'acx100', 'shadow', 'madwifi-ng'] } From vmiklos at frugalware.org Wed Sep 6 00:57:56 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 00:57:59 2006 Subject: [Frugalware-darcs] setup: new macro: $(UNPACK) Message-ID: <20060905225756.5901E4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=setup;a=darcs_commitdiff;h=20060905224913-e2957-31c26fb3cdd5e0d608fd200abdce5ba33ddbbd4e.gz; [new macro: $(UNPACK) VMiklos **20060905224913] { hunk ./Makefile 29 +UNPACK = cd $(BDIR) && tar xf $(CDIR)/$@-$($(shell echo $@|tr '[a-z]' '[A-Z]')VER)-$(CARCH).fpm hunk ./Makefile 46 -CDIR = /var/cache/pacman/pkg/ +CDIR = /var/cache/pacman/pkg hunk ./Makefile 142 - cd $(BDIR) && tar xf $(CDIR)/bash-$(BASHVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 148 - cd $(BDIR) && tar xf $(CDIR)/busybox-$(BUSYBOXVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 156 - cd $(BDIR) && tar xf $(CDIR)/dialog-$(DIALOGVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 162 - cd $(BDIR) && tar xf $(CDIR)/e2fsprogs-$(E2FSPROGSVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 171 - cd $(BDIR) && tar xf $(CDIR)/reiserfsprogs-$(REISERFSPROGSVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 179 - cd $(BDIR) && tar xf $(CDIR)/dhclient-$(DHCLIENTVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 185 - cd $(BDIR) && tar xf $(CDIR)/frugalware-$(FRUGALWAREVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 196 - cd $(BDIR) && tar xf $(CDIR)/glibc-$(GLIBCVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 210 - cd $(BDIR) && tar xf $(CDIR)/kbd-$(KBDVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 222 - cd $(BDIR) && tar xf $(CDIR)/kernel-$(KERNELV)-$(KERNELREL)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 232 - cd $(BDIR) && tar xf $(CDIR)/module-init-tools-$(MODULE-INIT-TOOLSVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 238 - cd $(BDIR) && tar xf $(CDIR)/ncurses-$(NCURSESVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 245 - cd $(BDIR) && tar xf $(CDIR)/pacman-$(PACMANVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 266 - cd $(BDIR) && tar xf $(CDIR)/udev-$(UDEVVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 274 - cd $(BDIR) && tar xf $(CDIR)/eject-$(EJECTVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 280 - cd $(BDIR) && tar xf $(CDIR)/util-linux-$(UTIL-LINUXVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 287 - cd $(BDIR) && tar xf $(CDIR)/netkit-base-$(NETKIT-BASEVER)-$(CARCH).fpm + $(UNPACK) hunk ./Makefile 293 - cd $(BDIR) && tar xf $(CDIR)/mdadm-$(MDADMVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 299 - cd $(BDIR) && tar xf $(CDIR)/xfsprogs-$(XFSPROGSVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 305 - cd $(BDIR) && tar xf $(CDIR)/ppp-$(PPPVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 311 - mkdir -p pppoe/usr/share - cd $(BDIR) && tar xf $(CDIR)/rp-pppoe-$(RP-PPPOEVER)-$(CARCH).fpm; \ - cp -a etc ../pppoe/; \ - cp -a usr/sbin ../pppoe/usr/; \ + mkdir -p rp-pppoe/usr/share + $(UNPACK); \ + cp -a etc ../rp-pppoe/; \ + cp -a usr/sbin ../rp-pppoe/usr/; \ hunk ./Makefile 319 - cd $(BDIR) && tar xf $(CDIR)/glib2-$(GLIB2VER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 325 - cd $(BDIR) && tar xf $(CDIR)/parted-$(PARTEDVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 333 - cd $(BDIR) && tar xf $(CDIR)/bzip2-$(BZIP2VER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 339 - cd $(BDIR) && tar xf $(CDIR)/libarchive-$(LIBARCHIVEVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 345 - cd $(BDIR) && tar xf $(CDIR)/zlib-$(ZLIBVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 351 - cd $(BDIR) && tar xf $(CDIR)/frugalwareutils-$(FRUGALWAREUTILSVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 358 - cd $(BDIR) && tar xf $(CDIR)/wireless_tools-$(WIRELESS_TOOLSVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 364 - cd $(BDIR) && tar xf $(CDIR)/dropbear-$(DROPBEARVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 371 - cd $(BDIR) && tar xf $(CDIR)/bastet-$(BASTETVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 378 - cd $(BDIR) && tar xf $(CDIR)/ipw2200-firmware-$(IPW2200-FIRMWAREVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 384 - cd $(BDIR) && tar xf $(CDIR)/acx100-$(ACX100VER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 390 - cd $(BDIR) && tar xf $(CDIR)/readline-$(READLINEVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 396 - cd $(BDIR) && tar xf $(CDIR)/shadow-$(SHADOWVER)-$(CARCH).fpm; \ + $(UNPACK); \ hunk ./Makefile 402 - cd $(BDIR) && tar xf $(CDIR)/madwifi-ng-$(MADWIFI-NGVER)-$(CARCH).fpm; \ + $(UNPACK); \ } From vmiklos at frugalware.org Wed Sep 6 00:57:56 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 00:58:01 2006 Subject: [Frugalware-darcs] setup: move packages() and sources() to config.mak Message-ID: <20060905225756.9D5964E8BD0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=setup;a=darcs_commitdiff;h=20060905222604-e2957-61526e3815dbc20d36731515b43e1bc5ae12f978.gz; [move packages() and sources() to config.mak VMiklos **20060905222604] { hunk ./Makefile 51 -packages = bash busybox dialog e2fsprogs reiserfsprogs dhclient frugalware \ - glibc kbd kernel module-init-tools ncurses pacman eject \ - udev util-linux netkit-base mdadm xfsprogs ppp pppoe glib2 parted \ - bzip2 libarchive zlib frugalwareutils wireless_tools ipw2200-firmware \ - dropbear bastet readline acx100 shadow madwifi-ng - hunk ./Makefile 52 -sources = bash-$(BASHVER)-$(CARCH).fpm busybox-$(BUSYBOXVER)-$(CARCH).fpm \ - dhclient-$(DHCLIENTVER)-$(CARCH).fpm dialog-$(DIALOGVER)-$(CARCH).fpm \ - e2fsprogs-$(E2FSPROGSVER)-$(CARCH).fpm eject-$(EJECTVER)-$(CARCH).fpm \ - frugalware-$(FRUGALWAREVER)-$(CARCH).fpm \ - glibc-$(GLIBCVER)-$(CARCH).fpm kbd-$(KBDVER)-$(CARCH).fpm \ - kernel-$(KERNELV)-$(KERNELREL)-$(CARCH).fpm \ - module-init-tools-$(MODULE-INIT-TOOLSVER)-$(CARCH).fpm \ - ncurses-$(NCURSESVER)-$(CARCH).fpm netkit-base-$(NETKIT-BASEVER)-$(CARCH).fpm \ - pacman-$(PACMANVER)-$(CARCH).fpm \ - reiserfsprogs-$(REISERFSPROGSVER)-$(CARCH).fpm udev-$(UDEVVER)-$(CARCH).fpm \ - util-linux-$(UTIL-LINUXVER)-$(CARCH).fpm \ - netkit-base-$(NETKIT-BASEVER)-$(CARCH).fpm \ - mdadm-$(MDADMVER)-$(CARCH).fpm \ - xfsprogs-$(XFSPROGSVER)-$(CARCH).fpm \ - ppp-$(PPPVER)-$(CARCH).fpm \ - rp-pppoe-$(RP-PPPOEVER)-$(CARCH).fpm \ - glib2-$(GLIB2VER)-$(CARCH).fpm \ - parted-$(PARTEDVER)-$(CARCH).fpm \ - bzip2-$(BZIP2VER)-$(CARCH).fpm \ - libarchive-$(LIBARCHIVEVER)-$(CARCH).fpm \ - zlib-$(ZLIBVER)-$(CARCH).fpm \ - frugalwareutils-$(FRUGALWAREUTILSVER)-$(CARCH).fpm \ - wireless_tools-$(WIRELESS_TOOLSVER)-$(CARCH).fpm \ - ipw2200-firmware-$(IPW2200-FIRMWAREVER)-$(CARCH).fpm \ - dropbear-$(DROPBEARVER)-$(CARCH).fpm \ - bastet-$(BASTETVER)-$(CARCH).fpm \ - readline-$(READLINEVER)-$(CARCH).fpm \ - acx100-$(ACX100VER)-$(CARCH).fpm \ - shadow-$(SHADOWVER)-$(CARCH).fpm \ - madwifi-ng-$(MADWIFI-NGVER)-$(CARCH).fpm hunk ./Makefile 133 - pacman -Sw `sed 's/VER =.*//' config.mak|tr '[A-Z]' '[a-z]'` --noconfirm + pacman -Sw `grep 'VER =' config.mak |sed 's/VER =.*//' |tr '[A-Z]' '[a-z]'` --noconfirm hunk ./Makefile 308 -pppoe: +rp-pppoe: hunk ./README 29 -2) add the package to the source and packages list hunk ./configure.py 59 +socket.write("\n") + +socket.write("packages = \\\n") +for k, v in localvers.items(): + socket.write("\t %s \\\n" % k) +socket.write("\t \n") + +socket.write("sources = \\\n") +for k, v in localvers.items(): + socket.write("\t %s-$(%sVER)-$(CARCH).fpm \\\n" % (k, k.upper())) +socket.write("\t \n") + } From vmiklos at frugalware.org Wed Sep 6 01:26:37 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 01:26:39 2006 Subject: [Frugalware-darcs] frugalware-current: java-gcj-compat-1.0.66-1-i686 Message-ID: <20060905232637.A17EB4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905232434-e2957-5ab68eb80c8a811f568783649506b74d8282ef36.gz; [java-gcj-compat-1.0.66-1-i686 VMiklos **20060905232434 version bump ] { hunk ./source/devel-extra/java-gcj-compat/FrugalBuild 1 -# Last Modified: Thu, 31 Aug 2006 11:33:09 +0200 +# Last Modified: Wed, 06 Sep 2006 01:19:16 +0200 hunk ./source/devel-extra/java-gcj-compat/FrugalBuild 6 -pkgver=1.0.65 +pkgver=1.0.66 hunk ./source/devel-extra/java-gcj-compat/FrugalBuild 31 -sha1sums=('340b2a7efb533f356b259f0d48054ebfadfd842d' \ +sha1sums=('bba94149f38e06751e9690acda544147b03e019c' \ } From crazy at frugalware.org Wed Sep 6 01:40:21 2006 From: crazy at frugalware.org (crazy) Date: Wed Sep 6 01:40:24 2006 Subject: [Frugalware-darcs] frugalware-current: libgnomedb-1.9.103-1-i686 Message-ID: <20060905234021.D80C94E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060905233642-f6986-c74a143b1142123f15eb14155148fff227c26050.gz; [libgnomedb-1.9.103-1-i686 crazy **20060905233642 * depends() fix ] { hunk ./source/gnome/libgnomedb/FrugalBuild 10 -depends=('libgnomeui' 'libgnomeprint' 'libgda>=1.9.100' 'gtksourceview' 'perl-mysql') +depends=('libgnomeui' 'libgnomeprint' 'libgda>=1.9.103' 'gtksourceview' 'perl-mysql') } From vmiklos at frugalware.org Wed Sep 6 02:33:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 02:33:44 2006 Subject: [Frugalware-darcs] pacman: db_search() -> alpm_db_search() Message-ID: <20060906003342.57A1C4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060906002734-e2957-97765ca20e00a741ff50dd2f28898e18e906e2a5.gz; [db_search() -> alpm_db_search() VMiklos **20060906002734] { hunk ./lib/libalpm/alpm.c 506 +} + +/** Searches a database + * @param db pointer to the package database to search in + * @return the list of packages on success, NULL on error + */ +PMList *alpm_db_search(pmdb_t *db) +{ + /* Sanity checks */ + ASSERT(handle != NULL, return(NULL)); + ASSERT(handle->needles != NULL, return(NULL)); + ASSERT(handle->needles->data != NULL, return(NULL)); + ASSERT(db != NULL, return(NULL)); + + return(_alpm_db_search(db, handle->needles)); hunk ./lib/libalpm/alpm.h 117 - PM_OPT_CHOMP + PM_OPT_CHOMP, + PM_OPT_NEEDLES hunk ./lib/libalpm/alpm.h 151 +PM_LIST *alpm_db_search(PM_DB *db); hunk ./lib/libalpm/alpm.h 465 - PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION + PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, + PM_ERR_INVALID_REGEX hunk ./lib/libalpm/db.c 49 +#include "handle.h" +#include "cache.h" hunk ./lib/libalpm/db.c 53 +extern pmhandle_t *handle; + hunk ./lib/libalpm/db.c 100 +PMList *_alpm_db_search(pmdb_t *db, PMList *needles) +{ + PMList *i, *j, *k, *ret = NULL; + + for(i = needles; i; i = i->next) { + char *targ; + int retval; + + if(i->data == NULL) { + continue; + } + targ = strdup(i->data); + + for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { + pmpkg_t *pkg = j->data; + char *haystack; + int match = 0; + + /* check name */ + haystack = strdup(pkg->name); + retval = _alpm_reg_match(haystack, targ); + if(retval < 0) { + /* bad regexp */ + FREE(haystack); + return(NULL); + } else if(retval) { + match = 1; + } + FREE(haystack); + + /* check description */ + if(!match) { + haystack = strdup(pkg->desc); + retval = _alpm_reg_match(haystack, targ); + if(retval < 0) { + /* bad regexp */ + FREE(haystack); + return(NULL); + } else if(retval) { + match = 1; + } + FREE(haystack); + } + + /* check provides */ + if(!match) { + for(k = pkg->provides; k; k = k->next) { + haystack = strdup(k->data); + retval = _alpm_reg_match(haystack, targ); + if(retval < 0) { + /* bad regexp */ + FREE(haystack); + return(NULL); + } else if(retval) { + match = 1; + } + FREE(haystack); + } + } + + if(match) { + ret = _alpm_list_add(ret, pkg); + } + } + + FREE(targ); + } + + return(ret); +} hunk ./lib/libalpm/db.h 52 +PMList *_alpm_db_search(pmdb_t *db, PMList *needles); hunk ./lib/libalpm/error.c 134 + case PM_ERR_INVALID_REGEX: + return _("valid regular expression"); hunk ./lib/libalpm/handle.c 126 + FREELIST(handle->needles); hunk ./lib/libalpm/handle.c 210 + case PM_OPT_NEEDLES: + if((char *)data && strlen((char *)data) != 0) { + handle->needles = _alpm_list_add(handle->needles, strdup((char *)data)); + _alpm_log(PM_LOG_FLOW2, _("'%s' added to PM_OPT_NEEDLES"), (char *)data); + } else { + FREELIST(handle->needles); + _alpm_log(PM_LOG_FLOW2, _("PM_OPT_NEEDLES flushed")); + } + break; hunk ./lib/libalpm/handle.c 339 + case PM_OPT_NEEDLES: *data = (long)handle->needles; break; hunk ./lib/libalpm/handle.h 59 + PMList *needles; /* for searching */ hunk ./lib/libalpm/util.c 57 +#include hunk ./lib/libalpm/util.c 621 + +/* match a string against a regular expression */ +int _alpm_reg_match(char *string, char *pattern) +{ + int result; + regex_t reg; + + if(regcomp(®, pattern, REG_EXTENDED | REG_NOSUB | REG_ICASE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, -1); + } + result = regexec(®, string, 0, 0, 0); + regfree(®); + return(!(result)); +} hunk ./lib/libalpm/util.h 74 +int _alpm_reg_match(char *string, char *pattern); hunk ./src/pacman/Makefile.am 12 -pacman_SOURCES = util.c log.c list.c package.c db.c download.c trans.c add.c \ +pacman_SOURCES = util.c log.c list.c package.c download.c trans.c add.c \ hunk ./src/pacman/db.c 1 -/* - * db.c - * - * Copyright (c) 2002-2006 by Judd Vinet - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ - -#if defined(__APPLE__) || defined(__OpenBSD__) -#include -#include -#endif - -#include "config.h" -#include -#include -#include -#include -#include -#include - -#include -/* pacman */ -#include "util.h" -#include "list.h" -#include "sync.h" -#include "db.h" - -list_t *db_search(PM_DB *db, list_t *needles) -{ - list_t *i, *ret = NULL; - - if(needles == NULL || needles->data == NULL) { - return(0); - } - - for(i = needles; i; i = i->next) { - PM_LIST *j; - char *targ; - int retval; - - if(i->data == NULL) { - continue; - } - targ = strdup(i->data); - - for(j = alpm_db_getpkgcache(db); j; j = alpm_list_next(j)) { - PM_PKG *pkg = alpm_list_getdata(j); - char *haystack; - char *pkgname, *pkgdesc, *pkggroup; - int match = 0; - - pkgname = alpm_pkg_getinfo(pkg, PM_PKG_NAME); - pkgdesc = alpm_pkg_getinfo(pkg, PM_PKG_DESC); - pkggroup = alpm_list_getdata(alpm_pkg_getinfo(pkg, PM_PKG_GROUPS)); - - /* check name */ - haystack = strdup(pkgname); - retval = reg_match(haystack, targ); - if(retval < 0) { - /* bad regexp */ - FREE(haystack); - return(NULL); - } else if(retval) { - match = 1; - } - FREE(haystack); - - /* check description */ - if(!match) { - haystack = strdup(pkgdesc); - retval = reg_match(haystack, targ); - if(retval < 0) { - /* bad regexp */ - FREE(haystack); - return(NULL); - } else if(retval) { - match = 1; - } - FREE(haystack); - } - - /* check provides */ - if(!match) { - PM_LIST *m; - - for(m = alpm_pkg_getinfo(pkg, PM_PKG_PROVIDES); m; m = alpm_list_next(m)) { - haystack = strdup(alpm_list_getdata(m)); - retval = reg_match(haystack, targ); - if(retval < 0) { - /* bad regexp */ - FREE(haystack); - return(NULL); - } else if(retval) { - match = 1; - } - FREE(haystack); - } - } - - if(match) { - ret = list_add(ret, pkg); - } - } - - FREE(targ); - } - - return(ret); -} - -/* vim: set ts=2 sw=2 noet: */ rmfile ./src/pacman/db.c hunk ./src/pacman/db.h 1 -/* - * db.h - * - * Copyright (c) 2002-2006 by Judd Vinet - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ -#ifndef _PM_DB_H -#define _PM_DB_H - -list_t *db_search(PM_DB *db, list_t *needles); - -#endif /* _PM_DB_H */ - -/* vim: set ts=2 sw=2 noet: */ rmfile ./src/pacman/db.h hunk ./src/pacman/query.c 33 -#include "db.h" hunk ./src/pacman/query.c 95 - list_t *targ, *ret; + list_t *targ; hunk ./src/pacman/query.c 97 - PM_LIST *j; + PM_LIST *j, *ret; hunk ./src/pacman/query.c 102 - ret = db_search(db_local, targets); + for(i = targets; i; i = i->next) { + alpm_set_option(PM_OPT_NEEDLES, (long)i->data); + } + ret = alpm_db_search(db_local); hunk ./src/pacman/query.c 109 - for(i = ret; i; i = i->next) { - PM_PKG *pkg = i->data; + for(j = ret; j; j = alpm_list_next(j)) { + PM_PKG *pkg = alpm_list_getdata(j); hunk ./src/pacman/query.c 119 - FREELISTPTR(ret); hunk ./src/pacman/sync.c 46 -#include "db.h" hunk ./src/pacman/sync.c 182 - list_t *i, *j, *ret; + list_t *i, *j; + PM_LIST *ret; hunk ./src/pacman/sync.c 188 - ret = db_search(sync->db, targets); + PM_LIST *lp; + for(j = targets; j; j = j->next) { + alpm_set_option(PM_OPT_NEEDLES, (long)j->data); + } + ret = alpm_db_search(sync->db); hunk ./src/pacman/sync.c 196 - for(j = ret; j; j = j->next) { - PM_PKG *pkg = j->data; + for(lp = ret; lp; lp = alpm_list_next(lp)) { + PM_PKG *pkg = alpm_list_getdata(lp); hunk ./src/pacman/sync.c 206 - FREELISTPTR(ret); hunk ./src/pacman/util.c 37 -#include hunk ./src/pacman/util.c 223 - -/* match a string against a regular expression */ -int reg_match(char *string, char *pattern) -{ - int result; - regex_t reg; - - if(regcomp(®, pattern, REG_EXTENDED | REG_NOSUB | REG_ICASE) != 0) { - ERR(NL, _("%s is not a valid regular expression.\n"), pattern); - return(-1); - } - result = regexec(®, string, 0, 0, 0); - regfree(®); - return(!(result)); -} } From vmiklos at frugalware.org Wed Sep 6 02:33:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 02:33:51 2006 Subject: [Frugalware-darcs] pacman: pacman/db_search(): remove printfs, preparing to move to libalpm Message-ID: <20060906003342.D271C4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060905235129-e2957-5703ee8f56b799f7ddd2285c03417f97843ff042.gz; [pacman/db_search(): remove printfs, preparing to move to libalpm VMiklos **20060905235129] { hunk ./src/pacman/db.c 42 -int db_search(PM_DB *db, const char *treename, list_t *needles) +list_t *db_search(PM_DB *db, list_t *needles) hunk ./src/pacman/db.c 44 - list_t *i; + list_t *i, *ret = NULL; hunk ./src/pacman/db.c 53 - int ret; + int retval; hunk ./src/pacman/db.c 72 - ret = reg_match(haystack, targ); - if(ret < 0) { + retval = reg_match(haystack, targ); + if(retval < 0) { hunk ./src/pacman/db.c 76 - return(1); - } else if(ret) { + return(NULL); + } else if(retval) { hunk ./src/pacman/db.c 85 - ret = reg_match(haystack, targ); - if(ret < 0) { + retval = reg_match(haystack, targ); + if(retval < 0) { hunk ./src/pacman/db.c 89 - return(1); - } else if(ret) { + return(NULL); + } else if(retval) { hunk ./src/pacman/db.c 102 - ret = reg_match(haystack, targ); - if(ret < 0) { + retval = reg_match(haystack, targ); + if(retval < 0) { hunk ./src/pacman/db.c 106 - return(1); - } else if(ret) { + return(NULL); + } else if(retval) { hunk ./src/pacman/db.c 115 - printf("%s/%s/%s %s\n ", treename, pkggroup, pkgname, (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION)); - indentprint(pkgdesc, 4); - printf("\n"); + ret = list_add(ret, pkg); hunk ./src/pacman/db.c 122 - return(0); + return(ret); hunk ./src/pacman/db.h 24 -int db_search(PM_DB *db, const char *treename, list_t *needles); +list_t *db_search(PM_DB *db, list_t *needles); hunk ./src/pacman/query.c 96 - list_t *targ; + list_t *targ, *ret; hunk ./src/pacman/query.c 103 - if(db_search(db_local, "local", targets)) { + ret = db_search(db_local, targets); + if(ret == NULL) { hunk ./src/pacman/query.c 107 + for(i = ret; i; i = i->next) { + PM_PKG *pkg = i->data; + + printf("local/%s/%s %s\n ", + (char*)alpm_list_getdata(alpm_pkg_getinfo(pkg, PM_PKG_GROUPS)), + (char *)alpm_pkg_getinfo(pkg, PM_PKG_NAME), + (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION)); + indentprint((char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), 4); + printf("\n"); + } + FREELISTPTR(ret); hunk ./src/pacman/sync.c 183 - list_t *i; + list_t *i, *j, *ret; hunk ./src/pacman/sync.c 188 - if(db_search(sync->db, sync->treename, targets)) { + ret = db_search(sync->db, targets); + if(ret == NULL) { hunk ./src/pacman/sync.c 192 + for(j = ret; j; j = j->next) { + PM_PKG *pkg = j->data; + + printf("%s/%s/%s %s\n ", (char *)alpm_db_getinfo(sync->db, PM_DB_TREENAME), + (char*)alpm_list_getdata(alpm_pkg_getinfo(pkg, PM_PKG_GROUPS)), + (char *)alpm_pkg_getinfo(pkg, PM_PKG_NAME), + (char *)alpm_pkg_getinfo(pkg, PM_PKG_VERSION)); + indentprint((char *)alpm_pkg_getinfo(pkg, PM_PKG_DESC), 4); + printf("\n"); + } + FREELISTPTR(ret); } From vmiklos at frugalware.org Wed Sep 6 02:51:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 02:51:34 2006 Subject: [Frugalware-darcs] pacman: alpm_parse_config(): handle the case when the callback function is NULL Message-ID: <20060906005132.5FBD34E8BD0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060906003752-e2957-a122d3fb210c73b1d911c175eb6f2ab9b8751857.gz; [alpm_parse_config(): handle the case when the callback function is NULL VMiklos **20060906003752] { hunk ./lib/libalpm/alpm.c 1270 - callback(section, db); + if(callback) { + callback(section, db); + } } From vmiklos at frugalware.org Wed Sep 6 02:51:31 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 02:51:36 2006 Subject: [Frugalware-darcs] pacman: _alpm_downloadfiles(): more sanity checks Message-ID: <20060906005132.209A44E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060906004750-e2957-6b960e8b2c72ec0b19d56d53e24570ccedd964f3.gz; [_alpm_downloadfiles(): more sanity checks VMiklos **20060906004750 check if pm_dlfnm, pm_dloffset, pm_dlt0, pm_dlt, pm_dlrate, pm_dlxfered1, pm_dleta_h, pm_dleta_m or pm_dleta_s is NULL ] { hunk ./lib/libalpm/server.c 298 - strncpy(pm_dlfnm, fn, 24); - /* drop filename extension */ - ptr = strstr(fn, PM_EXT_DB); - if(ptr && (ptr-fn) < 24) { - pm_dlfnm[ptr-fn] = '\0'; - } - ptr = strstr(fn, PM_EXT_PKG); - if(ptr && (ptr-fn) < 24) { - pm_dlfnm[ptr-fn] = '\0'; + if(pm_dlfnm) { + strncpy(pm_dlfnm, fn, 24); + /* drop filename extension */ + ptr = strstr(fn, PM_EXT_DB); + if(ptr && (ptr-fn) < 24) { + pm_dlfnm[ptr-fn] = '\0'; + } + ptr = strstr(fn, PM_EXT_PKG); + if(ptr && (ptr-fn) < 24) { + pm_dlfnm[ptr-fn] = '\0'; + } + for(j = strlen(pm_dlfnm); j < 24; j++) { + (pm_dlfnm)[j] = ' '; + } + pm_dlfnm[24] = '\0'; hunk ./lib/libalpm/server.c 314 - for(j = strlen(pm_dlfnm); j < 24; j++) { - (pm_dlfnm)[j] = ' '; + if(pm_dloffset) { + *pm_dloffset = 0; hunk ./lib/libalpm/server.c 317 - pm_dlfnm[24] = '\0'; - *pm_dloffset = 0; hunk ./lib/libalpm/server.c 319 - gettimeofday(pm_dlt0, NULL); - *pm_dlt = *pm_dlt0; - *pm_dlrate = 0; - *pm_dlxfered1 = 0; - *pm_dleta_h = 0; - *pm_dleta_m = 0; - *pm_dleta_s = 0; + if(pm_dlt0) { + gettimeofday(pm_dlt0, NULL); + } + if(pm_dlt) { + gettimeofday(pm_dlt, NULL); + } + if(pm_dlrate) { + *pm_dlrate = 0; + } + if(pm_dlxfered1) { + *pm_dlxfered1 = 0; + } + if(pm_dleta_h) { + *pm_dleta_h = 0; + } + if(pm_dleta_m) { + *pm_dleta_m = 0; + } + if(pm_dleta_s) { + *pm_dleta_s = 0; + } hunk ./lib/libalpm/server.c 367 - *pm_dloffset = (int)st.st_size; - if(!FtpRestart(*pm_dloffset, control)) { + if(pm_dloffset) { + *pm_dloffset = (int)st.st_size; + } + if(!FtpRestart((int)st.st_size, control)) { hunk ./lib/libalpm/server.c 419 - if(!stat(output, &st)) { + if(!stat(output, &st) && pm_dloffset) { hunk ./lib/libalpm/server.c 449 - if(!HttpGet(server->server, output, src, &fsz, control, *pm_dloffset, + if(!HttpGet(server->server, output, src, &fsz, control, (int)st.st_size, hunk ./lib/libalpm/server.c 488 - EVENT(handle->trans, PM_TRANS_EVT_RETRIEVE_LOCAL, pm_dlfnm, server->path); + EVENT(handle->trans, PM_TRANS_EVT_RETRIEVE_LOCAL, pm_dlfnm ? pm_dlfnm : "", server->path); hunk ./lib/libalpm/server.c 490 - pm_dlcb(control, fsz-*pm_dloffset, &fsz); + pm_dlcb(control, fsz-(int)st.st_size, &fsz); } From vmiklos at frugalware.org Wed Sep 6 02:51:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 02:51:38 2006 Subject: [Frugalware-darcs] pacman: _alpm_downloadfiles_forreal(): support for pm_dlcb being NULL Message-ID: <20060906005132.9D0494F0058@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060906003817-e2957-2566cab6ed686956bb3260a5f21f40c881e2fbb0.gz; [_alpm_downloadfiles_forreal(): support for pm_dlcb being NULL VMiklos **20060906003817] { hunk ./lib/libalpm/server.c 214 - FtpOptions(FTPLIB_CALLBACK, (long)pm_dlcb, control); + if(pm_dlcb) { + FtpOptions(FTPLIB_CALLBACK, (long)pm_dlcb, control); + } hunk ./lib/libalpm/server.c 390 - FtpOptions(FTPLIB_CALLBACK, (long)pm_dlcb, control); + if(pm_dlcb) { + FtpOptions(FTPLIB_CALLBACK, (long)pm_dlcb, control); + } hunk ./lib/libalpm/server.c 469 - } else { + } else if(pm_dlcb) { } From vmiklos at frugalware.org Wed Sep 6 04:14:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 04:14:43 2006 Subject: [Frugalware-darcs] pacman: bindings/perl: initial import Message-ID: <20060906021440.A3F9A4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20060906021409-e2957-3258cbd8e07bd8b1f6942ad7aeadc05302f79101.gz; [bindings/perl: initial import VMiklos **20060906021409] { move ./bindings/python/alpm.i ./bindings/alpm.i adddir ./bindings/perl addfile ./bindings/perl/Makefile.in hunk ./Makefile.am 2 +if HAS_PERL +SUBDIRS += bindings/perl +endif hunk ./bindings/alpm.i 1 +#if defined(SWIGPERL) +%module "Alpm::Core" +#else hunk ./bindings/alpm.i 5 +#endif hunk ./bindings/perl/Makefile.in 1 +top_srcdir = @top_srcdir@ +prefix = @prefix@ + +CFLAGS = @CFLAGS@ +CFLAGS += $(shell perl -MExtUtils::Embed -e ccopts) +CFLAGS += -I$(top_srcdir)/lib/libalpm +ifeq ($(shell arch),x86_64) +CFLAGS += -fPIC +endif +LDFLAGS += -L$(top_srcdir)/lib/libalpm -lalpm +LIBDIR += $(shell perl -V|grep site|sed 's/^ *//;s|/usr|$(prefix)|;q') + +all: Core.so + +Core.so: alpm_wrap.o + $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) + +alpm_wrap.o: alpm_wrap.c + $(CC) $(CFLAGS) -c -o $@ -include alpm.h $^ + +alpm_wrap.c: + cp $(top_srcdir)/lib/libalpm/alpm.h ./ + cp $(top_srcdir)/bindings/alpm.i ./ + swig -perl alpm.i + +install: install-so install-pm + +install-so: Core.so + mkdir -p $(DESTDIR)$(LIBDIR)/auto/Alpm/Core + install $^ $(DESTDIR)$(LIBDIR)/auto/Alpm/Core/ + +install-pm: Core.pm + mkdir -p $(DESTDIR)$(LIBDIR)/Alpm/ + install -m644 $^ $(DESTDIR)$(LIBDIR)/Alpm/ + +clean: + rm -f Core* alpm{.h,_wrap*} + +distclean: clean + rm -f Makefile + +check: hunk ./bindings/python/Makefile.in 21 -alpm_wrap.c: alpm.i +alpm_wrap.c: hunk ./bindings/python/Makefile.in 23 + cp $(top_srcdir)/bindings/alpm.i ./ hunk ./configure.ac 75 +dnl Help line for perl +AC_ARG_ENABLE(perl, + AC_HELP_STRING([--disable-perl], [Build Perl bindings]), + [wantperl=$enableval], [wantperl=yes]) + hunk ./configure.ac 230 +dnl Check for perl support +AC_MSG_CHECKING(if Perl bindings should be generated) +if test x$wantperl = xyes ; then + AC_CHECK_PROGS([SWIG], [swig] [swig binary]) + AM_CONDITIONAL(HAS_PERL, test $SWIG) + if test $SWIG ; then + AC_DEFINE([HAS_PERL], [TRUE], [Enabled Perl Support]) + AC_MSG_RESULT(yes) + PERLSTATUS="yes, path: `which $SWIG`" + else + AC_DEFINE([HAS_PERL], [FALSE], [Disabled Perl support]) + AC_MSG_RESULT(no, swig missing) + PERLSTATUS="swig binary not found" + fi +else + AM_CONDITIONAL(HAS_PERL, test $PERL) + AC_DEFINE([HAS_PERL], [FALSE], [Not specified at configure line]) + AC_MSG_RESULT(not requested by configure) + PERLSTATUS="no, disabled by configure" +fi + hunk ./configure.ac 315 +bindings/perl/Makefile hunk ./configure.ac 337 + Perl bindings : ${PERLSTATUS} } From crazy at frugalware.org Wed Sep 6 05:34:24 2006 From: crazy at frugalware.org (crazy) Date: Wed Sep 6 05:34:27 2006 Subject: [Frugalware-darcs] frugalware-current: amarok-1.4.3-1-i686 Message-ID: <20060906033424.6D54B4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906032938-f6986-6893a410042ff416bc4746e7987bcda7c5bcf3ae.gz; [amarok-1.4.3-1-i686 crazy **20060906032938 * version bump * killed xmms off from depends() * added mtp support * ( and NO I won't add this moodbar don't even ask ) ] { hunk ./source/kde-extra/amarok/FrugalBuild 1 -# Last Modified: Tue, 22 Aug 2006 20:46:53 +0200 +# Last Modified: Wed, 06 Sep 2006 05:19:55 +0200 hunk ./source/kde-extra/amarok/FrugalBuild 7 -pkgver=1.4.2 +pkgver=1.4.3 hunk ./source/kde-extra/amarok/FrugalBuild 12 - 'xmms' 'libgpod' 'ruby' 'python' 'libvisual-plugins') -## libmtp <-- broken + 'libgpod' 'ruby' 'python' 'libvisual-plugins' 'libmtp') hunk ./source/kde-extra/amarok/FrugalBuild 15 -up2date="$pkgver" +_F_kdeapps_id="9939" +Finclude kdeapps hunk ./source/kde-extra/amarok/FrugalBuild 19 -sha1sums=('b1ddd12e5ef2cee0b4e41063a18c4520733469e7') +sha1sums=('624b5f9fd74ead1c0e75f7d8f935abcaf0313e70') hunk ./source/kde-extra/amarok/FrugalBuild 28 - --with-libgpod + --with-libgpod --with-libmtp --without-xmms } From alex at alex-smith.me.uk Wed Sep 6 08:33:45 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 08:33:49 2006 Subject: [Frugalware-darcs] frugalware-current: orbit2-2.14.3-1-x86_64 Message-ID: <20060906063346.1CD8D4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906073215-46e39-65a24a76f80f8d10d082358e15efb51222efc591.gz; [orbit2-2.14.3-1-x86_64 AlexExtreme **20060906073215 * Version bump ] { hunk ./source/gnome/orbit2/FrugalBuild 1 -# Last modified: Tue, 25 Jul 2006 18:50:13 +0200 +# Last modified: Wed, 06 Sep 2006 08:26:56 +0100 hunk ./source/gnome/orbit2/FrugalBuild 7 -pkgver=2.14.2 +pkgver=2.14.3 hunk ./source/gnome/orbit2/FrugalBuild 20 +sha1sums=('c7afea971c1662396829fab12ad019f3b06f7f0c') + hunk ./source/gnome/orbit2/FrugalBuild 23 -sha1sums=('4e5b83b3852488a49d93eca44a3e4e9f8d5c4c50') + } From alex at alex-smith.me.uk Wed Sep 6 08:46:26 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 08:46:28 2006 Subject: [Frugalware-darcs] frugalware-current: libbonobo-2.16.0-1-x86_64 Message-ID: <20060906064626.D715B4E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906074452-46e39-0070c3fe7f5c7407b90b9304e36a98835b43760a.gz; [libbonobo-2.16.0-1-x86_64 AlexExtreme **20060906074452 * Version bump * Cleaned FB ] { hunk ./source/gnome/libbonobo/FrugalBuild 1 -# Last modified: Mon, 14 Aug 2006 18:13:57 +0200 +# Last modified: Wed, 06 Sep 2006 08:43:23 +0100 hunk ./source/gnome/libbonobo/FrugalBuild 6 -pkgver=2.15.3 +pkgver=2.16.0 hunk ./source/gnome/libbonobo/FrugalBuild 17 -options=('scriptlet') -sha1sums=('eed20ce87e66b9b685afd0d25889d64df2ee1dff' \ +sha1sums=('8cafcd9ef92f7b81e7cc1868814add3b6794af0a' \ hunk ./source/gnome/libbonobo/FrugalBuild 19 - - -build() { - Fbuild --enable-gtk-doc -} +Fconfopts="$Fconfopts --enable-gtk-doc" } From alex at alex-smith.me.uk Wed Sep 6 08:56:32 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 08:56:35 2006 Subject: [Frugalware-darcs] frugalware-current: pango-1.14.3-1-x86_64 Message-ID: <20060906065632.A07C24E88CB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906075333-46e39-93c3e0909968963194e33f507c8fc71c588531c0.gz; [pango-1.14.3-1-x86_64 AlexExtreme **20060906075333 * Version bump ] { hunk ./source/gnome/pango/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 07:34:36 +0100 +# Last modified: Wed, 06 Sep 2006 08:51:28 +0100 hunk ./source/gnome/pango/FrugalBuild 6 -pkgver=1.14.2 +pkgver=1.14.3 hunk ./source/gnome/pango/FrugalBuild 14 -options=('scriptlet') -nondevel=1 hunk ./source/gnome/pango/FrugalBuild 16 -sha1sums=('8880ad6369ca61552396599ae5168378107e4432') +sha1sums=('e56bf1761377c317f593d3530be1a3ac1bcc18c8') } From krics at linuxforum.hu Wed Sep 6 11:25:31 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 11:25:38 2006 Subject: [Frugalware-darcs] frugalware-current: gtk+2-2.10.3-1-x86_64 Message-ID: <20060906092531.43F7D4E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906092531-d209c-9c37cab5c6c3dcbf78b33ec10c22ba59cebef6e8.gz; [gtk+2-2.10.3-1-x86_64 Christian Hamar alias krix **20060906092531 * Version bump ] { hunk ./source/gnome/gtk+2/FrugalBuild 1 -# Last modified: Mon, 28 Aug 2006 10:21:58 +0100 +# Last modified: Wed, 06 Sep 2006 11:14:34 +0200 hunk ./source/gnome/gtk+2/FrugalBuild 7 -pkgver=2.10.2 -pkgrel=2 +pkgver=2.10.3 +pkgrel=1 hunk ./source/gnome/gtk+2/FrugalBuild 12 - 'pango>=1.13.2' 'cairo>=1.2.0' 'libxcursor' 'libxrandr' 'libsm' 'gnome-icon-theme') + 'pango>=1.13.2' 'cairo>=1.2.0' 'libxcursor' 'libxrandr' 'libsm' \ + 'gnome-icon-theme') hunk ./source/gnome/gtk+2/FrugalBuild 19 -sha1sums=('6da7bc4440dd4f8b56cee4b3d3a4b3b582784341') +sha1sums=('d9e9ca2728e560c46503a1e768cba3145510ca57') } From krics at linuxforum.hu Wed Sep 6 11:39:34 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 11:39:36 2006 Subject: [Frugalware-darcs] frugalware-current: gconf-2.14.0-4-x86_64 Message-ID: <20060906093934.457AC4E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906093903-d209c-0e94580943b499633c96e55b8a84dafb555f3581.gz; [gconf-2.14.0-4-x86_64 Christian Hamar alias krix **20060906093903 * Release bump * Recompiled with new gtk+2 * Removed source() (Finclude gnome can handle) ] { hunk ./source/gnome/gconf/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 08:02:14 +0100 +# Last modified: Wed, 06 Sep 2006 11:37:00 +0200 hunk ./source/gnome/gconf/FrugalBuild 8 -pkgrel=3 +pkgrel=4 hunk ./source/gnome/gconf/FrugalBuild 11 -depends=('orbit2' 'gtk+2' 'libxml2') +depends=('orbit2' 'gtk+2>=2.10.3' 'libxml2') hunk ./source/gnome/gconf/FrugalBuild 16 -source=(http://ftp.gnome.org/pub/gnome/sources/GConf/$preup2date/GConf-$pkgver.tar.bz2 \ - GConf2-2.8.1-reload.patch0) +source=(${source[@]} GConf2-2.8.1-reload.patch0) } From krics at linuxforum.hu Wed Sep 6 11:57:07 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 11:57:11 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-vfs-2.16.0-1-x86_64 Message-ID: <20060906095707.ADD244E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906095716-d209c-833542435302b8c6a450e9a7a36f8f2534be759f.gz; [gnome-vfs-2.16.0-1-x86_64 Christian Hamar alias krix **20060906095716 * Version bump ] { hunk ./source/gnome/gnome-vfs/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 09:46:02 +0100 +# Last modified: Wed, 06 Sep 2006 11:55:56 +0200 hunk ./source/gnome/gnome-vfs/FrugalBuild 7 -pkgver=2.15.92 +pkgver=2.16.0 hunk ./source/gnome/gnome-vfs/FrugalBuild 11 -depends=('gconf' 'bzip2' 'hal>=0.5.7.1-2' 'gnome-mime-data' 'gamin' \ +depends=('gconf>=2.14.0-4' 'bzip2' 'hal>=0.5.7.1-2' 'gnome-mime-data' 'gamin' \ hunk ./source/gnome/gnome-vfs/FrugalBuild 28 -sha1sums=('8b31f0c2f1730457fcc6e2770367c00fbbf1c47a' \ +sha1sums=('4f0f6e7288c5cd2bc667f11729596e8be92376a0' \ hunk ./source/gnome/gnome-vfs/FrugalBuild 40 - --with-hal-mount=/usr/bin/pmount-hal --with-hal-umount=/usr/bin/pumount --enable-hal --enable-avahi --enable-ipv6 + --with-hal-mount=/usr/bin/pmount-hal \ + --with-hal-umount=/usr/bin/pumount \ + --enable-hal --enable-avahi --enable-ipv6 } From krics at linuxforum.hu Wed Sep 6 12:05:18 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 12:05:37 2006 Subject: [Frugalware-darcs] frugalware-current: added gtk+2-engines before libgnome Message-ID: <20060906100520.0EC554E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906100455-d209c-3c0878eaace362ce831ae0fc985476243f8a183c.gz; [added gtk+2-engines before libgnome Christian Hamar alias krix **20060906100455 * Added gtk+2-engines into gnome-bump-howto before libgnome ] { hunk ./docs/tech/gnome-bump-howto.txt 32 +- gtk+2-engines } From krics at linuxforum.hu Wed Sep 6 12:07:43 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 12:07:44 2006 Subject: [Frugalware-darcs] frugalware-current: gtk+2-engines-2.8.0-1-x86_64 Message-ID: <20060906100743.199124E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906100811-d209c-48198fd001d199735f3d92fdaae8a0157f46888a.gz; [gtk+2-engines-2.8.0-1-x86_64 Christian Hamar alias krix **20060906100811 * Version bump ] { hunk ./source/gnome/gtk+2-engines/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 10:14:26 +0100 +# Last modified: Wed, 06 Sep 2006 12:06:32 +0200 hunk ./source/gnome/gtk+2-engines/FrugalBuild 7 -pkgver=2.7.8 +pkgver=2.8.0 hunk ./source/gnome/gtk+2-engines/FrugalBuild 11 -depends=('gtk+2>=2.10.0') +depends=('gtk+2>=2.10.3') hunk ./source/gnome/gtk+2-engines/FrugalBuild 20 -sha1sums=('ef2f0ded8e052cbe9a731767216f2c44760e5ff3') +sha1sums=('67a735f3b1830af9554a712670e2a5902043f5a5') } From krics at linuxforum.hu Wed Sep 6 12:17:27 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 12:17:34 2006 Subject: [Frugalware-darcs] frugalware-current: libgnome-2.16.0-1-x86_64 Message-ID: <20060906101727.BF87D4E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906101746-d209c-5c887537c3993be129b1ff4d484beb1c1d6f2202.gz; [libgnome-2.16.0-1-x86_64 Christian Hamar alias krix **20060906101746 * Version bump ] { hunk ./source/gnome/libgnome/FrugalBuild 1 -# Last modified: Fri, 18 Aug 2006 14:52:20 +0100 +# Last modified: Wed, 06 Sep 2006 12:15:39 +0200 hunk ./source/gnome/libgnome/FrugalBuild 6 -pkgver=2.15.2 -pkgrel=2 +pkgver=2.16.0 +pkgrel=1 hunk ./source/gnome/libgnome/FrugalBuild 10 -depends=('esd' 'gnome-vfs' 'gtk+2-engines' 'libbonobo' 'gnome-frugalware>=0.5') +depends=('esd' 'gnome-vfs>=2.16.0' 'gtk+2-engines>=2.8.0' 'libbonobo' 'gnome-frugalware>=0.5') hunk ./source/gnome/libgnome/FrugalBuild 34 -sha1sums=('ea39484b83959e54324d12eda1d5214d0219c197' \ +sha1sums=('d37ea79c703a43f6c1284c713ef1f3272b9fda33' \ } From krics at linuxforum.hu Wed Sep 6 12:22:54 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 12:23:00 2006 Subject: [Frugalware-darcs] frugalware-current: libglade-2.6.0-3-x86_64 Message-ID: <20060906102254.CDC524E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906102321-d209c-de66ef25b5c1a7382fc9dfcee9eec738fed34baa.gz; [libglade-2.6.0-3-x86_64 Christian Hamar alias krix **20060906102321 * Release bump * Recompield with new gtk * Migrated to Fconfopts ] { hunk ./source/gnome/libglade/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 10:29:54 +0100 +# Last modified: Wed, 06 Sep 2006 12:22:34 +0200 hunk ./source/gnome/libglade/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/gnome/libglade/FrugalBuild 10 -depends=('gtk+2' 'libxml2' 'python') +depends=('gtk+2>=2.10.3' 'libxml2' 'python') hunk ./source/gnome/libglade/FrugalBuild 16 - -build () { - Fbuild --enable-gtk-doc || return 1 -} - +Fconfopts="$Fconfopts --enable-gtk-doc" } From krics at linuxforum.hu Wed Sep 6 12:30:06 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 12:30:15 2006 Subject: [Frugalware-darcs] frugalware-current: libgnomecanvas-2.14.0-3-x86_64 Message-ID: <20060906103007.734334E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906103022-d209c-8da626b9d1d3d63354d0a16103a90901dc040135.gz; [libgnomecanvas-2.14.0-3-x86_64 Christian Hamar alias krix **20060906103022 * Release bump * Recompiled with new things :P * Migrated to Fconfopts ] { hunk ./source/gnome/libgnomecanvas/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 10:40:19 +0100 +# Last modified: Wed, 06 Sep 2006 12:29:12 +0200 hunk ./source/gnome/libgnomecanvas/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/gnome/libgnomecanvas/FrugalBuild 10 -depends=('libglade' 'libart_lgpl') +depends=('libglade>=2.6.0-3' 'libart_lgpl') hunk ./source/gnome/libgnomecanvas/FrugalBuild 16 - -build() { - Fbuild --enable-gtk-doc -} - +Fconfopts="$Fconfopts --enable-gtk-doc" } From crazy at frugalware.org Wed Sep 6 12:37:30 2006 From: crazy at frugalware.org (crazy) Date: Wed Sep 6 12:37:32 2006 Subject: [Frugalware-darcs] frugalware-current: koffice-1.5.2-2-i686 Message-ID: <20060906103730.493924E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906103323-f6986-76064c9316613c951cb16a9376ebc6de03ff9d3a.gz; [koffice-1.5.2-2-i686 crazy **20060906103323 * relbump * just recompiled ] { hunk ./source/kde-extra/koffice/FrugalBuild 1 -# Last Modified: Fri, 14 Jul 2006 12:48:31 +0200 -# Compiling Time: 61.41 SBU +# Last Modified: Wed, 06 Sep 2006 07:55:35 +0200 +# Compiling Time: 28.87 SBU hunk ./source/kde-extra/koffice/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/kde-extra/koffice/FrugalBuild 11 -depends=('libkexif' 'pkgconfig' 'kdebase>=3.5.2-1' 'libpqxx' 'wv2' 'libmysqlclient' 'libwpd' 'python' 'ruby>=1.8.4-2' 'imagemagick') +depends=('libkexif' 'pkgconfig' 'kdebase>=3.5.4' 'libpqxx' 'wv2' 'libmysqlclient' 'libwpd' 'python' 'ruby>=1.8.4-2' 'imagemagick') } From krics at linuxforum.hu Wed Sep 6 12:41:20 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 12:41:22 2006 Subject: [Frugalware-darcs] frugalware-current: libbonoboui-2.16.0-1-x86_64 Message-ID: <20060906104120.33FF74E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906104153-d209c-cf527fbab6da81a4ba276ffffd02acaa91022576.gz; [libbonoboui-2.16.0-1-x86_64 Christian Hamar alias krix **20060906104153 * Version bump ] { hunk ./source/gnome/libbonoboui/FrugalBuild 1 -# Last modified: Sat, 02 Sep 2006 16:31:23 +0200 +# Last modified: Wed, 06 Sep 2006 12:40:00 +0200 hunk ./source/gnome/libbonoboui/FrugalBuild 6 -pkgver=2.15.1 +pkgver=2.16.0 hunk ./source/gnome/libbonoboui/FrugalBuild 10 -depends=('libgnomecanvas' 'libgnome') +depends=('libgnomecanvas>=2.14.0-3' 'libgnome>=2.16.0') hunk ./source/gnome/libbonoboui/FrugalBuild 16 -sha1sums=('95379c906dc09a40e48ff159dacac5f4f1fd0ceb') +sha1sums=('d95fe213beb9a80caddbed6644d7f1306e92c06a') } From vmiklos at frugalware.org Wed Sep 6 12:41:36 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 6 12:41:38 2006 Subject: [Frugalware-darcs] frugalware-current: mysql-python-1.2.1_p2-3-i686 Message-ID: <20060906104136.3B6B74E8C0F@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906103906-e2957-f02dd015ea8e03d7fb9f6e955e6c226ceeb93603.gz; [mysql-python-1.2.1_p2-3-i686 VMiklos **20060906103906 rebuilt with mysql-5.0.24-3 ] { hunk ./source/devel-extra/mysql-python/FrugalBuild 1 -# Last Modified: Mon, 21 Aug 2006 16:53:07 +0200 +# Last Modified: Wed, 06 Sep 2006 12:38:49 +0200 hunk ./source/devel-extra/mysql-python/FrugalBuild 7 -pkgrel=2 +pkgrel=3 } From krics at linuxforum.hu Wed Sep 6 12:49:52 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 12:49:54 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-icon-theme-2.16.0.1-1-x86_64 Message-ID: <20060906104952.36FF44E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906104944-d209c-11758eb3560049bdba9a545f27f3e7934b0a5862.gz; [gnome-icon-theme-2.16.0.1-1-x86_64 Christian Hamar alias krix **20060906104944 * Version bump ] { hunk ./source/gnome/gnome-icon-theme/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 11:30:34 +0100 +# Last modified: Wed, 06 Sep 2006 12:48:04 +0200 hunk ./source/gnome/gnome-icon-theme/FrugalBuild 6 -pkgver=2.15.92 +pkgver=2.16.0.1 hunk ./source/gnome/gnome-icon-theme/FrugalBuild 15 -sha1sums=('3b60d8f650a50c47e6769619758a24ee5efa7284') +sha1sums=('9dd05f891c8f91cff08d77a704d7e2a9352f792c') } From krics at linuxforum.hu Wed Sep 6 13:04:14 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 13:04:16 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-keyring-0.6.0-1-x86_64 Message-ID: <20060906110414.47C5A4E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906110419-d209c-f38fba512e2ec1d64af6bb2fde1793c71b1c1946.gz; [gnome-keyring-0.6.0-1-x86_64 Christian Hamar alias krix **20060906110419 * Version bump * Enabled gtk-doc generation ] { hunk ./source/gnome/gnome-keyring/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 11:47:38 +0100 +# Last modified: Wed, 06 Sep 2006 13:03:29 +0200 hunk ./source/gnome/gnome-keyring/FrugalBuild 6 -pkgver=0.5.2 +pkgver=0.6.0 hunk ./source/gnome/gnome-keyring/FrugalBuild 10 -depends=('gtk+2') -makedepends=('intltool') +depends=('gtk+2>=2.10.3') +makedepends=('intltool' 'gtk-doc') hunk ./source/gnome/gnome-keyring/FrugalBuild 15 -sha1sums=('11affc68791a09b73e8b9f0aac0fad3af9ddcf16') +sha1sums=('53c5df57c068f3904a296e37ca743666eb42c7bb') +Fconfopts="$Fconfopts --enable-gtk-doc" } From krics at linuxforum.hu Wed Sep 6 13:17:08 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 13:17:22 2006 Subject: [Frugalware-darcs] frugalware-current: libgnomeui-2.16.0-1-x86_64 Message-ID: <20060906111709.06E874E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906111652-d209c-5c3ca9eaf8f72f538b8b414934c250ab909948ad.gz; [libgnomeui-2.16.0-1-x86_64 Christian Hamar alias krix **20060906111652 * Version bump * Removed desktop-item-edit patch (in upstream) ] { hunk ./source/gnome/libgnomeui/FrugalBuild 1 -# Last modified: Sat, 12 Aug 2006 18:03:11 +0100 +# Last modified: Wed, 06 Sep 2006 13:15:02 +0200 hunk ./source/gnome/libgnomeui/FrugalBuild 6 -pkgver=2.15.91 -pkgrel=2 +pkgver=2.16.0 +pkgrel=1 hunk ./source/gnome/libgnomeui/FrugalBuild 10 -depends=('libbonoboui' 'gnome-keyring' 'gtk+2>=2.10.0' 'libbonobo') +depends=('libbonoboui>=2.16.0' 'gnome-keyring>=0.6.0' 'gtk+2>=2.10.3' 'libbonobo') hunk ./source/gnome/libgnomeui/FrugalBuild 15 -options=('scriptlet') -source=(${source[@]} fix-crash-in-gnome-desktop-item-edit.patch0) -sha1sums=('2211373dca71e5ea92690d4761e351cfe323bdf6' \ - 'ebe6d3e254b96ee30d8d9373f8bc993f42cd2647') +sha1sums=('514fa6500473c6fc34520e854c50aee7d93ae7dd') hunk ./source/gnome/libgnomeui/fix-crash-in-gnome-desktop-item-edit.patch0 1 -Index: gnome-icon-entry.c -=================================================================== -RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-icon-entry.c,v -retrieving revision 1.108 -diff -u -p -r1.108 libgnomeui/gnome-icon-entry.c ---- libgnomeui/gnome-icon-entry.c 27 May 2006 22:03:29 -0000 1.108 -+++ libgnomeui/gnome-icon-entry.c 8 Aug 2006 13:56:55 -0000 -@@ -375,6 +375,7 @@ static void - entry_activated(GtkWidget *widget, GnomeIconEntry *ientry) - { - GnomeIconEntryPrivate *priv; -+ GnomeIconSelection *sel; - struct stat buf; - const gchar *filename; - -@@ -383,18 +384,21 @@ entry_activated(GtkWidget *widget, Gnome - g_return_if_fail (ientry != NULL); - g_return_if_fail (GNOME_IS_ICON_ENTRY (ientry)); - -- priv = ientry->_priv; -- - filename = gtk_entry_get_text (GTK_ENTRY (widget)); - - if (!filename) - return; - -+ priv = ientry->_priv; -+ - g_stat (filename, &buf); - if (S_ISDIR (buf.st_mode)) { -- gnome_icon_selection_clear (GNOME_ICON_SELECTION (priv->icon_sel), TRUE); -- gnome_icon_selection_add_directory (GNOME_ICON_SELECTION (priv->icon_sel), filename); -- gnome_icon_selection_show_icons (GNOME_ICON_SELECTION (priv->icon_sel)); -+ sel = GNOME_ICON_SELECTION (priv->icon_sel); -+ if (sel) { -+ gnome_icon_selection_clear (sel, TRUE); -+ gnome_icon_selection_add_directory (sel, filename); -+ gnome_icon_selection_show_icons (sel); -+ } - } else { - /* We pretend like ok has been called */ - g_free (priv->picked_file); -@@ -405,6 +409,7 @@ entry_activated(GtkWidget *widget, Gnome - } - } - -+#if 0 - static void - setup_preview(GtkWidget *widget) - { -@@ -461,6 +466,7 @@ setup_preview(GtkWidget *widget) - gtk_widget_show(pp); - gtk_container_add(GTK_CONTAINER(frame),pp); - } -+#endif - - static void - ientry_destroy (GtkObject *object) -@@ -523,10 +529,12 @@ entry_changed(GtkEntry *entry) - static void - browse_clicked(GnomeFileEntry *fentry, GnomeIconEntry *ientry) - { -- GtkWidget *w; - GtkFileChooser *fc; -+#if 0 -+ GtkWidget *w; - GClosure *closure; - gchar *path; -+#endif - - g_return_if_fail (fentry != NULL); - g_return_if_fail (GNOME_IS_FILE_ENTRY (fentry)); rmfile ./source/gnome/libgnomeui/fix-crash-in-gnome-desktop-item-edit.patch0 } From krics at linuxforum.hu Wed Sep 6 13:28:28 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 13:28:29 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-themes-2.16.0-1-x86_64 Message-ID: <20060906112828.863694E8C2B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906112751-d209c-f36445fb0fddace802f0b7438657301ac9f17027.gz; [gnome-themes-2.16.0-1-x86_64 Christian Hamar alias krix **20060906112751 * Version bump ] { hunk ./source/gnome/gnome-themes/FrugalBuild 1 -# Last modified: Mon, 21 Aug 2006 17:37:58 +0100 +# Last modified: Wed, 06 Sep 2006 13:26:13 +0200 hunk ./source/gnome/gnome-themes/FrugalBuild 6 -pkgver=2.15.92 +pkgver=2.16.0 hunk ./source/gnome/gnome-themes/FrugalBuild 10 -depends=('gtk+2-engines>=2.7.6') +depends=('gtk+2-engines>=2.8.0') hunk ./source/gnome/gnome-themes/FrugalBuild 18 -sha1sums=('6f3773a0e3a7477c6ae29f9fe93d0ad1bcb28e97' \ +sha1sums=('e6bd8289f8bc9940ef2a902ac5795d0eb1ef4d25' \ } From krics at linuxforum.hu Wed Sep 6 13:34:48 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 13:34:53 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-doc-utils-0.8.0-1-x86_64 Message-ID: <20060906113448.1923C4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906113517-d209c-e91ca5ddb5bbe82ce3b06d9b14aae3ec2f7fad08.gz; [gnome-doc-utils-0.8.0-1-x86_64 Christian Hamar alias krix **20060906113517 * Version bump ] { hunk ./source/gnome/gnome-doc-utils/FrugalBuild 1 -# Last modified: Mon, 14 Aug 2006 17:07:57 +0200 +# Last modified: Wed, 06 Sep 2006 13:34:29 +0200 hunk ./source/gnome/gnome-doc-utils/FrugalBuild 6 -pkgver=0.7.2 +pkgver=0.8.0 hunk ./source/gnome/gnome-doc-utils/FrugalBuild 16 -sha1sums=('48c21054f68e145d082d8d21840d651edbb76530') +sha1sums=('d134ae18e4fd3a4de3aa6879a67fb93e23e860db') } From krics at linuxforum.hu Wed Sep 6 14:14:16 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 14:14:23 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-desktop-2.16.0-1-x86_64 Message-ID: <20060906121416.EADD24E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906121447-d209c-b30a927a96a74dadfce533dd8c5178eb4f14053f.gz; [gnome-desktop-2.16.0-1-x86_64 Christian Hamar alias krix **20060906121447 * Version bump ] { hunk ./source/gnome/gnome-desktop/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 13:02:14 +0100 +# Last modified: Wed, 06 Sep 2006 13:40:58 +0200 hunk ./source/gnome/gnome-desktop/FrugalBuild 6 -pkgver=2.15.92 +pkgver=2.16.0 hunk ./source/gnome/gnome-desktop/FrugalBuild 10 -depends=('libgnomeui>=2.15.90' 'startup-notification' 'scrollkeeper' 'libbonobo') +depends=('libgnomeui>=2.16.0' 'startup-notification' 'scrollkeeper' 'libbonobo') hunk ./source/gnome/gnome-desktop/FrugalBuild 16 -sha1sums=('ed880059a98a22a98380c02b5707d3eb808e226f') +sha1sums=('af2517fb2bd83a78213ea4e960e6a016d1832a5c') } From krics at linuxforum.hu Wed Sep 6 14:23:54 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 14:24:01 2006 Subject: [Frugalware-darcs] frugalware-current: libwnck-2.16.0-1-x86_64 Message-ID: <20060906122354.6789F4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906122308-d209c-8a3a24a8f3403253d8f843c868ee2128a9f0fc26.gz; [libwnck-2.16.0-1-x86_64 Christian Hamar alias krix **20060906122308 * Version bump ] { hunk ./source/gnome/libwnck/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 13:15:25 +0100 +# Last modified: Wed, 06 Sep 2006 14:21:25 +0200 hunk ./source/gnome/libwnck/FrugalBuild 6 -pkgver=2.15.92 +pkgver=2.16.0 hunk ./source/gnome/libwnck/FrugalBuild 10 -depends=('gtk+2>=2.10.2' 'libsm' 'libxres' 'startup-notification') +depends=('gtk+2>=2.10.3' 'libsm' 'libxres' 'startup-notification') hunk ./source/gnome/libwnck/FrugalBuild 15 -sha1sums=('92da80ae9c4cd9c7ed3dbe0ca6631f2f717ac1cf') +sha1sums=('ed8b4debe6c29090bd4b1a3b5f647f24ed9f5268') } From krics at linuxforum.hu Wed Sep 6 14:53:24 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 14:53:31 2006 Subject: [Frugalware-darcs] frugalware-current: evolution-data-server-1.8.0-1-x86_64 Message-ID: <20060906125325.1B8724E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906125329-d209c-7a1731234b4c892465bde8e8e668e2a1011b665b.gz; [evolution-data-server-1.8.0-1-x86_64 Christian Hamar alias krix **20060906125329 * Version bump * Added two patch form Fedora (seems 1.8.0 still not include these patches) ] { hunk ./source/gnome/evolution-data-server/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 14:05:08 +0100 +# Last modified: Wed, 06 Sep 2006 14:50:41 +0200 hunk ./source/gnome/evolution-data-server/FrugalBuild 6 -pkgver=1.7.92 +pkgver=1.8.0 hunk ./source/gnome/evolution-data-server/FrugalBuild 10 -depends=('nss' 'libsoup>=2.2.96-2' 'libgnomeui>=2.15.90' 'heimdal' 'gnome-keyring>=0.5.2') +depends=('nss' 'libsoup>=2.2.96-2' 'libgnomeui>=2.16.0' 'heimdal' 'gnome-keyring>=0.6.0') hunk ./source/gnome/evolution-data-server/FrugalBuild 15 -sha1sums=('05515949bcaf590c0957a1a305c35d61eaac13eb') +source=(${source[@]} evolution-data-server-1.7.92-chain-finalize.patch \ + evolution-data-server-1.7.92-fix-fd-leak.patch) +sha1sums=('8a0eb60580f95b78f80f3e868c6086295947ff86' \ + 'd3076af326db09ddf6dd298bf954c2026faa65f4' \ + 'f6381d78b52e586ee2b3027694d44cc80b8643b8') addfile ./source/gnome/evolution-data-server/evolution-data-server-1.7.92-chain-finalize.patch hunk ./source/gnome/evolution-data-server/evolution-data-server-1.7.92-chain-finalize.patch 1 +--- evolution-data-server-1.7.92/src/server-logging.c.chain-finalize 2006-08-29 16:30:38.000000000 -0400 ++++ evolution-data-server-1.7.92/src/server-logging.c 2006-08-29 16:31:31.000000000 -0400 +@@ -58,6 +58,8 @@ + } + g_slist_free (priv->handlers); + priv->handlers = NULL; ++ ++ G_OBJECT_CLASS (parent_class)->dispose (object); + } + + static void +@@ -66,6 +68,8 @@ + ServerLogging *logging = SERVER_LOGGING (object); + + g_free (logging->priv); ++ ++ G_OBJECT_CLASS (parent_class)->finalize (object); + } + + static void addfile ./source/gnome/evolution-data-server/evolution-data-server-1.7.92-fix-fd-leak.patch hunk ./source/gnome/evolution-data-server/evolution-data-server-1.7.92-fix-fd-leak.patch 1 +--- evolution-data-server-1.7.92/camel/camel-filter-driver.c.fix-fd-leak 2006-08-29 17:17:18.000000000 -0400 ++++ evolution-data-server-1.7.92/camel/camel-filter-driver.c 2006-08-29 17:17:34.000000000 -0400 +@@ -715,6 +715,7 @@ + GPtrArray *args; + child_watch_data_t child_watch_data; + GSource *source; ++ GMainContext *context; + + if (argc < 1 || argv[0]->value.string[0] == '\0') + return 0; +@@ -802,7 +803,9 @@ + camel_object_unref (parser); + + wait: +- child_watch_data.loop = g_main_loop_new (g_main_context_new (), FALSE); ++ context = g_main_context_new (); ++ child_watch_data.loop = g_main_loop_new (context, FALSE); ++ g_main_context_unref (context); + + source = g_child_watch_source_new (child_pid); + g_source_set_callback (source, (GSourceFunc) child_watch, &child_watch_data, NULL); +--- evolution-data-server-1.7.92/camel/camel-filter-search.c.fix-fd-leak 2006-08-29 17:17:04.000000000 -0400 ++++ evolution-data-server-1.7.92/camel/camel-filter-search.c 2006-08-29 17:17:34.000000000 -0400 +@@ -533,7 +533,6 @@ + g_spawn_close_pid (pid); + + child_watch_data->child_status = status; +- + g_main_loop_quit (child_watch_data->loop); + } + +@@ -549,6 +548,7 @@ + GPtrArray *args; + child_watch_data_t child_watch_data; + GSource *source; ++ GMainContext *context; + + if (argc < 1 || argv[0]->value.string[0] == '\0') + return 0; +@@ -590,7 +590,9 @@ + camel_stream_flush (stream); + camel_object_unref (stream); + +- child_watch_data.loop = g_main_loop_new (g_main_context_new (), FALSE); ++ context = g_main_context_new (); ++ child_watch_data.loop = g_main_loop_new (context, FALSE); ++ g_main_context_unref (context); + + source = g_child_watch_source_new (child_pid); + g_source_set_callback (source, (GSourceFunc) child_watch, &child_watch_data, NULL); } From krics at linuxforum.hu Wed Sep 6 14:55:08 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 14:55:10 2006 Subject: [Frugalware-darcs] frugalware-current: pygobject-2.12.1-1-x86_64 Message-ID: <20060906125508.EA20A4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906125529-d209c-36f117d39a3471070716fe88bc859271c7df1650.gz; [pygobject-2.12.1-1-x86_64 Christian Hamar alias krix **20060906125529 * Version bump ] { hunk ./source/gnome/pygobject/FrugalBuild 1 -# Last modified: Tue, 29 Aug 2006 19:20:59 +0200 +# Last modified: Wed, 06 Sep 2006 14:54:52 +0200 hunk ./source/gnome/pygobject/FrugalBuild 6 -pkgver=2.11.4 +pkgver=2.12.1 hunk ./source/gnome/pygobject/FrugalBuild 14 -sha1sums=('3990c95d165e538d34c86af51eb9926c3bb41b6d') +sha1sums=('763bda5a67faeeec45ee90b37c2aadf24b026f1c') } From krics at linuxforum.hu Wed Sep 6 15:01:39 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 15:01:47 2006 Subject: [Frugalware-darcs] frugalware-current: pygtk-2.10.1-1-x86_64 Message-ID: <20060906130139.C58D14E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906130142-d209c-7551fb4b55dc56cfc27d293e76cccaa55c99e93b.gz; [pygtk-2.10.1-1-x86_64 Christian Hamar alias krix **20060906130142 * Version bump ] { hunk ./source/gnome/pygtk/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 14:28:41 +0100 +# Last modified: Wed, 06 Sep 2006 15:00:13 +0200 hunk ./source/gnome/pygtk/FrugalBuild 6 -pkgver=2.9.6 -pkgrel=3 +pkgver=2.10.1 +pkgrel=1 hunk ./source/gnome/pygtk/FrugalBuild 10 -depends=('libglade' 'pycairo' 'pygobject') +depends=('libglade' 'pycairo' 'pygobject>=2.12.1') hunk ./source/gnome/pygtk/FrugalBuild 14 -sha1sums=('0695ecfe95cdf532910beffd37e0f406ee67d5ed') +sha1sums=('8955125d87bf856ed961bfcf8d2f758b0bf980d6') } From krics at linuxforum.hu Wed Sep 6 15:09:35 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 15:09:37 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-menus-2.16.0-1-x86_64 Message-ID: <20060906130935.6D82E4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906130848-d209c-3f61372a97eb97b710bad0a27ad1b24f09196569.gz; [gnome-menus-2.16.0-1-x86_64 Christian Hamar alias krix **20060906130848 * Version bump * Added --enable-debug=no (seems configure did not put default to no?) - NOTE: if we got problems then need to remove this enable-debug=no ] { hunk ./source/gnome/gnome-menus/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 20:11:26 +0100 +# Last modified: Wed, 06 Sep 2006 15:06:31 +0200 hunk ./source/gnome/gnome-menus/FrugalBuild 6 -pkgver=2.15.91 -pkgrel=3 +pkgver=2.16.0 +pkgrel=1 hunk ./source/gnome/gnome-menus/FrugalBuild 10 -depends=('gamin' 'pygtk') +depends=('gamin' 'pygtk>=2.10.1') hunk ./source/gnome/gnome-menus/FrugalBuild 15 -sha1sums=('685faa6b409855241df656f5be6fe507d5604961') +sha1sums=('343cc3cf21470f8fde9f6ba86e7fb0ef2d0896b0') hunk ./source/gnome/gnome-menus/FrugalBuild 17 -Fconfopts="$Fconfopts --enable-python" +Fconfopts="$Fconfopts --enable-python --enable-debug=no" } From krics at linuxforum.hu Wed Sep 6 15:26:11 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 15:26:21 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-panel-2.16.0-1-x86_64 Message-ID: <20060906132612.1869A4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906132618-d209c-67d19566ef8232ace08c081cc07e8ca0a76be9fa.gz; [gnome-panel-2.16.0-1-x86_64 Christian Hamar alias krix **20060906132618 * Version bump ] { hunk ./source/gnome/gnome-panel/FrugalBuild 1 -# Last modified: Wed, 23 Aug 2006 15:33:04 +0100 +# Last modified: Wed, 06 Sep 2006 15:23:37 +0200 hunk ./source/gnome/gnome-panel/FrugalBuild 6 -pkgver=2.15.92 +pkgver=2.16.0 hunk ./source/gnome/gnome-panel/FrugalBuild 11 -depends=('gnome-desktop>=2.15.90' 'gnome-menus>=2.15.90' 'libwnck' 'gnome-vfs>=2.15.90' \ - 'evolution-data-server>=1.7.92' 'scrollkeeper' 'dbus-gtk+2') -makedepends=('intltool' 'gtk-doc' 'gnome-doc-utils') +depends=('gnome-desktop>=2.16.0' 'gnome-menus>=2.16.0' 'libwnck>=2.16.0' \ + 'gnome-vfs>=2.16.0' 'evolution-data-server>=1.8.0' \ + 'scrollkeeper' 'dbus-gtk+2') +makedepends=('intltool' 'gtk-doc' 'gnome-doc-utils>=0.8.0') hunk ./source/gnome/gnome-panel/FrugalBuild 29 -sha1sums=('b484daaf8bc562e7d92cf10b5bf6adae973d492d') +sha1sums=('32077d18d7255acb518a1795ce201b2a79017d97') } From krics at linuxforum.hu Wed Sep 6 15:36:54 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 15:36:56 2006 Subject: [Frugalware-darcs] frugalware-current: moved metacity before gnome-session and after gnome-panel Message-ID: <20060906133654.140F94E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906133724-d209c-274956e5d0b980066e681dc9867432ec13d0d522.gz; [moved metacity before gnome-session and after gnome-panel Christian Hamar alias krix **20060906133724 ] { hunk ./docs/tech/gnome-bump-howto.txt 71 +- metacity hunk ./docs/tech/gnome-bump-howto.txt 84 -- metacity } From krics at linuxforum.hu Wed Sep 6 16:02:15 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 16:02:32 2006 Subject: [Frugalware-darcs] frugalware-current: metacity-2.16.0-1-x86_64 Message-ID: <20060906140215.D99284E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906140133-d209c-e75f1eeff90173500642de2a9e469a590824ff59.gz; [metacity-2.16.0-1-x86_64 Christian Hamar alias krix **20060906140133 * Version bump ] { hunk ./source/gnome/metacity/FrugalBuild 1 -# Last modified: Fri, 01 Sep 2006 14:10:16 +0100 +# Last modified: Wed, 06 Sep 2006 15:41:47 +0200 hunk ./source/gnome/metacity/FrugalBuild 6 -pkgver=2.15.34 -pkgrel=2 +pkgver=2.16.0 +pkgrel=1 hunk ./source/gnome/metacity/FrugalBuild 20 -sha1sums=('8446bcd048ea615552b082d6472dcd7f49dd7620' \ +sha1sums=('373cdc1ebeb9384237798c783bcfdbe897620a85' \ } From crazy at frugalware.org Wed Sep 6 16:04:23 2006 From: crazy at frugalware.org (crazy) Date: Wed Sep 6 16:04:25 2006 Subject: [Frugalware-darcs] frugalware-current: linc-daemon-1.2-1-i686 Message-ID: <20060906140423.1F7874E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906135913-f6986-c94b4518a1dfa918cce6e54759f3ff5cd93fce50.gz; [linc-daemon-1.2-1-i686 crazy **20060906135913 * New package * blah how weird is this ? is called daemon but is a client ? :P anyway we have user need this one to get a inet connection. This daemon|client is used for 'Cyberoam and 24online' providers . * TODO some rc.* script but I need someone with this conenction to test first ] { adddir ./source/network/linc-daemon addfile ./source/network/linc-daemon/FrugalBuild hunk ./source/network/linc-daemon/FrugalBuild 1 +# Last Modified: Wed, 06 Sep 2006 15:57:58 +0200 +# Compiling Time: 0.07 SBU +# Maintainer: crazy + +pkgname=linc-daemon +pkgver=1.2 +pkgrel=1 +pkgdesc="A free multiplatform client for Cyberoam and 24online." +depends=('libstdc++') +groups=('network-extra') +archs=('i686') +_F_sourceforge_dirname="linc" +Finclude sourceforge +up2date="$pkgver" ## latest release 2003 :| +url="http://linc.sourceforge.net/" +sha1sums=('06ffcd8d7e1fac0d228e20325d302ae66d17cfa7') + +build() +{ + Fcd + Fsed '-O2' '$CXXFLAGS' configure + Fbuild +} + +# optimization OK } From crazy at frugalware.org Wed Sep 6 16:51:23 2006 From: crazy at frugalware.org (crazy) Date: Wed Sep 6 16:51:25 2006 Subject: [Frugalware-darcs] frugalware-current: xorg-server-1.1.1-5-i686 Message-ID: <20060906145123.3B48B4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906144714-f6986-22b3efab6685683e31e963e36cd5069b0892aae0.gz; [xorg-server-1.1.1-5-i686 crazy **20060906144714 * rebump * killed aiglx off I hope ( --disable-aiglx --without-aiglx --enable-aiglx=no <-- should be ? :S ) * added vesa driver to rodepends() * ehh use \ for depend() | makedepends() ] { hunk ./source/x11/xorg-server/FrugalBuild 1 -# Last Modified: Mon, 28 Aug 2006 16:25:27 +0200 +# Last Modified: Wed, 06 Sep 2006 16:45:07 +0200 hunk ./source/x11/xorg-server/FrugalBuild 7 -pkgrel=4 +pkgrel=5 hunk ./source/x11/xorg-server/FrugalBuild 13 -depends=('libxfont' 'libx11' 'xtrans' 'libxau' 'libxext' 'libxkbfile' 'libxdmcp' 'libxmu' 'libxrender' 'libxi' 'freetype2' 'mesa>=6.5' 'font-cursor-misc' 'font-misc-misc' 'xbitmaps' 'xkbdata' 'iceauth' 'rgb' 'xauth' 'xinit' 'libxaw' 'libxpm' 'libxxf86misc' 'libxxf86vm' 'libxkbui' 'liblbxutil' 'xorg-cf-files' 'libxtst' 'font-alias') -makedepends=('randrproto' 'renderproto' 'fixesproto' 'damageproto' 'xextproto' 'xproto' 'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' 'compositeproto' 'recordproto' 'resourceproto' 'videoproto' 'scrnsaverproto' 'evieext' 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto' 'bigreqsproto' 'xcmiscproto' 'glproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale' 'fontcacheproto' 'xorg-sgml-doctools') -rodepends=('xf86-input-mouse' 'xf86-input-keyboard' 'xf86-video-vga' "libglx=$pkgver-$pkgrel") +depends=('libxfont' 'libx11' 'xtrans' 'libxau' 'libxext' 'libxkbfile' 'libxdmcp' 'libxmu' \ + 'libxrender' 'libxi' 'freetype2' 'mesa>=6.5' 'font-cursor-misc' 'font-misc-misc' \ + 'xbitmaps' 'xkbdata' 'iceauth' 'rgb' 'xauth' 'xinit' 'libxaw' 'libxpm' 'libxxf86misc' \ + 'libxxf86vm' 'libxkbui' 'liblbxutil' 'xorg-cf-files' 'libxtst' 'font-alias') +makedepends=('randrproto' 'renderproto' 'fixesproto' 'damageproto' 'xextproto' 'xproto' \ + 'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' \ + 'compositeproto' 'recordproto' 'resourceproto' 'videoproto' 'scrnsaverproto' 'evieext' \ + 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto' 'bigreqsproto' 'xcmiscproto' \ + 'glproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale' 'fontcacheproto' 'xorg-sgml-doctools') +rodepends=('xf86-input-mouse' 'xf86-input-keyboard' 'xf86-video-vga' 'xf86-video-vesa' "libglx=$pkgver-$pkgrel") hunk ./source/x11/xorg-server/FrugalBuild 69 - --with-xkb-output=/var/lib/xkb + --with-xkb-output=/var/lib/xkb \ + --disable-aiglx --without-aiglx --enable-aiglx=no } From alex at alex-smith.me.uk Wed Sep 6 18:09:19 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 18:09:25 2006 Subject: [Frugalware-darcs] xfce44: libxfce4util: removed xfce4.sh Message-ID: <20060906160919.36FF04E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906170926-46e39-e10705b1d8cdcb38a37caafd826e3009eebb3c05.gz; [libxfce4util: removed xfce4.sh AlexExtreme **20060906170926] { hunk ./source/libxfce4util/FrugalBuild 1 -# Last Modified: Tue, 05 Sep 2006 22:06:19 +0100 +# Last Modified: Wed, 06 Sep 2006 17:53:12 +0100 hunk ./source/libxfce4util/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/libxfce4util/FrugalBuild 15 -source=(${source[@]} xfce4.sh) hunk ./source/libxfce4util/FrugalBuild 18 -build() { - Fbuild - Fexe /etc/profile.d/xfce4.sh -} - rmfile ./source/libxfce4util/xfce4.sh } From alex at alex-smith.me.uk Wed Sep 6 18:18:03 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 18:18:06 2006 Subject: [Frugalware-darcs] xfce44: xfce44: FB cleanup Message-ID: <20060906161804.19A824E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906171757-46e39-22afc55ea7c8b84ae095b1e9d1abb71437cb3b0c.gz; [xfce44: FB cleanup AlexExtreme **20060906171757] { hunk ./source/libexo/FrugalBuild 17 - -build() { - Fcd exo-$pkgver - Fbuild -} +_F_cd_path="$realname-$pkgver" hunk ./source/libxfce4mcs/FrugalBuild 16 - -build() { - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh - Fbuild -} hunk ./source/libxfcegui4/FrugalBuild 18 - -build() { - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh - Fbuild --enable-xinerama --enable-gtk-doc -} +Fconfopts="$Fconfopts --enable-xinerama --enable-gtk-doc" hunk ./source/orage/FrugalBuild 19 - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh hunk ./source/terminal/FrugalBuild 17 - -build() { - Fcd Terminal-$pkgver - Fbuild -} +_F_cd_path="$realname-$pkgver" hunk ./source/thunar/FrugalBuild 19 - -build() { - Fcd $realname-$pkgver - Fbuild $Fconfopts --enable-cairo --disable-debug --disable-gnome-thumbnailers -} +_F_cd_path="$realname-$pkgver" +Fconfopts="$Fconfopts --enable-cairo --disable-debug --disable-gnome-thumbnailers" hunk ./source/xfce-mcs-manager/FrugalBuild 16 - -build() { - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh - Fbuild || return 1 -} hunk ./source/xfce-mcs-plugins/FrugalBuild 19 - -build() { - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh - Fbuild -} hunk ./source/xfce-utils/FrugalBuild 19 - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh hunk ./source/xfce4-mixer/FrugalBuild 16 - -build() { - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh - Fbuild -} hunk ./source/xfce4-panel/FrugalBuild 19 - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh hunk ./source/xfce4-session/FrugalBuild 24 - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh hunk ./source/xfdesktop/FrugalBuild 17 +sha1sums=('442bffbd67754eb4afcc8469369e0ca8abf2b5dc' \ + '530517581f8f5023fbb7ea147d4d362a8409e9b0' \ + '3529e72619fc73e09e2e2de6939e16a1be07db28') hunk ./source/xfdesktop/FrugalBuild 22 - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh hunk ./source/xfdesktop/FrugalBuild 23 - Ffile xfce4-fw.png /usr/share/pixmaps/ + Ffile xfce4-fw.png /usr/share/pixmaps/ hunk ./source/xfdesktop/FrugalBuild 27 -sha1sums=('442bffbd67754eb4afcc8469369e0ca8abf2b5dc' \ - '530517581f8f5023fbb7ea147d4d362a8409e9b0' \ - '3529e72619fc73e09e2e2de6939e16a1be07db28') hunk ./source/xfprint/FrugalBuild 16 - -build() { - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh - Fbuild || return 1 -} hunk ./source/xfwm4/FrugalBuild 20 - -build() { - [ -f /etc/profile.d/xfce4.sh ] && . /etc/profile.d/xfce4.sh - Fpatchall - Fmake --enable-compositor - Fmakeinstall -} +Fconfopts="$Fconfopts --enable-compositor" } From alex at alex-smith.me.uk Wed Sep 6 18:35:01 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 18:35:03 2006 Subject: [Frugalware-darcs] xfce44: libxfcegui4: added x86_64 to archs Message-ID: <20060906163501.8CD834E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906173524-46e39-888f5cd3131ba262bc13e334509a3b056d888ade.gz; [libxfcegui4: added x86_64 to archs AlexExtreme **20060906173524] { hunk ./source/libxfcegui4/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 17:27:23 +0530 +# Last Modified: Wed, 06 Sep 2006 18:29:19 +0100 hunk ./source/libxfcegui4/FrugalBuild 14 -archs=('i686') +archs=('i686' 'x86_64') } From alex at alex-smith.me.uk Wed Sep 6 18:45:49 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 18:45:51 2006 Subject: [Frugalware-darcs] xfce44: xfce-mcs-manager: addex x86_64 to archs Message-ID: <20060906164549.DAA824E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906174613-46e39-00732a6de1d69470b3e752eb853da5ef6db9febb.gz; [xfce-mcs-manager: addex x86_64 to archs AlexExtreme **20060906174613] { hunk ./source/xfce-mcs-manager/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') } From alex at alex-smith.me.uk Wed Sep 6 18:53:07 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 18:53:09 2006 Subject: [Frugalware-darcs] xfce44: libxfce4mcs-4.3.99.1-1-x86_64 Message-ID: <20060906165307.C6D624E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906175309-46e39-feffdd15e64cc4e927dbb88f757caf6e2d25a044.gz; [libxfce4mcs-4.3.99.1-1-x86_64 AlexExtreme **20060906175309 * Added x86_64 to archs ] { hunk ./source/libxfce4mcs/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 17:08:36 +0530 +# Last Modified: Wed, 06 Sep 2006 18:52:06 +0100 hunk ./source/libxfce4mcs/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') } From alex at alex-smith.me.uk Wed Sep 6 19:00:51 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 19:00:52 2006 Subject: [Frugalware-darcs] xfce44: gtk-xfce-engine-2.3.99.1-1-x86_64 Message-ID: <20060906170051.248334E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906180044-46e39-61cf8740186cdbe6b3563c1db14070a43423fe59.gz; [gtk-xfce-engine-2.3.99.1-1-x86_64 AlexExtreme **20060906180044 * Added x86_64 to archs ] { hunk ./source/gtk-xfce-engine/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 17:39:25 +0530 +# Last Modified: Wed, 06 Sep 2006 19:00:03 +0100 hunk ./source/gtk-xfce-engine/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') hunk ./source/xfce-mcs-manager/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 17:35:10 +0530 +# Last Modified: Wed, 06 Sep 2006 18:56:28 +0100 } From crazy at frugalware.org Wed Sep 6 19:30:17 2006 From: crazy at frugalware.org (crazy) Date: Wed Sep 6 19:30:19 2006 Subject: [Frugalware-darcs] frugalware-current: libmtp-0.0.17-1-i686 Message-ID: <20060906173017.7F40B4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906172733-f6986-f2d3b39c49a3f5ef828afbb56f7f8a6f94060503.gz; [libmtp-0.0.17-1-i686 crazy **20060906172733 * Version bump ] { hunk ./source/lib-extra/libmtp/FrugalBuild 1 -# Last Modified: Wed, 30 Aug 2006 01:56:40 +0200 +# Last Modified: Wed, 06 Sep 2006 19:22:38 +0200 hunk ./source/lib-extra/libmtp/FrugalBuild 6 -pkgver=0.0.16 +pkgver=0.0.17 hunk ./source/lib-extra/libmtp/FrugalBuild 14 -sha1sums=('cad76092651872c807d4e2970ccbc231e7383f08') +sha1sums=('a9bda4e0f3cff7aff6d2b475ec31b87844c71ff1') } From alex at alex-smith.me.uk Wed Sep 6 19:30:27 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 19:30:29 2006 Subject: [Frugalware-darcs] xfce44: xfce-frugalware-0.2-2-x86_64 Message-ID: <20060906173027.53E7C4E8BCE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906183009-46e39-4b8c75f854f0bd4813345ba91065123cd28fb695.gz; [xfce-frugalware-0.2-2-x86_64 AlexExtreme **20060906183009 * Added x86_64 to archs ] { hunk ./source/xfce-frugalware/FrugalBuild 1 -# Last Modified: Wed, 06 Sep 2006 20:23:16 +0530 +# Last Modified: Wed, 06 Sep 2006 19:29:52 +0100 hunk ./source/xfce-frugalware/FrugalBuild 11 +depends=() hunk ./source/xfce-frugalware/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') } From alex at alex-smith.me.uk Wed Sep 6 19:39:42 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 19:39:43 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-bump-howto: some fixes Message-ID: <20060906173942.680B94E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906183640-46e39-bd78bedd2460ebb60fa75722d782614e8ade9e05.gz; [gnome-bump-howto: some fixes AlexExtreme **20060906183640] { hunk ./docs/tech/gnome-bump-howto.txt 72 +- control-center hunk ./docs/tech/gnome-bump-howto.txt 93 -- control-center hunk ./docs/tech/gnome-bump-howto.txt 145 +- gnome-cups-manager } From krics at linuxforum.hu Wed Sep 6 19:47:47 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 19:47:49 2006 Subject: [Frugalware-darcs] frugalware-current: bring gstreamer ahead Message-ID: <20060906174747.8A6464E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906174705-d209c-c4d3dd5908549792a8620b96a8afb90c394cc1a0.gz; [bring gstreamer ahead Christian Hamar alias krix **20060906174705] { hunk ./docs/tech/gnome-bump-howto.txt 72 +- gstreamer hunk ./docs/tech/gnome-bump-howto.txt 80 -- gstreamer } From crazy at frugalware.org Wed Sep 6 19:49:02 2006 From: crazy at frugalware.org (crazy) Date: Wed Sep 6 19:49:03 2006 Subject: [Frugalware-darcs] frugalware-current: perl-glib-1.140-1-i686 Message-ID: <20060906174902.8F2FA4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906174630-f6986-bafdad540e9f90797c5ea9ee97e9d19d127f188e.gz; [perl-glib-1.140-1-i686 crazy **20060906174630 * Version bump ] { hunk ./source/devel-extra/perl-glib/FrugalBuild 1 -# Last Modified: Mon, 10 Apr 2006 22:43:32 +0200 -# Compiling time: 0.09 SBU +# Last Modified: Wed, 06 Sep 2006 19:46:05 +0200 +# Compiling Time: 0.09 SBU hunk ./source/devel-extra/perl-glib/FrugalBuild 6 -pkgver=1.120 +pkgver=1.140 hunk ./source/devel-extra/perl-glib/FrugalBuild 16 - -build() { - cd $startdir/src/Glib-$pkgver -# perl Makefile.PL - Fconf +sha1sums=('d8a5bdcc762f5cfd21c54f67e0a64181435b065e') +_F_cd_path="Glib-$pkgver" hunk ./source/devel-extra/perl-glib/FrugalBuild 19 - make test - make || return 1 - - Fmakeinstall -# make install DESTDIR=$startdir/pkg || return 1 -# mv $startdir/pkg/usr/lib/perl5/site_perl/?.?.? $startdir/pkg/usr/lib/perl5/site_perl/current -# rm -rf $startdir/pkg/usr/lib/perl5/?.?.? -# find $startdir/pkg/usr/lib/perl5/site_perl/current/ -name .packlist -exec rm {} \; -} hunk ./source/devel-extra/perl-glib/FrugalBuild 20 -# optimalization OK hunk ./source/devel-extra/perl-glib/FrugalBuild 21 -sha1sums=('fbdd1949a38f6f975768ea2c8c9b13b9b559c6f1') +# optimization OK } From alex at alex-smith.me.uk Wed Sep 6 19:54:35 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 19:54:38 2006 Subject: [Frugalware-darcs] xfce44: xfce-mcs-plugins-4.3.99.1-2-x86_64 Message-ID: <20060906175435.AE1074E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906185330-46e39-2ffdeb71a139e7eb7083c12e20470d8ac2f884d9.gz; [xfce-mcs-plugins-4.3.99.1-2-x86_64 AlexExtreme **20060906185330 * Added x86_64 to archs ] { hunk ./source/xfce-mcs-plugins/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 17:48:16 +0530 +# Last Modified: Wed, 06 Sep 2006 19:49:44 +0100 hunk ./source/xfce-mcs-plugins/FrugalBuild 14 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Wed Sep 6 19:55:33 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 19:55:34 2006 Subject: [Frugalware-darcs] frugalware-current: gstreamer-0.10.9-3-x86_64 Message-ID: <20060906175533.95A014E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906175600-d209c-517de476d8620d9c5e7a280a81da1a796b4ce8c6.gz; [gstreamer-0.10.9-3-x86_64 Christian Hamar alias krix **20060906175600 * Release bump * Rebuilded with new libgnome (just for the order now) ] { hunk ./source/xmultimedia/gstreamer/FrugalBuild 1 -# Last modified: Mon, 14 Aug 2006 18:53:01 +0200 +# Last modified: Wed, 06 Sep 2006 19:53:54 +0200 hunk ./source/xmultimedia/gstreamer/FrugalBuild 8 -pkgrel=2 +pkgrel=3 hunk ./source/xmultimedia/gstreamer/FrugalBuild 12 -makedepends=('python' 'gtk-doc' 'pyxml' 'libgnomeui') +makedepends=('python' 'gtk-doc' 'pyxml' 'libgnomeui>=2.16.0') hunk ./source/xmultimedia/gstreamer/FrugalBuild 21 - hunk ./source/xmultimedia/gstreamer/FrugalBuild 36 - } From krics at linuxforum.hu Wed Sep 6 20:02:52 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 20:02:54 2006 Subject: [Frugalware-darcs] frugalware-current: bring gst-plugins-base ahead Message-ID: <20060906180252.8564B4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906180228-d209c-ef31daf2d5ee89d610c76171295e91e6fa414f44.gz; [bring gst-plugins-base ahead Christian Hamar alias krix **20060906180228] { hunk ./docs/tech/gnome-bump-howto.txt 73 +- gst-plugins-base hunk ./docs/tech/gnome-bump-howto.txt 82 -- gst-plugins-base } From krics at linuxforum.hu Wed Sep 6 20:11:26 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 20:11:28 2006 Subject: [Frugalware-darcs] frugalware-current: gst-plugins-base-0.10.9-2-x86_64 Message-ID: <20060906181127.227264E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906181121-d209c-fe7b264996d3ac6dc3de42f12ae39b3a5e98a108.gz; [gst-plugins-base-0.10.9-2-x86_64 Christian Hamar alias krix **20060906181121 * Release bump * Recompiled with new gnome-vfs (and for sort order) ] { hunk ./source/xmultimedia/gst-plugins-base/FrugalBuild 1 -# Last modified: Sat, 15 Jul 2006 11:30:35 +0200 +# Last modified: Wed, 06 Sep 2006 20:07:57 +0200 hunk ./source/xmultimedia/gst-plugins-base/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/xmultimedia/gst-plugins-base/FrugalBuild 13 -makedepends=('gtk-doc' 'pyxml' 'gnome-vfs' 'cdparanoia' 'pango' 'liboil' 'alsa-lib' 'libtheora' 'fontconfig') +makedepends=('gtk-doc' 'pyxml' 'gnome-vfs>=2.16.0' 'cdparanoia' 'pango' 'liboil' 'alsa-lib' 'libtheora' 'fontconfig') hunk ./source/xmultimedia/gst-plugins-base/FrugalBuild 25 -subdepends=("gnome-vfs $pkgname=$pkgver" "cdparanoia $pkgname=$pkgver" "pango fontconfig $pkgname=$pkgver" "alsa-lib $pkgname=$pkgver" \ +subdepends=("gnome-vfs>=2.16.0 $pkgname=$pkgver" "cdparanoia $pkgname=$pkgver" "pango fontconfig $pkgname=$pkgver" "alsa-lib $pkgname=$pkgver" \ hunk ./source/xmultimedia/gst-plugins-base/FrugalBuild 46 - } From alex at alex-smith.me.uk Wed Sep 6 20:15:39 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 20:15:40 2006 Subject: [Frugalware-darcs] frugalware-current: recordmydesktop-0.2.4-1-x86_64 Message-ID: <20060906181539.5C1B54E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906191306-46e39-b1d7e44d1ce9422e3047d99812a891f6b47cfbe5.gz; [recordmydesktop-0.2.4-1-x86_64 AlexExtreme **20060906191306 * Added x86_64 to archs ] { hunk ./source/xapps-extra/recordmydesktop/FrugalBuild 1 -# Last Modified: Fri, 25 Aug 2006 17:35:58 +0200 +# Last Modified: Wed, 06 Sep 2006 20:11:39 +0100 hunk ./source/xapps-extra/recordmydesktop/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Wed Sep 6 20:18:03 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 20:18:06 2006 Subject: [Frugalware-darcs] frugalware-current: bring liboil and libxklavier ahead Message-ID: <20060906181804.0817C4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906181808-d209c-73f8147afe3f763e5bc382f99d7769ee946c44bb.gz; [bring liboil and libxklavier ahead Christian Hamar alias krix **20060906181808 * Bring these before gst-plugins-base ] { hunk ./docs/tech/gnome-bump-howto.txt 73 +- liboil +- libxklavier hunk ./docs/tech/gnome-bump-howto.txt 82 -- libxklavier -- liboil } From krics at linuxforum.hu Wed Sep 6 20:20:31 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 20:20:35 2006 Subject: [Frugalware-darcs] frugalware-current: bring libcroco and librsvg ahead Message-ID: <20060906182032.23FD84E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906182113-d209c-0a666895a93f0ebf76ca45793c88fe93c66b8900.gz; [bring libcroco and librsvg ahead Christian Hamar alias krix **20060906182113] { hunk ./docs/tech/gnome-bump-howto.txt 75 +- libcroco +- librsvg hunk ./docs/tech/gnome-bump-howto.txt 88 -- libcroco hunk ./docs/tech/gnome-bump-howto.txt 91 -- librsvg } From krics at linuxforum.hu Wed Sep 6 20:22:58 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 20:22:59 2006 Subject: [Frugalware-darcs] frugalware-current: finalize nautilis bring ahead Message-ID: <20060906182258.31C3B4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906182319-d209c-768f3b4f4b08f09c0001e5b2513ec8d6c2dd3f16.gz; [finalize nautilis bring ahead Christian Hamar alias krix **20060906182319] { hunk ./docs/tech/gnome-bump-howto.txt 77 +- gail +- eel hunk ./docs/tech/gnome-bump-howto.txt 80 +- nautilus hunk ./docs/tech/gnome-bump-howto.txt 86 -- gail hunk ./docs/tech/gnome-bump-howto.txt 93 -- eel -- nautilus } From alex at alex-smith.me.uk Wed Sep 6 20:24:38 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 20:24:40 2006 Subject: [Frugalware-darcs] xfce44: xfce4-session-4.3.99.1-1-x86_64 Message-ID: <20060906182438.E6F684E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906192436-46e39-5463dcec8fda87c74bc7b075671cb2980edc627a.gz; [xfce4-session-4.3.99.1-1-x86_64 AlexExtreme **20060906192436 * Added x86_64 to archs ] { hunk ./source/xfce4-session/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 20:23:35 +0530 +# Last Modified: Wed, 06 Sep 2006 20:12:00 +0100 hunk ./source/xfce4-session/FrugalBuild 14 -archs=('i686') +archs=('i686' 'x86_64') } From alex at alex-smith.me.uk Wed Sep 6 20:26:30 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 20:26:32 2006 Subject: [Frugalware-darcs] frugalware-current: gtk-recordmydesktop-0.1-1-x86_64 Message-ID: <20060906182630.39A924E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906192535-46e39-c26387688a507f98814f7f4d3a7431e9fbb3dd43.gz; [gtk-recordmydesktop-0.1-1-x86_64 AlexExtreme **20060906192535 * Addex x86_64 to archs ] { hunk ./source/xapps-extra/gtk-recordmydesktop/FrugalBuild 1 -# Last Modified: Tue, 05 Sep 2006 22:24:40 +0200 +# Last Modified: Wed, 06 Sep 2006 20:21:34 +0100 hunk ./source/xapps-extra/gtk-recordmydesktop/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Wed Sep 6 20:30:02 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 20:30:03 2006 Subject: [Frugalware-darcs] frugalware-current: eel-2.16.0-1-x86_64 Message-ID: <20060906183002.4FD8E4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906183007-d209c-a00fc51891fb4059d8ac47e7ea3b9c6896fb0eb1.gz; [eel-2.16.0-1-x86_64 Christian Hamar alias krix **20060906183007 * Version bump ] { hunk ./source/gnome/eel/FrugalBuild 1 -# Last modified: Thu, 24 Aug 2006 10:09:27 +0100 +# Last modified: Wed, 06 Sep 2006 20:28:54 +0200 hunk ./source/gnome/eel/FrugalBuild 6 -pkgver=2.15.92 +pkgver=2.16.0 hunk ./source/gnome/eel/FrugalBuild 10 -depends=('gail>=1.9.2' 'gnome-menus>=2.15.91' 'gnome-desktop>=2.15.92') +depends=('gail>=1.9.2' 'gnome-menus>=2.16.0' 'gnome-desktop>=2.16.0') hunk ./source/gnome/eel/FrugalBuild 15 -sha1sums=('0db0f1f840b11f8311a1468e15c49d7934aef5f4') +sha1sums=('ab87f542d3e88b18de69c42ef9d4259423c5ea7d') } From alex at alex-smith.me.uk Wed Sep 6 20:32:44 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Wed Sep 6 20:32:47 2006 Subject: [Frugalware-darcs] xfce44: xfce-utils: added x86_64 to archs Message-ID: <20060906183244.B239E4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xfce44;a=darcs_commitdiff;h=20060906193310-46e39-7d3d2e32b81de92ab7e91ad0af66bd0864b51f56.gz; [xfce-utils: added x86_64 to archs AlexExtreme **20060906193310] { hunk ./source/xfce-utils/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 20:30:20 +0530 +# Last Modified: Wed, 06 Sep 2006 20:32:05 +0100 hunk ./source/xfce-utils/FrugalBuild 14 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Wed Sep 6 20:45:33 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 20:45:37 2006 Subject: [Frugalware-darcs] frugalware-current: nautilus-2.16.0-1-x86_64 Message-ID: <20060906184533.2CF324E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906184546-d209c-794b8a4412132c33aefcc71d84cf3506d042bb25.gz; [nautilus-2.16.0-1-x86_64 Christian Hamar alias krix **20060906184546 * Version bump ] { hunk ./source/gnome/nautilus/FrugalBuild 1 -# Last modified: Thu, 24 Aug 2006 10:35:27 +0100 +# Last modified: Wed, 06 Sep 2006 20:43:22 +0200 hunk ./source/gnome/nautilus/FrugalBuild 6 -pkgver=2.15.92.1 +pkgver=2.16.0 hunk ./source/gnome/nautilus/FrugalBuild 10 -depends=('eel>=2.15.92' 'librsvg>=2.15.90-2' 'libexif' 'eject' 'desktop-file-utils') +depends=('eel>=2.16.0' 'librsvg>=2.16.0' 'libexif' 'eject' 'desktop-file-utils') hunk ./source/gnome/nautilus/FrugalBuild 19 -sha1sums=('df14c26317dbe1b084bc1a724654c32123b4cbc8' \ +sha1sums=('62a77bde9705a0edc67c6d7221cfce4f7f06aef8' \ } From krics at linuxforum.hu Wed Sep 6 21:06:43 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Sep 6 21:06:46 2006 Subject: [Frugalware-darcs] frugalware-current: control-center-2.16.0-1-x86_64 Message-ID: <20060906190644.0F4174E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906190632-d209c-68e7969a914b094a8fd634ac3932e8d2ff470241.gz; [control-center-2.16.0-1-x86_64 Christian Hamar alias krix **20060906190632 * Version bump * Added libxscrn and libxxf86misc to depends() ] { hunk ./source/gnome/control-center/FrugalBuild 1 -# Last modified: Fri, 25 Aug 2006 07:58:11 +0100 +# Last modified: Wed, 06 Sep 2006 21:03:20 +0200 hunk ./source/gnome/control-center/FrugalBuild 6 -pkgver=2.15.92 -pkgrel=2 +pkgver=2.16.0 +pkgrel=1 hunk ./source/gnome/control-center/FrugalBuild 10 -depends=('gnome-desktop>=2.15.92' 'gnome-menus>=2.15.91-3' 'metacity>=2.15.34' 'libxklavier>=2.91' \ - 'nautilus>=2.15.92.1' 'gst-plugins-base' 'desktop-file-utils' \ - 'evolution-data-server>=1.7.91') -makedepends=('intltool' 'gnome-doc-utils') +depends=('gnome-desktop>=2.16.0' 'gnome-menus>=2.16.0' 'metacity>=2.16.0' 'libxklavier>=3.0' \ + 'nautilus>=2.16.0' 'gst-plugins-base>=0.10.9-2' 'desktop-file-utils' \ + 'evolution-data-server>=1.8.0' 'libxxf86misc' 'libxscrnsaver') +makedepends=('intltool' 'gnome-doc-utils>=0.8.0') hunk ./source/gnome/control-center/FrugalBuild 28 -sha1sums=('653a38f0c0d2e8bf9d40519851f21ca595d07400') -Fconfopts="$Fconfopts --enable-gstreamer --disable-schemas-install" +sha1sums=('c73e614c3ba287202ca12f19029f15bab293690b') +Fconfopts="$Fconfopts --enable-gstreamer --disable-schemas-install --enable-aboutme" } From boobaa at frugalware.org Wed Sep 6 21:10:05 2006 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Sep 6 21:10:12 2006 Subject: [Frugalware-darcs] frugalware-current: tellico-1.2-1-i686 Message-ID: <20060906191006.0760A4E88B0@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060906190425-60d9d-974bf8b0d71564474766538d581dc7fc0b4ae132.gz; [tellico-1.2-1-i686 CSÉCSY László **20060906190425 version bump removed patch (upstream fixed it) removed hu.po (upstream provides a usable one) it's known this release has bumps (see upstream's blog), but he haven't released a new one yet ] { hunk ./source/kde-extra/tellico/FrugalBuild 1 -# Last Modified: Mon, 12 Jun 2006 16:55:38 +0200 +# Last Modified: Wed, 06 Sep 2006 19:14:25 +0200 hunk ./source/kde-extra/tellico/FrugalBuild 6 -pkgver=1.1.6 -pkgrel=2 +pkgver=1.2 +pkgrel=1 hunk ./source/kde-extra/tellico/FrugalBuild 14 -source=($url/download/$pkgname-$pkgver.tar.gz \ - $pkgname-1.0.3-readlink.diff hu.po) +source=($url/download/$pkgname-$pkgver.tar.gz) hunk ./source/kde-extra/tellico/FrugalBuild 16 -sha1sums=('42fdbe15b74217ce74028b380fddf3b9a7de90f4' \ - '1566569d13f30587b21d918bd6c3de4cfd4c4360' \ - '7d59246735085c42d0d8c6df63f099c2e5ccdf08') - -build() -{ - Fcp ../src/hu.po ../src/$pkgname-$pkgver/po/ - Fbuild -} +sha1sums=('2715e035a93663fcfaf5c8fc72c78bfb461c7590') hunk ./source/kde-extra/tellico/hu.po 1 -# translation of hu.po to -# Marcel Hilzinger , 2003. -# Csaba Zakarias , 2005. -# Csaba Zakarias , 2005. -# ZakariĂĄs Csaba , 2006. -# This file is distributed under the same license as the tellico package. -# Copyright (C) 2004 RObby Stephenson -msgid "" -msgstr "" -"Project-Id-Version: hu\n" -"POT-Creation-Date: 2006-03-04 21:59-0800\n" -"PO-Revision-Date: 2006-06-10 13:51+0200\n" -"Last-Translator: ZakariĂĄs Csaba \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" -"X-Generator: KBabel 1.11.2\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: cite/actionmanager.cpp:75 -msgid "Creating citations..." -msgstr "IdĂ©zet lĂ©trehozĂĄsa..." - -#: cite/lyxpipe.cpp:49 -msgid "Tellico is unable to write to the server pipe at %1." -msgstr "A Tellico nem tud a fĂĄjlba Ă­rni: %1." - -#: cite/openoffice.cpp:80 -msgid "Connecting to OpenOffice.org..." -msgstr "KapcsolĂłdĂĄs OpenOffice.org-hoz" - -#: cite/openoffice.cpp:163 cite/openoffice.cpp:182 -msgid "OpenOffice.org Connection" -msgstr "OpenOffice.org kapcsolat" - -#: cite/openoffice.cpp:177 -msgid "" -"Tellico was unable to connect to OpenOffice.org.\n" -"Please verify the connection settings below, and\n" -"that OpenOffice.org Writer is currently running." -msgstr "Tellcio nem tud csatlakozni az OpenOffice.org-hoz.\n KĂ©rem ellenƑrizze a csatlakozĂĄs beĂĄllĂ­tĂĄsait, valamint azt is, hogy az OpenOffice.org Szöveg jelenleg fut-e." - -#: cite/openoffice.cpp:187 -msgid "Pipe" -msgstr "CsƑ" - -#: cite/openoffice.cpp:189 -msgid "TCP/IP" -msgstr "TCP/IP" - -#: gui/tablefieldwidget.cpp:173 -msgid "Rename Column" -msgstr "Oszlop ĂĄtnevezĂ©se" - -#: gui/tablefieldwidget.cpp:173 -msgid "New column name:" -msgstr "Új oszlop nĂ©v:" - -#: gui/tablefieldwidget.cpp:197 -#, c-format -msgid "Column %1" -msgstr "Oszlopok:" - -#: gui/tablefieldwidget.cpp:235 gui/tablefieldwidget.cpp:283 -msgid "Rename Column..." -msgstr "Oszlop ĂĄtnevezĂ©se..." - -#: gui/tablefieldwidget.cpp:268 -msgid "Insert Row" -msgstr "Sor beszĂșrĂĄsa" - -#: gui/tablefieldwidget.cpp:270 -msgid "Remove Row" -msgstr "Sor eltĂĄvolĂ­tĂĄsa" - -#: gui/tablefieldwidget.cpp:272 -msgid "Move Row Up" -msgstr "Sor mozgatĂĄsa felfelĂ©" - -#: gui/tablefieldwidget.cpp:277 -msgid "Move Row Down" -msgstr "Sor mozgatĂĄsa lefelĂ©" - -#: gui/stringmapdialog.cpp:57 -msgid "&Set" -msgstr "&BeĂĄllĂ­tĂĄs" - -#: configdialog.cpp:338 gui/fieldwidget.cpp:101 gui/fieldwidget.cpp:188 -msgid "" -"_: Edit Label\n" -"%1:" -msgstr "%1:" - -#: gui/kwidgetlister.cpp:58 -msgid "" -"_: more widgets\n" -"More" -msgstr "Több" - -#: gui/kwidgetlister.cpp:62 -msgid "" -"_: fewer widgets\n" -"Fewer" -msgstr "Kevesebb" - -#: gui/kwidgetlister.cpp:69 -msgid "" -"_: clear widgets\n" -"Clear" -msgstr "TörlĂ©s" - -#: gui/imagewidget.cpp:48 -msgid "Select Image..." -msgstr "KĂ©p kivĂĄlasztĂĄsa..." - -#: commands/modifyentries.cpp:72 -msgid "Modify Entries" -msgstr "BejegyzĂ©sek szerkesztĂ©se" - -#: commands/modifyentries.cpp:73 -#, c-format -msgid "" -"_: Modify (Entry Title)\n" -"Modify %1" -msgstr "%1 mĂłdosĂ­tĂĄsa" - -#: commands/renamecollection.cpp:45 tellico_kernel.cpp:306 -msgid "Rename Collection" -msgstr "GyƱjtemĂ©ny ĂĄtnevezĂ©se..." - -#: commands/fieldcommand.cpp:104 -msgid "Add %1 Field" -msgstr "%1 mezƑ hozzĂĄadĂĄsa" - -#: commands/fieldcommand.cpp:106 -msgid "Modify %1 Field" -msgstr "%1 mezƑ mĂłdosĂ­tĂĄsa" - -#: commands/fieldcommand.cpp:108 -msgid "Delete %1 Field" -msgstr "%1 mezƑ törlĂ©se" - -#: commands/addentries.cpp:54 -msgid "Add Entries" -msgstr "BejegyzĂ©sek hozzĂĄadĂĄsa" - -#: commands/addentries.cpp:55 -#, c-format -msgid "" -"_: Add (Entry Title)\n" -"Add %1" -msgstr "%1 hozzĂĄadĂĄsa" - -#: commands/filtercommand.cpp:98 -msgid "Add Filter" -msgstr "SzƱrĂ©s hozzĂĄadĂĄsa" - -#: commands/filtercommand.cpp:100 filterdialog.cpp:258 filterview.cpp:67 -msgid "Modify Filter" -msgstr "SzƱrĂ©s mĂłdosĂ­tĂĄsa" - -#: commands/filtercommand.cpp:102 filterview.cpp:69 -msgid "Delete Filter" -msgstr "SzƱrĂ©s törlĂ©se" - -#: commands/modifyloans.cpp:75 loandialog.cpp:46 -msgid "Modify Loan" -msgstr "KölcsönzĂ©s mĂłdosĂ­tĂĄsa" - -#: commands/addloans.cpp:108 -msgid "Check-out Items" -msgstr "Elemek eltĂĄvolĂ­tĂĄsa" - -#: commands/addloans.cpp:109 -#, c-format -msgid "" -"_: Check-out (Entry Title)\n" -"Check-out %1" -msgstr "%1 eltĂĄvolĂ­tĂĄsa" - -#: commands/removeentries.cpp:52 -msgid "Delete Entries" -msgstr "BejegyzĂ©sek törlĂ©se" - -#: commands/removeentries.cpp:53 -#, c-format -msgid "" -"_: Delete (Entry Title)\n" -"Delete %1" -msgstr "%1 törlĂ©se" - -#: commands/collectioncommand.cpp:93 -msgid "Append Collection" -msgstr "GyƱjtemĂ©ny hozzĂĄtoldĂĄsa" - -#: commands/collectioncommand.cpp:95 -msgid "Merge Collection" -msgstr "GyƱjtemĂ©nyek összefƱzĂ©se" - -#: commands/collectioncommand.cpp:97 -msgid "Replace Collection" -msgstr "GyƱjtemĂ©ny ĂĄtnevezĂ©se" - -#: commands/reorderfields.cpp:52 -msgid "Reorder Fields" -msgstr "Újrarendezett mezƑk" - -#: commands/removeloans.cpp:79 -msgid "Check-in Entries" -msgstr "BejegyzĂ©sek bevezetĂ©se" - -#: commands/removeloans.cpp:80 -#, c-format -msgid "" -"_: Check-in (Entry Title)\n" -"Check-in %1" -msgstr "%1 bevezetĂ©se" - -#: collectionfactory.cpp:78 collections/bibtexcollection.cpp:24 -#: collections/bibtexcollection.cpp:59 collections/bibtexcollection.cpp:89 -#: collections/bookcollection.cpp:19 collections/bookcollection.cpp:41 -#: collections/cardcollection.cpp:19 collections/coincollection.cpp:19 -#: collections/comicbookcollection.cpp:19 collections/filecatalog.cpp:19 -#: collections/gamecollection.cpp:19 collections/musiccollection.cpp:19 -#: collections/stampcollection.cpp:19 collections/videocollection.cpp:19 -#: collections/videocollection.cpp:41 collections/winecollection.cpp:19 -#: configdialog.cpp:154 fetch/imdbfetcher.cpp:554 fetch/imdbfetcher.cpp:771 -#: field.cpp:49 field.cpp:81 translators/gcfilmsimporter.cpp:53 -msgid "General" -msgstr "ÁltalĂĄnos" - -#: collections/bibtexcollection.cpp:25 collections/bookcollection.cpp:20 -#: collections/comicbookcollection.cpp:20 translators/grs1importer.cpp:58 -#: translators/grs1importer.cpp:68 translators/risimporter.cpp:258 -msgid "Publishing" -msgstr "KiadĂłi adatok" - -#: collections/bookcollection.cpp:21 collections/comicbookcollection.cpp:21 -#: translators/grs1importer.cpp:63 translators/risimporter.cpp:252 -msgid "Classification" -msgstr "OsztĂĄlyozĂĄs" - -#: collections/bookcollection.cpp:22 collections/cardcollection.cpp:20 -#: collections/coincollection.cpp:20 collections/comicbookcollection.cpp:22 -#: collections/gamecollection.cpp:20 collections/musiccollection.cpp:20 -#: collections/stampcollection.cpp:21 collections/videocollection.cpp:22 -#: collections/winecollection.cpp:20 document.cpp:470 -msgid "Personal" -msgstr "SzemĂ©lyes" - -#: collections/comicbookcollection.cpp:28 -msgid "Comics" -msgstr "KĂ©pregĂ©ny" - -#: collections/comicbookcollection.cpp:29 -msgid "My Comic Books" -msgstr "KĂ©pregĂ©ny gyƱjtemĂ©nyem" - -#: collectionfactory.cpp:77 collections/bibtexcollection.cpp:57 -#: collections/bookcollection.cpp:40 collections/cardcollection.cpp:38 -#: collections/coincollection.cpp:38 collections/comicbookcollection.cpp:40 -#: collections/gamecollection.cpp:38 collections/musiccollection.cpp:77 -#: collections/stampcollection.cpp:39 collections/videocollection.cpp:40 -#: collections/winecollection.cpp:38 entryupdater.cpp:186 -#: fetch/fetchmanager.cpp:50 fetchdialog.cpp:142 -#: translators/tellicoimporter.cpp:401 -msgid "Title" -msgstr "CĂ­m" - -#: collections/bookcollection.cpp:46 collections/comicbookcollection.cpp:46 -msgid "Subtitle" -msgstr "AlcĂ­m" - -#: collections/comicbookcollection.cpp:51 collections/videocollection.cpp:122 -msgid "Writer" -msgstr "SzerzƑ" - -#: collections/comicbookcollection.cpp:57 -msgid "" -"_: Comic Book Illustrator\n" -"Artist" -msgstr "KĂ©pregĂ©ny illusztrĂĄtor" - -#: collections/bibtexcollection.cpp:195 collections/bookcollection.cpp:127 -#: collections/cardcollection.cpp:72 collections/comicbookcollection.cpp:63 -msgid "Series" -msgstr "Sorozat" - -#: collections/comicbookcollection.cpp:69 -msgid "Issue" -msgstr "KiadĂĄs" - -#: collections/bibtexcollection.cpp:121 collections/bookcollection.cpp:74 -#: collections/comicbookcollection.cpp:74 collections/gamecollection.cpp:65 -msgid "Publisher" -msgstr "KiadĂł" - -#: collections/bibtexcollection.cpp:134 collections/bookcollection.cpp:80 -#: collections/comicbookcollection.cpp:80 -msgid "Edition" -msgstr "KiadĂĄs" - -#: collections/bookcollection.cpp:91 collections/comicbookcollection.cpp:86 -msgid "Publication Year" -msgstr "KiadĂĄs Ă©ve" - -#: collections/bibtexcollection.cpp:141 collections/bookcollection.cpp:106 -#: collections/comicbookcollection.cpp:91 -msgid "Pages" -msgstr "Oldalak" - -#: collections/coincollection.cpp:67 collections/comicbookcollection.cpp:95 -#: collections/stampcollection.cpp:56 collections/winecollection.cpp:74 -msgid "Country" -msgstr "OrszĂĄg" - -#: collections/bookcollection.cpp:110 collections/comicbookcollection.cpp:101 -#: translators/grs1importer.cpp:67 -msgid "Language" -msgstr "Nyelv" - -#: collections/bookcollection.cpp:115 collections/comicbookcollection.cpp:107 -#: collections/gamecollection.cpp:54 collections/musiccollection.cpp:68 -#: collections/videocollection.cpp:68 -msgid "Genre" -msgstr "Fajta" - -#: collections/bookcollection.cpp:122 collections/cardcollection.cpp:101 -#: collections/comicbookcollection.cpp:113 collections/musiccollection.cpp:104 -#: fetch/amazonfetcher.cpp:794 translators/grs1importer.cpp:62 -#: translators/risimporter.cpp:250 -msgid "Keywords" -msgstr "Kulcsszavak" - -#: collections/comicbookcollection.cpp:121 -msgid "" -"_: Comic book grade levels - Mint,Near Mint,Very Fine,Fine,Very " -"Good,Good,Fair,Poor\n" -"Mint,Near Mint,Very Fine,Fine,Very Good,Good,Fair,Poor" -msgstr "" -"Eredeti,Majdnem eredeti,Nagyon nagyszerƱ,NagyszerƱ,Nagyon " -"jĂł,JĂł,Elmegy,Gyenge" - -#: collections/bookcollection.cpp:138 collections/comicbookcollection.cpp:123 -#: collections/stampcollection.cpp:20 -msgid "Condition" -msgstr "Állapot" - -#: collections/bookcollection.cpp:65 collections/cardcollection.cpp:83 -#: collections/coincollection.cpp:103 collections/comicbookcollection.cpp:127 -#: collections/gamecollection.cpp:99 collections/musiccollection.cpp:87 -#: collections/stampcollection.cpp:105 collections/videocollection.cpp:191 -#: collections/winecollection.cpp:80 -msgid "Purchase Date" -msgstr "VĂĄsĂĄrlĂĄs dĂĄtuma" - -#: collections/bookcollection.cpp:70 collections/cardcollection.cpp:88 -#: collections/coincollection.cpp:108 collections/comicbookcollection.cpp:132 -#: collections/gamecollection.cpp:108 collections/musiccollection.cpp:96 -#: collections/stampcollection.cpp:110 collections/videocollection.cpp:200 -#: collections/winecollection.cpp:85 -msgid "Purchase Price" -msgstr "VĂĄsĂĄrlĂĄsi ĂĄr" - -#: collections/bookcollection.cpp:142 collections/comicbookcollection.cpp:136 -msgid "Signed" -msgstr "DedikĂĄlt" - -#: collections/bookcollection.cpp:150 collections/cardcollection.cpp:97 -#: collections/coincollection.cpp:118 collections/comicbookcollection.cpp:140 -#: collections/gamecollection.cpp:104 collections/musiccollection.cpp:92 -#: collections/stampcollection.cpp:120 collections/videocollection.cpp:196 -#: collections/winecollection.cpp:108 -msgid "Gift" -msgstr "AjĂĄndĂ©k" - -#: collections/bookcollection.cpp:154 collections/comicbookcollection.cpp:144 -#: collections/gamecollection.cpp:112 collections/musiccollection.cpp:100 -#: collections/videocollection.cpp:204 document.cpp:468 -msgid "Loaned" -msgstr "Kölcsön adva" - -#: collections/bookcollection.cpp:163 collections/comicbookcollection.cpp:148 -msgid "Front Cover" -msgstr "Fedlap" - -#: collections/bookcollection.cpp:166 collections/cardcollection.cpp:116 -#: collections/coincollection.cpp:128 collections/comicbookcollection.cpp:151 -#: collections/gamecollection.cpp:119 collections/musiccollection.cpp:112 -#: collections/stampcollection.cpp:127 collections/videocollection.cpp:211 -#: collections/winecollection.cpp:115 -msgid "Comments" -msgstr "MegjegyzĂ©sek" - -#: collections/stampcollection.cpp:27 -msgid "Stamps" -msgstr "BĂ©lyegek" - -#: collections/stampcollection.cpp:28 -msgid "My Stamps" -msgstr "BĂ©lyegeim" - -#: collections/filecatalog.cpp:46 collections/gamecollection.cpp:87 -#: collections/stampcollection.cpp:45 entryupdater.cpp:187 fetchdialog.cpp:143 -msgid "Description" -msgstr "LeĂ­rĂĄs" - -#: collections/coincollection.cpp:51 collections/stampcollection.cpp:51 -msgid "Denomination" -msgstr "NĂ©vĂ©rtĂ©k" - -#: collections/stampcollection.cpp:62 -msgid "Issue Year" -msgstr "KiadĂĄs Ă©ve" - -#: collections/stampcollection.cpp:67 collections/videocollection.cpp:173 -msgid "Color" -msgstr "SzĂ­nes" - -#: collections/stampcollection.cpp:72 -msgid "Scott#" -msgstr "ÉpsĂ©g" - -#: collections/stampcollection.cpp:79 -msgid "" -"_: Stamp grade levels - Superb,Extremely Fine,Very Fine,Fine,Average,Poor\n" -"Superb,Extremely Fine,Very Fine,Fine,Average,Poor" -msgstr "KĂ­vĂĄlĂł,Igen nagyszerƱ,MeglehetƑsen nagyszerƱ,NagyszerƱ,Átlagos,Gyenge" - -#: collections/coincollection.cpp:88 collections/stampcollection.cpp:81 -msgid "Grade" -msgstr "Fajta" - -#: collections/stampcollection.cpp:86 -msgid "Cancelled" -msgstr "LepecsĂ©telt" - -#: collections/stampcollection.cpp:90 -msgid "Hinged" -msgstr "Fogazott" - -#: collections/stampcollection.cpp:95 -msgid "Centering" -msgstr "KözĂ©psƑ" - -#: collections/stampcollection.cpp:100 -msgid "Gummed" -msgstr "Enyvezett hĂĄtĂș" - -#: collections/cardcollection.cpp:92 collections/coincollection.cpp:112 -#: collections/stampcollection.cpp:114 collections/winecollection.cpp:89 -msgid "Location" -msgstr "Hely" - -#: collections/stampcollection.cpp:124 field.cpp:452 -msgid "Image" -msgstr "KĂ©p" - -#: collections/coincollection.cpp:26 -msgid "Coins" -msgstr "ÉrmĂ©k" - -#: collections/coincollection.cpp:27 -msgid "My Coins" -msgstr "ÉrmĂ©im" - -#: collections/coincollection.cpp:45 collections/winecollection.cpp:69 -msgid "Type" -msgstr "TĂ­pus" - -#: collections/bibtexcollection.cpp:146 collections/cardcollection.cpp:67 -#: collections/coincollection.cpp:56 collections/musiccollection.cpp:63 -msgid "Year" -msgstr "Év" - -#: collections/coincollection.cpp:61 -msgid "Mint Mark" -msgstr "PĂ©nzverde jele" - -#: collections/coincollection.cpp:73 -msgid "Coin Set" -msgstr "Érme sorozat" - -#: collections/coincollection.cpp:83 -msgid "" -"_: Coin grade levels - Proof-65,Proof-60,Mint State-65,Mint State-60,Almost " -"Uncirculated-55,Almost Uncirculated-50,Extremely Fine-40,Very Fine-30,Very " -"Fine-20,Fine-12,Very Good-8,Good-4,Fair\n" -"Proof-65,Proof-60,Mint State-65,Mint State-60,Almost Uncirculated-55,Almost " -"Uncirculated-50,Extremely Fine-40,Very Fine-30,Very Fine-20,Fine-12,Very " -"Good-8,Good-4,Fair" -msgstr "" - -#: collections/coincollection.cpp:96 -msgid "" -"_: Coin grading services - PCGS,NGC,ANACS,ICG,ASA,PCI\n" -"PCGS,NGC,ANACS,ICG,ASA,PCI" -msgstr "PCGS,NGC,ANACS,ICG,ASA,PCI" - -#: collections/coincollection.cpp:98 -msgid "Grading Service" -msgstr "OsztĂĄlyozĂĄs" - -#: collections/coincollection.cpp:122 -msgid "Obverse" -msgstr "Fej" - -#: collections/coincollection.cpp:125 -msgid "Reverse" -msgstr "IrĂĄs" - -#: collections/bookcollection.cpp:28 -msgid "Books" -msgstr "Könyvek" - -#: collections/bookcollection.cpp:29 -msgid "My Books" -msgstr "Könyveim" - -#: collections/bibtexcollection.cpp:80 collections/bookcollection.cpp:51 -msgid "Author" -msgstr "SzerzƑ" - -#: collections/bookcollection.cpp:58 translators/alexandriaimporter.cpp:120 -msgid "Hardback" -msgstr "KemĂ©ny tĂĄbla" - -#: collections/bookcollection.cpp:58 -msgid "Paperback" -msgstr "KartonĂĄlt" - -#: collections/bookcollection.cpp:58 -msgid "Trade Paperback" -msgstr "PapĂ­rtĂĄbla" - -#: collections/bookcollection.cpp:59 -msgid "E-Book" -msgstr "E-könyv" - -#: collections/bookcollection.cpp:59 -msgid "Magazine" -msgstr "ÚjsĂĄg" - -#: collections/bibtexcollection.cpp:158 collections/bookcollection.cpp:59 -msgid "Journal" -msgstr "FolyĂłirat" - -#: collections/bookcollection.cpp:60 -msgid "Binding" -msgstr "KötĂ©szet" - -#: collections/bookcollection.cpp:86 -msgid "Copyright Year" -msgstr "Copyright Ă©ve" - -#: collections/bookcollection.cpp:96 translators/grs1importer.cpp:57 -#: translators/risimporter.cpp:255 -msgid "ISBN#" -msgstr "ISBN#" - -#: collections/bookcollection.cpp:98 translators/grs1importer.cpp:59 -#: translators/risimporter.cpp:259 -msgid "International Standard Book Number" -msgstr "International Standard Book Number" - -#: collections/bookcollection.cpp:101 -msgid "LCCN#" -msgstr "LCCN#" - -#: collections/bookcollection.cpp:103 -msgid "Library of Congress Control Number" -msgstr "Library of Congress Control Number" - -#: collections/bookcollection.cpp:132 -msgid "Series Number" -msgstr "SorozatszĂĄm" - -#: collections/bookcollection.cpp:137 mainwindow.cpp:191 -msgid "New" -msgstr "Új" - -#: collections/bookcollection.cpp:137 -msgid "Used" -msgstr "HasznĂĄlt" - -#: collections/bookcollection.cpp:146 -msgid "Read" -msgstr "Olvasva" - -#: collections/bookcollection.cpp:158 collections/musiccollection.cpp:82 -#: collections/winecollection.cpp:103 field.cpp:456 -msgid "Rating" -msgstr "ÉrtĂ©kelĂ©s" - -#: collections/filecatalog.cpp:26 -msgid "My Files" -msgstr "FĂĄjljaim" - -#: borrowerdialog.cpp:48 collections/filecatalog.cpp:37 -msgid "Name" -msgstr "NĂ©v" - -#: collections/filecatalog.cpp:42 field.cpp:450 -#: translators/gcfilmsimporter.cpp:52 translators/risimporter.cpp:261 -msgid "URL" -msgstr "URL" - -#: collections/bibtexcollection.cpp:202 collections/filecatalog.cpp:51 -msgid "Volume" -msgstr "Kötet" - -#: collections/filecatalog.cpp:56 -msgid "Mimetype" -msgstr "Mime tĂ­pus" - -#: collections/filecatalog.cpp:61 -msgid "Size" -msgstr "MĂ©ret" - -#: collections/filecatalog.cpp:65 -msgid "Permissions" -msgstr "JogosultsĂĄgok" - -#: collections/filecatalog.cpp:70 -msgid "Owner" -msgstr "Tulajdonos" - -#: collections/filecatalog.cpp:75 -msgid "Group" -msgstr "Csoport" - -#: collections/filecatalog.cpp:81 -msgid "Created" -msgstr "LĂ©trehozva" - -#: collections/filecatalog.cpp:85 -msgid "Modified" -msgstr "MĂłdosĂ­tva" - -#: collections/filecatalog.cpp:89 -msgid "Meta Info" -msgstr "Meta informĂĄciĂł" - -#: collectionfieldsdialog.cpp:835 collections/filecatalog.cpp:91 -msgid "Property" -msgstr "TulajdonsĂĄg" - -#: collectionfieldsdialog.cpp:835 collections/filecatalog.cpp:92 -msgid "Value" -msgstr "ÉrtĂ©k" - -#: collections/filecatalog.cpp:95 -msgid "Icon" -msgstr "Ikon" - -#: collections/winecollection.cpp:26 -msgid "Wines" -msgstr "Borok" - -#: collections/winecollection.cpp:27 -msgid "My Wines" -msgstr "Boraim" - -#: collections/videocollection.cpp:116 collections/winecollection.cpp:44 -msgid "Producer" -msgstr "ElƑállĂ­tĂł" - -#: collections/winecollection.cpp:50 -msgid "Appellation" -msgstr "ElnevezĂ©s" - -#: collections/winecollection.cpp:56 -msgid "Varietal" -msgstr "VĂĄltozat" - -#: collections/winecollection.cpp:62 -msgid "Vintage" -msgstr "ÉvjĂĄrat" - -#: collections/winecollection.cpp:68 -msgid "Red Wine" -msgstr "Vörös bor" - -#: collections/winecollection.cpp:68 -msgid "White Wine" -msgstr "FehĂ©r bor" - -#: collections/winecollection.cpp:68 -msgid "Sparkling Wine" -msgstr "PezsgƑ bor" - -#: collections/cardcollection.cpp:106 collections/winecollection.cpp:94 -msgid "Quantity" -msgstr "MennyisĂ©g" - -#: collections/winecollection.cpp:98 -msgid "Drink By" -msgstr "KostĂłlta" - -#: collections/winecollection.cpp:112 -msgid "Label Image" -msgstr "CĂ­mke" - -#: collections/videocollection.cpp:20 fetch/animenfofetcher.cpp:268 -msgid "Other People" -msgstr "KĂ©szĂ­tƑk" - -#: collections/videocollection.cpp:21 fetch/animenfofetcher.cpp:274 -msgid "Features" -msgstr "JellemzƑk" - -#: collections/videocollection.cpp:28 -msgid "Videos" -msgstr "Filmek" - -#: collections/videocollection.cpp:29 -msgid "My Videos" -msgstr "VideĂłim" - -#: collections/musiccollection.cpp:45 collections/videocollection.cpp:47 -msgid "DVD" -msgstr "DVD" - -#: collections/videocollection.cpp:47 -msgid "VHS" -msgstr "VHS" - -#: collections/videocollection.cpp:47 -msgid "VCD" -msgstr "VCD" - -#: collections/videocollection.cpp:47 -msgid "DivX" -msgstr "DivX" - -#: collections/musiccollection.cpp:46 collections/videocollection.cpp:48 -msgid "Medium" -msgstr "MĂ©dium" - -#: collections/videocollection.cpp:53 -msgid "Production Year" -msgstr "KiadĂĄs Ă©ve" - -#: collections/videocollection.cpp:61 -msgid "" -"_: Movie ratings - G (USA),PG (USA),PG-13 (USA),R (USA), U (USA)\n" -"G (USA),PG (USA),PG-13 (USA),R (USA), U (USA)" -msgstr "KN, 12, 16, 18" - -#: collections/videocollection.cpp:63 -msgid "Certification" -msgstr "OsztĂĄlyozĂĄs" - -#: collections/videocollection.cpp:75 -msgid "Region 1" -msgstr "1 rĂ©giĂł" - -#: collections/videocollection.cpp:76 -msgid "Region 2" -msgstr "2 rĂ©giĂł" - -#: collections/videocollection.cpp:77 -msgid "Region 3" -msgstr "3 rĂ©giĂł" - -#: collections/videocollection.cpp:78 -msgid "Region 4" -msgstr "4 rĂ©giĂł" - -#: collections/videocollection.cpp:79 -msgid "Region 5" -msgstr "5 rĂ©giĂł" - -#: collections/videocollection.cpp:80 -msgid "Region 6" -msgstr "6 rĂ©giĂł" - -#: collections/videocollection.cpp:81 -msgid "Region 7" -msgstr "7 rĂ©giĂł" - -#: collections/videocollection.cpp:82 -msgid "Region 8" -msgstr "8 rĂ©giĂł" - -#: collections/videocollection.cpp:83 -msgid "Region" -msgstr "RĂ©giĂł" - -#: collections/videocollection.cpp:88 -msgid "Nationality" -msgstr "NemzetisĂ©g" - -#: collections/videocollection.cpp:95 -msgid "NTSC" -msgstr "NTSC" - -#: collections/videocollection.cpp:95 -msgid "PAL" -msgstr "PAL" - -#: collections/videocollection.cpp:95 -msgid "SECAM" -msgstr "SECAM" - -#: collections/videocollection.cpp:96 -msgid "Format" -msgstr "FormĂĄtum" - -#: collections/videocollection.cpp:101 -msgid "Cast" -msgstr "SzereposztĂĄs" - -#: collections/videocollection.cpp:103 translators/tellicoimporter.cpp:405 -msgid "Actor/Actress" -msgstr "SzĂ­nĂ©sz/nƑ" - -#: collections/videocollection.cpp:104 translators/tellicoimporter.cpp:406 -msgid "Role" -msgstr "Szerep" - -#: collections/videocollection.cpp:107 -msgid "A table for the cast members, along with the roles they play" -msgstr "A szereplƑk tĂĄblĂĄzata az eljĂĄtszott szerepekkel" - -#: collections/videocollection.cpp:110 -msgid "Director" -msgstr "RendezƑ" - -#: collections/videocollection.cpp:128 -msgid "Composer" -msgstr "ZeneszerzƑ" - -#: collections/videocollection.cpp:134 -msgid "Studio" -msgstr "StĂșdiĂł" - -#: collections/videocollection.cpp:140 -msgid "Language Tracks" -msgstr "Nyelvek" - -#: collections/videocollection.cpp:146 -msgid "Subtitle Languages" -msgstr "FelĂ­ratok nyelve" - -#: collections/videocollection.cpp:152 -msgid "Audio Tracks" -msgstr "HangsĂĄvok" - -#: collections/videocollection.cpp:158 -msgid "Running Time" -msgstr "JĂĄtĂ©kidƑ" - -#: collections/videocollection.cpp:160 -msgid "The running time of the video (in minutes)" -msgstr "Video jĂĄtĂ©kideje (percben)" - -#: collections/videocollection.cpp:163 -msgid "Aspect Ratio" -msgstr "KĂ©parĂĄny" - -#: collections/videocollection.cpp:168 translators/tellicoimporter.cpp:886 -msgid "Widescreen" -msgstr "SzĂ©lesvĂĄsznĂș" - -#: collections/videocollection.cpp:173 -msgid "Black & White" -msgstr "Fekete - fehĂ©r" - -#: collections/videocollection.cpp:174 -msgid "Color Mode" -msgstr "SzĂ­n" - -#: collections/videocollection.cpp:179 -msgid "Director's Cut" -msgstr "RendezƑ hĂșzĂĄsa" - -#: collections/videocollection.cpp:183 fetch/ibsfetcher.cpp:343 -msgid "Plot Summary" -msgstr "Tartalom összefoglalĂłja" - -#: collections/gamecollection.cpp:90 collections/videocollection.cpp:186 -msgid "Personal Rating" -msgstr "SzemĂ©lyes Ă©rtĂ©kelĂ©s" - -#: collections/gamecollection.cpp:116 collections/musiccollection.cpp:109 -#: collections/videocollection.cpp:208 -msgid "Cover" -msgstr "FedĂ©l" - -#: collections/gamecollection.cpp:26 -msgid "Games" -msgstr "JĂĄtĂ©kok" - -#: collections/gamecollection.cpp:27 -msgid "My Games" -msgstr "JĂĄtĂ©kaim" - -#: collections/gamecollection.cpp:45 -msgid "Xbox" -msgstr "Xbox" - -#: collections/gamecollection.cpp:45 -msgid "PlayStation2" -msgstr "PlayStation2" - -#: collections/gamecollection.cpp:45 -msgid "PlayStation" -msgstr "PlayStation" - -#: collections/gamecollection.cpp:45 -msgid "" -"_: PlayStation Portable\n" -"PSP" -msgstr "PSP" - -#: collections/gamecollection.cpp:46 -msgid "Nintendo DS" -msgstr "Nintendo DS" - -#: collections/gamecollection.cpp:46 -msgid "GameCube" -msgstr "GameCube" - -#: collections/gamecollection.cpp:46 -msgid "Dreamcast" -msgstr "Dreamcast" - -#: collections/gamecollection.cpp:47 -msgid "Game Boy Advance" -msgstr "Game Boy Advance" - -#: collections/gamecollection.cpp:47 -msgid "Game Boy Color" -msgstr "Game Boy Color" - -#: collections/gamecollection.cpp:47 -msgid "Game Boy" -msgstr "Game Boy" - -#: collections/gamecollection.cpp:48 -msgid "" -"_: Windows Platform\n" -"Windows" -msgstr "Windows" - -#: collections/gamecollection.cpp:48 -msgid "Mac OS" -msgstr "Mac OS" - -#: collections/gamecollection.cpp:49 -msgid "Platform" -msgstr "Platform" - -#: collections/gamecollection.cpp:60 -msgid "Release Year" -msgstr "KiadĂĄs Ă©ve" - -#: collections/gamecollection.cpp:71 -msgid "Developer" -msgstr "FejlesztƑ" - -#: collections/gamecollection.cpp:80 -msgid "" -"_: Video game ratings - Unrated, Adults Only, Mature, Teen, Everyone, Early " -"Childhood, Pending\n" -"Unrated, Adults Only, Mature, Teen, Everyone, Early Childhood, Pending" -msgstr "" -"KategĂłria nĂ©lkĂŒli, FelnƑtt, TinĂ©dszer, Mindenki, Kisgyermek, Nem " -"eldöntött" - -#: collections/gamecollection.cpp:82 -msgid "ESRB Rating" -msgstr "ÉrtĂ©kelĂ©s" - -#: collections/gamecollection.cpp:95 -msgid "Completed" -msgstr "Befejezve" - -#: collections/cardcollection.cpp:26 -msgid "Cards" -msgstr "KĂĄrtyĂĄk" - -#: collections/cardcollection.cpp:27 -msgid "My Cards" -msgstr "KĂĄrtya gyƱjtemĂ©nyem" - -#: collections/cardcollection.cpp:44 -msgid "Player" -msgstr "JĂĄtĂ©kos" - -#: collections/cardcollection.cpp:50 -msgid "Team" -msgstr "Csapat" - -#: collections/cardcollection.cpp:56 -msgid "Brand" -msgstr "Fajta" - -#: collections/cardcollection.cpp:63 -msgid "Card Number" -msgstr "KĂĄrtyaszĂĄm" - -#: collections/cardcollection.cpp:78 -msgid "Card Type" -msgstr "KĂĄrtya tĂ­pusa" - -#: collections/cardcollection.cpp:110 -msgid "Front Image" -msgstr "ElƑlap" - -#: collections/cardcollection.cpp:113 -msgid "Back Image" -msgstr "HĂĄtlap" - -#: collections/bibtexcollection.cpp:30 -msgid "Entries" -msgstr "BejegyzĂ©sek" - -#: collectionfactory.cpp:118 collections/bibtexcollection.cpp:31 -msgid "Bibliography" -msgstr "BibliogrĂĄfia" - -#: collections/bibtexcollection.cpp:73 -msgid "Entry Type" -msgstr "BejegyzĂ©s tĂ­pusa" - -#: collections/bibtexcollection.cpp:77 -msgid "These entry types are specific to bibtex. See the bibtex documentation." -msgstr "Ez a bejegyzĂ©s tĂ­pus bibtex formĂĄtumĂș. LĂĄsd a bibtex dokumentĂĄciĂłt." - -#: collections/bibtexcollection.cpp:87 -msgid "Bibtex Key" -msgstr "Bibtex kulcs" - -#: collections/bibtexcollection.cpp:93 -msgid "Book Title" -msgstr "Könyv cĂ­me" - -#: collections/bibtexcollection.cpp:99 -msgid "Editor" -msgstr "SzerkesztƑ" - -#: collections/bibtexcollection.cpp:106 -msgid "Organization" -msgstr "Szervezet" - -#: collections/bibtexcollection.cpp:128 fetch/srufetcher.cpp:393 -#: fetch/z3950fetcher.cpp:593 -msgid "Address" -msgstr "PostacĂ­m" - -#: collections/bibtexcollection.cpp:167 -msgid "Month" -msgstr "HĂłnap" - -#: collections/bibtexcollection.cpp:173 field.cpp:449 -msgid "Number" -msgstr "SzĂĄm" - -#: collections/bibtexcollection.cpp:178 -msgid "How Published" -msgstr "KiadĂĄs mĂłdja" - -#: collections/bibtexcollection.cpp:190 -msgid "Chapter" -msgstr "Fejezet" - -#: collections/bibtexcollection.cpp:207 -msgid "Cross-Reference" -msgstr "Keresztreferencia" - -#: collections/bibtexcollection.cpp:217 -msgid "Notes" -msgstr "MegjegyzĂ©sek" - -#: collections/musiccollection.cpp:26 -msgid "