headers
VMiklos | 8 Jul 2007 21:46
Picon
Gravatar

pacman-tools: dg: fix for 'adding excluded deleted files to commit'

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=900080cd6e7fa8cb1e12398d1a701b0d8cd37247

commit 900080cd6e7fa8cb1e12398d1a701b0d8cd37247
Author: VMiklos <vmiklos@...>
Date:   Sun Jul 8 21:45:37 2007 +0200

dg: fix for 'adding excluded deleted files to commit'
fix for the following problem:
you do a dg rm dir1/foo then a dg rec dir2, then dir1/foo gets included in the
commit
note: just doing an rm dir1/foo is not affected

diff --git a/darcs-git.py b/darcs-git.py
index 791e569..507b6da 100755
--- a/darcs-git.py
+++ b/darcs-git.py
 <at>  <at>  -314,7 +314,7  <at>  <at>  Options:
newlist.append(diff2filename(lines[0]))
for i in newlist:
os.system("git reset HEAD %s" % i)
-	os.system("git commit -m '%s' %s" % (options.name, options.edit))
+	os.system("git commit -m '%s' %s %s" % (options.name, options.edit, options.files))
# readd the uncommitted new files
for i in newlist:
os.system("git add %s" % i)
Permalink | Reply | 0 comments |
headers
VMiklos | 8 Jul 2007 21:58
Picon
Gravatar

pacman-tools: dg: fix for patch names containing ' or "

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=80a6fb5ca59f7f2839c0e7fcf8a6c3426adad48e

commit 80a6fb5ca59f7f2839c0e7fcf8a6c3426adad48e
Author: VMiklos <vmiklos@...>
Date:   Sun Jul 8 21:57:55 2007 +0200

dg: fix for patch names containing ' or "
thanks priyank :)

diff --git a/darcs-git.py b/darcs-git.py
index 200f375..4e4c935 100755
--- a/darcs-git.py
+++ b/darcs-git.py
 <at>  <at>  -295,7 +295,8  <at>  <at>  Options:
# patch. support this
os.system("git ls-files -z --deleted | git update-index -z --remove --stdin")
if first or merge or options.all:
-		os.system("git commit -a -m '%s' %s %s" % (options.name, options.edit, options.files))
+		os.system("""git commit -a -m "%s" %s %s""" %
+				(options.name.replace('"', r'\"'), options.edit, options.files))
sys.exit(0)
for i in status.hunks:
p = []
 <at>  <at>  -314,7 +315,8  <at>  <at>  Options:
newlist.append(diff2filename(lines[0]))
for i in newlist:
os.system("git reset HEAD %s" % i)
-	os.system("git commit -m '%s' %s %s" % (options.name, options.edit, options.files))
+	os.system("""git commit -m "%s" %s %s""" %
+			(options.name.replace('"', r'\"'), options.edit, options.files))
(Continue reading)

Permalink | Reply | 0 comments |
headers
VMiklos | 8 Jul 2007 22:54
Picon
Gravatar

pacman-tools: dg: support for dir/file in rev -a

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=d8f715589a8b55851822e98718cf6f6b5b0d2e6d

commit d8f715589a8b55851822e98718cf6f6b5b0d2e6d
Author: VMiklos <vmiklos@...>
Date:   Sun Jul 8 22:54:49 2007 +0200

dg: support for dir/file in rev -a

diff --git a/darcs-git.py b/darcs-git.py
index 4e4c935..042944a 100755
--- a/darcs-git.py
+++ b/darcs-git.py
 <at>  <at>  -380,7 +380,7  <at>  <at>  Options:
print "There are no changes to revert!"
sys.exit(0)
if options.all:
-		os.system("git checkout -f")
+		os.system("git checkout %s" % options.files)
print "Finished reverting."
sys.exit(0)
status = scan_dir(options.files)
Permalink | Reply | 0 comments |
headers
VMiklos | 8 Jul 2007 23:24
Picon
Gravatar

frugalware-current: eh

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=02328171bcb0bae2512e6ca2c46fea5b41c9f45a

commit 02328171bcb0bae2512e6ca2c46fea5b41c9f45a
Author: VMiklos <vmiklos@...>
Date:   Sun Jul 8 22:30:11 2007 +0200

eh

diff --git a/source/network-extra/awstats/awstats-6.8-fw.patch b/source/network-extra/awstats/awstats-6.8-fw.patch
new file mode 100644
index 0000000..01b18bd
--- /dev/null
+++ b/source/network-extra/awstats/awstats-6.8-fw.patch
 <at>  <at>  -0,0 +1,141  <at>  <at> 
