[SM-Commit] GIT changes to master grimoire by George Sherwood (8008a258f70a3d43c11dde2b6658bf1ec128a8fe)

George Sherwood scm at mail.sourcemage.org
Wed Mar 21 03:18:39 EDT 2007


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 disk/parted/DETAILS   |    2 +-
 disk/parted/HISTORY   |    5 +++++
 disk/parted/PRE_BUILD |    3 ---
 disk/parted/disk.diff |   36 ------------------------------------
 4 files changed, 6 insertions(+), 40 deletions(-)

New commits:
commit 8008a258f70a3d43c11dde2b6658bf1ec128a8fe
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    parted: Updated to version 1.8.6

diff --git a/disk/parted/DETAILS b/disk/parted/DETAILS
index 704d660..2a455ef 100755
--- a/disk/parted/DETAILS
+++ b/disk/parted/DETAILS
@@ -1,5 +1,5 @@
            SPELL=parted
-         VERSION=1.8.3
+         VERSION=1.8.6
           SOURCE=${SPELL}-${VERSION}.tar.bz2
          SOURCE2=${SOURCE}.sig
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/parted/HISTORY b/disk/parted/HISTORY
index a62d598..3de81aa 100644
--- a/disk/parted/HISTORY
+++ b/disk/parted/HISTORY
@@ -1,3 +1,8 @@
+2007-03-21 George Sherwood <george at beernabeer.com>
+	* DETAILS: Updated to version 1.8.6
+	* PRE_BUILD: Removed.  Patch not needed. gparted builds without it.
+	* disk.diff: Removed. Fixed Upstream.
+
 2007-03-17 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: PATCHLEVEL++
 	* PRE_BUILD, disk.diff: add
diff --git a/disk/parted/PRE_BUILD b/disk/parted/PRE_BUILD
deleted file mode 100755
index eaf2edf..0000000
--- a/disk/parted/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-patch  -p1 < $SPELL_DIRECTORY/disk.diff
diff --git a/disk/parted/disk.diff b/disk/parted/disk.diff
deleted file mode 100644
index c367895..0000000
--- a/disk/parted/disk.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr parted-1.8.3/include/parted/disk.h parted-1.8.3.cp/include/parted/disk.h
---- parted-1.8.3/include/parted/disk.h	2007-03-13 18:01:09.000000000 +0100
-+++ parted-1.8.3.cp/include/parted/disk.h	2007-03-17 11:12:54.000000000 +0100
-@@ -27,15 +27,6 @@
- #ifndef PED_DISK_H_INCLUDED
- #define PED_DISK_H_INCLUDED
- 
--typedef enum _PedPartitionType          PedPartitionType;
--typedef enum _PedPartitionFlag          PedPartitionFlag;
--typedef enum _PedDiskTypeFeature        PedDiskTypeFeature;
--typedef struct _PedDisk                 PedDisk;
--typedef struct _PedPartition            PedPartition;
--typedef const struct _PedDiskOps        PedDiskOps;
--typedef struct _PedDiskType             PedDiskType;
--typedef const struct _PedDiskArchOps    PedDiskArchOps;
--
- #include <parted/device.h>
- #include <parted/filesys.h>
- #include <parted/natmath.h>
-@@ -79,6 +70,16 @@
- #define PED_DISK_TYPE_FIRST_FEATURE    PED_DISK_TYPE_EXTENDED
- #define PED_DISK_TYPE_LAST_FEATURE     PED_DISK_TYPE_PARTITION_NAME
- 
-+typedef enum _PedPartitionType          PedPartitionType;
-+typedef enum _PedPartitionFlag          PedPartitionFlag;
-+typedef enum _PedDiskTypeFeature        PedDiskTypeFeature;
-+typedef struct _PedDisk                 PedDisk;
-+typedef struct _PedPartition            PedPartition;
-+typedef const struct _PedDiskOps        PedDiskOps;
-+typedef struct _PedDiskType             PedDiskType;
-+typedef const struct _PedDiskArchOps    PedDiskArchOps;
-+
-+
- /** @} */
- 
- /**



More information about the SM-Commit mailing list