aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/ssh:/git@git.mageia.org
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-11-20 00:15:48 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-11-20 00:15:48 -0500
commit615570707109d139b1c85643bee6bf7ad200850b (patch)
treee9e35563ac5a354c357675e87d01cb2646b62e85 /phpBB/phpbb/install/ssh:/git@git.mageia.org
parent2359d1e2686930e4fd375a9b7cfe68be4666943b (diff)
parent87953628798c819c1436228f213d8528b89586cd (diff)
downloadforums-615570707109d139b1c85643bee6bf7ad200850b.tar
forums-615570707109d139b1c85643bee6bf7ad200850b.tar.gz
forums-615570707109d139b1c85643bee6bf7ad200850b.tar.bz2
forums-615570707109d139b1c85643bee6bf7ad200850b.tar.xz
forums-615570707109d139b1c85643bee6bf7ad200850b.zip
Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympus
* callumacrae/ticket/10402: [ticket/10402] Fixed a formatting issue with report details.
Diffstat (limited to 'phpBB/phpbb/install/ssh:/git@git.mageia.org')
0 files changed, 0 insertions, 0 deletions
>Makefile.PL0
-rw-r--r--URPM.pm2
-rw-r--r--URPM.xs2
-rw-r--r--URPM/Build.pm2
-rw-r--r--URPM/Query.pm2
-rw-r--r--URPM/Resolve.pm4
-rw-r--r--t/parse.t2
-rw-r--r--t/test-rpm.spec2
8 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 0308b27..0308b27 100644..100755
--- a/Makefile.PL
+++ b/Makefile.PL
diff --git a/URPM.pm b/URPM.pm
index f94ab99..8bdfb2b 100644
--- a/URPM.pm
+++ b/URPM.pm
@@ -774,7 +774,7 @@ Expands the specified macro.
Define a macro. For example,
- URPM::add_macro("vendor Mandriva");
+ URPM::add_macro("vendor Mageia");
my $vendor = URPM::expand("%vendor");
The 'noexpand' version doesn't expand literal newline characters in the
diff --git a/URPM.xs b/URPM.xs
index ff6af0f..cbdc975 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -5,7 +5,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the same terms as Perl itself.
*
- * $Id$
+ * $Id: URPM.xs 259125 2009-08-10 14:37:07Z cfergeau $
*
*/
#include "EXTERN.h"
diff --git a/URPM/Build.pm b/URPM/Build.pm
index 042e4c9..f298707 100644
--- a/URPM/Build.pm
+++ b/URPM/Build.pm
@@ -1,6 +1,6 @@
package URPM;
-# $Id$
+# $Id: Build.pm 270395 2010-07-30 00:55:59Z nanardon $
use strict;
use warnings;
diff --git a/URPM/Query.pm b/URPM/Query.pm
index 6f58552..14256a4 100644
--- a/URPM/Query.pm
+++ b/URPM/Query.pm
@@ -6,7 +6,7 @@ use warnings;
# Olivier Thauvin <thauvin@aerov.jussieu.fr>
# This package extend URPM functions to permit
# URPM low level query on rpm header
-# $Id$
+# $Id: Query.pm 270395 2010-07-30 00:55:59Z nanardon $
# tag2id
# INPUT array of rpm tag name
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 4090313..b82b45b 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -2,7 +2,7 @@ package URPM;
#package URPM::Resolve;
#use URPM;
-# $Id$
+# $Id: Resolve.pm 270395 2010-07-30 00:55:59Z nanardon $
use strict;
use warnings;
@@ -19,7 +19,7 @@ sub find(&@) {
undef;
}
-#- property2name* functions below parse things like "mandriva-release[>= 2008.1]"
+#- property2name* functions below parse things like "mageia-release[>= 1]"
#- which is the format returned by URPM.xs for ->requires, ->provides, ->conflicts...
sub property2name {
$_[0] =~ /^([^\s\[]*)/ && $1;
diff --git a/t/parse.t b/t/parse.t
index cc9d3ba..148e788 100644
--- a/t/parse.t
+++ b/t/parse.t
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id$
+# $Id: parse.t 258553 2009-07-22 18:21:30Z peroyvind $
use strict;
use warnings;
diff --git a/t/test-rpm.spec b/t/test-rpm.spec
index cf13203..c18f505 100644
--- a/t/test-rpm.spec
+++ b/t/test-rpm.spec
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: test-rpm.spec 258552 2009-07-22 18:19:56Z peroyvind $
# prevent distepoch & disttag to be added and appended to package filename
%undefine distepoch