+diff -urN awstats-6.4/tools/awstats_buildstaticpages.pl awstats-6.4_fw/tools/awstats_buildstaticpages.pl
+--- awstats-6.4/tools/awstats_buildstaticpages.pl	2005-02-20 17:11:06.000000000 +0100
++++ awstats-6.4_fw/tools/awstats_buildstaticpages.pl	2005-08-25 14:21:58.045625424 +0200
+ <at>  <at>  -293,8 +293,8  <at>  <at> 
+ # Check if AWSTATS prog is found
+ my $AwstatsFound=0;
+ if (-s "$Awstats") { $AwstatsFound=1; }
+-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
+-	$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
++elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") {
++	$Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl";
+ 	$AwstatsFound=1;
+ }
+ if (! $AwstatsFound) {
+diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_configure.pl
+--- awstats-6.4/tools/awstats_configure.pl	2005-01-15 23:42:58.000000000 +0100
(Continue reading)

Permalink | Reply | 0 comments |
headers
VMiklos | 8 Jul 2007 23:24
Picon
Gravatar

frugalware-current: stellarium-0.9.0-1-i686

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b404f0003a3398bdd8041de85a6d1eb38226343b

commit b404f0003a3398bdd8041de85a6d1eb38226343b
Author: VMiklos <vmiklos@...>
Date:   Sun Jul 8 23:24:09 2007 +0200

stellarium-0.9.0-1-i686
version bump

diff --git a/source/xapps-extra/stellarium/FrugalBuild b/source/xapps-extra/stellarium/FrugalBuild
index 4791ce9..15ae58e 100644
--- a/source/xapps-extra/stellarium/FrugalBuild
+++ b/source/xapps-extra/stellarium/FrugalBuild
 <at>  <at>  -3,16 +3,26  <at>  <at> 
# Contributor: Mcklaren <mcklaren@...>

pkgname=stellarium
-pkgver=0.8.2
+pkgver=0.9.0
pkgrel=1
pkgdesc="A free open source planetarium for your computer."
_F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://www.stellarium.org/"
-depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2')
+depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'boost' 'libjpeg' 'qt4')
license="GPL"
groups=('xapps-extra')
archs=('i686')
-sha1sums=('f5721df4cd64ad1673d10a56e340d3d96d4827dd')
(Continue reading)

Permalink | Reply | 0 comments |
headers
janny | 8 Jul 2007 23:36
Picon

frugalware-current: perl-carp-clan-5.9-1-i686

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e254554fec1299e62d25e88b71df71cb63fb8a95

commit e254554fec1299e62d25e88b71df71cb63fb8a95
Author: janny <janny@...>
Date:   Sun Jul 8 23:36:16 2007 +0200

perl-carp-clan-5.9-1-i686
new package

diff --git a/source/devel-extra/perl-carp-clan/FrugalBuild b/source/devel-extra/perl-carp-clan/FrugalBuild
new file mode 100644
index 0000000..e0c618f
--- /dev/null
+++ b/source/devel-extra/perl-carp-clan/FrugalBuild
 <at>  <at>  -0,0 +1,10  <at>  <at> 
+# Compiling Time: 0.1 SBU
+# Maintainer: Janny <janny@...>
+
+_F_perl_name=Carp-Clan
+_F_perl_author=J/JJ/JJORE
+pkgver=5.9
+pkgdesc="Report errors from perspective of caller of a "clan" of modules"
+depends=('')
+Finclude perl
+sha1sums=('d6058647c8ee80cb978a2c11896d04faede6c33d')
Permalink | Reply | 0 comments |
headers
janny | 8 Jul 2007 23:48
Picon

frugalware-current: perl-bit-vector-6.4-1-i686

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ad19fe39d3c2a3a3a560873a74475bf4e01631c1

commit ad19fe39d3c2a3a3a560873a74475bf4e01631c1
Author: janny <janny@...>
Date:   Sun Jul 8 23:46:49 2007 +0200

perl-bit-vector-6.4-1-i686
new package

diff --git a/source/devel-extra/perl-bit-vector/FrugalBuild b/source/devel-extra/perl-bit-vector/FrugalBuild
new file mode 100644
index 0000000..ee424a5
--- /dev/null
+++ b/source/devel-extra/perl-bit-vector/FrugalBuild
 <at>  <at>  -0,0 +1,12  <at>  <at> 
+# Compiling Time: 0.1 SBU
+# Maintainer: Janny <janny@...>
+
+_F_perl_name=Bit-Vector
+_F_perl_author=S/ST/STBEY
+pkgver=6.4
+pkgdesc="Efficient bit vector, set of integers and "big int" math library"
+depends=('')
+Finclude perl
+sha1sums=('f6ce6d7f791c24dc6195a241ec6183cbf335cb03')
+
+# optimization OK
Permalink | Reply | 0 comments |
headers
janny | 8 Jul 2007 23:48
Picon

frugalware-current: perl-bit-vector-6.4-1-i686

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4c686a24c1b7810133527969aac57dc601ab9c6e

