[Gsrc-commit] trunk r2494: resolve merge conflict

[Brandon Invergo]

------------------------------------------------------------
revno: 2494 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-27 22:37:25 +0200
message:
  resolve merge conflict
modified:
  gnu/freeipmi/Makefile          makefile-20100615115926-jlf315saroa0r5r0-1
  gnu/freeipmi/sha256sums        sha256sums-20100622072700-tb1c8a2534h3cxpf-2
  gnu/parallel/Makefile          makefile-20100615132438-xb64p24qketcrmw7-1
  gnu/parallel/gpg-keyring       gpgkeyring-20100621163909-udngka8jf020lysj-1
  gnu/parallel/sha256sums        sha256sums-20100621163909-udngka8jf020lysj-2
  gnu/pyconfigure/Makefile       makefile-20130522202048-j3dd94aek1ia29xi-2
  gnu/pyconfigure/sha256sums     sha256sums-20130522202048-j3dd94aek1ia29xi-4

=== modified file 'gnu/freeipmi/Makefile'
--- a/gnu/freeipmi/Makefile     2013-07-17 18:18:28 +0000
+++ b/gnu/freeipmi/Makefile     2013-08-24 15:05:33 +0000
@@ -17,7 +17,7 @@
 
 NAME = FreeIPMI
 GARNAME = freeipmi
-GARVERSION = 1.2.9
+GARVERSION = 1.3.1
 HOME_URL = http://www.gnu.org/software/freeipmi/
 DESCRIPTION = Platform management, including sensor and power monitoring
 define BLURB

=== modified file 'gnu/freeipmi/sha256sums'
--- a/gnu/freeipmi/sha256sums   2013-07-17 18:18:28 +0000
+++ b/gnu/freeipmi/sha256sums   2013-08-24 15:05:33 +0000
@@ -1,2 +1,2 @@
-3a32b0906a8975352f8ccc835862182a71b31d40cc04e8a457f9941ce3235a0e  
download/freeipmi-1.2.9.tar.gz
-45bd71dc198d4a31922b1f546ad8b81110d624ea9b0ec26419da92a4dedf0de7  
download/freeipmi-1.2.9.tar.gz.sig
+5662a1641299066e5233d17d8ed8f65317317757f9f9acb285741f044a1dcd31  
download/freeipmi-1.3.1.tar.gz
+5c1df59465027115d3c16a34b057a2e4399a44284732bff84767f4533e0a5f1b  
download/freeipmi-1.3.1.tar.gz.sig

=== modified file 'gnu/parallel/Makefile'
--- a/gnu/parallel/Makefile     2013-07-22 21:56:51 +0000
+++ b/gnu/parallel/Makefile     2013-08-24 15:08:38 +0000
@@ -17,7 +17,7 @@
 
 NAME = Parallel
 GARNAME = parallel
-GARVERSION = 20130722
+GARVERSION = 20130822
 HOME_URL = http://www.gnu.org/software/parallel/
 DESCRIPTION = Build and execute command lines in parallel
 define BLURB
@@ -32,7 +32,6 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.bz2
 SIGFILES = $(DISTNAME).tar.bz2.sig
-PATCHFILES = $(DISTNAME)-fix-doc-build.diff
 
 BUILDDEPS = 
 LIBDEPS = 

=== modified file 'gnu/parallel/gpg-keyring'
Binary files a/gnu/parallel/gpg-keyring 2010-06-21 16:39:22 +0000 and 
b/gnu/parallel/gpg-keyring        2013-08-24 15:08:38 +0000 differ
=== modified file 'gnu/parallel/sha256sums'
--- a/gnu/parallel/sha256sums   2013-07-22 21:56:51 +0000
+++ b/gnu/parallel/sha256sums   2013-08-24 15:08:38 +0000
@@ -1,3 +1,2 @@
-68185dfe3e94656c680c713f495840edf00bac0e8233e9fe1161f2ae3f99f66b  
download/parallel-20130722.tar.bz2
-66a4e42a9bc32a0e7309ed03fdcbf2dc7c3b0effa0eb5e2d3f7d593de5ba95af  
download/parallel-20130722-fix-doc-build.diff
-6682b41e72097b8a1cb7a0ea5e6576afd3153ab1809c21783e7684557ce49849  
download/parallel-20130722.tar.bz2.sig
+b857c744479fe19137bdbd240dd6205882b31be924c9ce0a0f4566e67e8d25d9  
download/parallel-20130822.tar.bz2
+d51b83cf08f3a6b8379478484b2af03144ec5898f74e917da36288fff0e728a6  
download/parallel-20130822.tar.bz2.sig

=== modified file 'gnu/pyconfigure/Makefile'
--- a/gnu/pyconfigure/Makefile  2013-05-22 20:21:27 +0000
+++ b/gnu/pyconfigure/Makefile  2013-08-23 13:54:18 +0000
@@ -17,7 +17,7 @@
 
 NAME = pyconfigure
 GARNAME = pyconfigure
-GARVERSION = 0.2
+GARVERSION = 0.2.1
 HOME_URL = http://www.gnu.org/software/pyconfigure/
 DESCRIPTION = Configure interface for Python-based packages
 define BLURB

=== modified file 'gnu/pyconfigure/sha256sums'
--- a/gnu/pyconfigure/sha256sums        2013-05-22 20:21:27 +0000
+++ b/gnu/pyconfigure/sha256sums        2013-08-23 13:54:18 +0000
@@ -1,2 +1,2 @@
-c27a3d1ae4fe683b5bf28b4ce864afd18cc93ab663058578fc211b858dbb0629  
download/pyconfigure-0.2.tar.gz
-b2fbc0e35bd4eb722810cf789e7dd807a5be35fd372106a6d3d88faf117d9714  
download/pyconfigure-0.2.tar.gz.sig
+6b5895fe1079d2762e4aed9e089131dc6d522a169c8a1fa07050d2e3ac1350d8  
download/pyconfigure-0.2.1.tar.gz
+d855e0405d142f6ad5822c1728c4460f2839796a81bf0345732254030d7fa1a1  
download/pyconfigure-0.2.1.tar.gz.sig