From 30eacf451b80382e39cac94f7346776eea999b26 Mon Sep 17 00:00:00 2001
From: Mageia SVN-Git Migration <svn-git-migration@mageia.org>
Date: Fri, 4 Feb 2011 13:41:50 +0000
Subject: Synthesized commit during git-svn import combining previous Mandriva
 history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r419 | dmorgan | 2011-02-04 13:41:50 +0000 (Fri, 04 Feb 2011) | 1 line

Import cleaned perl-URPM
------------------------------------------------------------------------
---
 Makefile.PL     | 0
 URPM.pm         | 2 +-
 URPM.xs         | 2 +-
 URPM/Build.pm   | 2 +-
 URPM/Query.pm   | 2 +-
 URPM/Resolve.pm | 4 ++--
 t/parse.t       | 2 +-
 t/test-rpm.spec | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
old mode 100644
new mode 100755
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
-- 
cgit v1.2.1