commit 4c686a24c1b7810133527969aac57dc601ab9c6e
Author: janny <janny@...>
Date:   Sun Jul 8 23:47:56 2007 +0200

perl-bit-vector-6.4-1-i686
new package

diff --git a/source/devel-extra/perl-bit-vector/FrugalBuild b/source/devel-extra/perl-bit-vector/FrugalBuild
index ee424a5..7848f41 100644
--- a/source/devel-extra/perl-bit-vector/FrugalBuild
+++ b/source/devel-extra/perl-bit-vector/FrugalBuild
 <at>  <at>  -4,7 +4,7  <at>  <at> 
_F_perl_name=Bit-Vector
_F_perl_author=S/ST/STBEY
pkgver=6.4
-pkgdesc="Efficient bit vector, set of integers and "big int" math library"
+pkgdesc="Efficient bit vector, set of integers and big int math library"
depends=('')
Finclude perl
sha1sums=('f6ce6d7f791c24dc6195a241ec6183cbf335cb03')
Permalink | Reply | 0 comments |
headers
janny | 8 Jul 2007 23:56
Picon

frugalware-current: perl-date-calc-5.4-1-i686

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0b0a3985fb9e23639dcc25e0f5863e8d11c0c697

commit 0b0a3985fb9e23639dcc25e0f5863e8d11c0c697
Author: janny <janny@...>
Date:   Sun Jul 8 23:56:28 2007 +0200

perl-date-calc-5.4-1-i686
new package

diff --git a/source/devel-extra/perl-date-calc/FrugalBuild b/source/devel-extra/perl-date-calc/FrugalBuild
new file mode 100644
index 0000000..bbb4b89
--- /dev/null
+++ b/source/devel-extra/perl-date-calc/FrugalBuild
 <at>  <at>  -0,0 +1,12  <at>  <at> 
+# Compiling Time: 0.1 SBU
+# Maintainer: Zsolt Szalai <xbit@...>
+
+_F_perl_name=Date-Calc
+_F_perl_author=S/ST/STBEY
+pkgver=5.4
+pkgdesc="Gregorian calendar date calculations"
+depends=('perl-carp-clan>=5.3' 'perl-bit-vector>=6.4')
+Finclude perl
+sha1sums=('630dfca054aaebd4535e2251c2c5c20d625f3f94')
+
+# optimization OK
Permalink | Reply | 0 comments |
headers
CSÉCSY László | 9 Jul 2007 00:11
Picon
Gravatar

frugalware-current: workaround a dg bug <at> awstats

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c5365746c090155291e5246872a335198bbba3b6

commit c5365746c090155291e5246872a335198bbba3b6
Author: CSÉCSY László <boobaa@...>
Date:   Mon Jul 9 00:06:27 2007 +0200

workaround a dg bug  <at>  awstats
looks like dg cannot handle the case when a file is modified after renaming

diff --git a/source/network-extra/awstats/awstats-6.7-fw.patch b/source/network-extra/awstats/awstats-6.7-fw.patch
index 50e9125..e584806 100644
--- a/source/network-extra/awstats/awstats-6.7-fw.patch
+++ b/source/network-extra/awstats/awstats-6.7-fw.patch
 <at>  <at>  -1,6 +1,22  <at>  <at> 
-diff -urN awstats-6.4/tools/awstats_buildstaticpages.pl awstats-6.4_fw/tools/awstats_buildstaticpages.pl
---- awstats-6.4/tools/awstats_buildstaticpages.pl	2005-02-20 17:11:06.000000000 +0100
-+++ awstats-6.4_fw/tools/awstats_buildstaticpages.pl	2005-08-25 14:21:58.045625424 +0200
+diff -Naur awstats-6.7-orig/tools/awstats_buildstaticpages.pl awstats-6.7/tools/awstats_buildstaticpages.pl
+--- awstats-6.7-orig/tools/awstats_buildstaticpages.pl	2006-02-08 22:26:14.000000000 +0100
++++ awstats-6.7/tools/awstats_buildstaticpages.pl	2007-07-07 11:53:09.000000000 +0200
+ <at>  <at>  -127,13 +127,13  <at>  <at> 
+ 	# Check config file in common possible directories :
+ 	# Windows :                   				"$DIR" (same dir than awstats.pl)
+ 	# Standard, Mandrake and Debian package :	"/etc/awstats"
+-	# Other possible directories :				"/usr/local/etc/awstats", "/etc"
++	# Other possible directories :				"/usr/lib/etc/awstats", "/etc"
+ 	# FHS standard, Suse package : 				"/etc/opt/awstats"
+ 	my $configdir=shift;
+ 	my  <at> PossibleConfigDir=();
+
(Continue reading)

Permalink | Reply | 0 comments |

Gmane