Thread: [Morphix-cvs] SF.net SVN: morphix: [2505] trunk/partitionmorpher

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2505
          http://svn.sourceforge.net/morphix/?rev=2505&view=rev
Author:   paul_c
Date:     2007-06-01 04:05:53 -0700 (Fri, 01 Jun 2007)

Log Message:
-----------
Remove autogenerated debian/files.
Resolve build and installation dependencies - libparted1.6 is no longer part of
stable/testing. It has been replaced by libparted1.7, and libparted1.8 is
curretly queued in experimental \o/

A few minor tweaks to casts so that it at least compiles on x86_64..

Modified Paths:
--------------
    trunk/partitionmorpher/debian/changelog
    trunk/partitionmorpher/debian/control
    trunk/partitionmorpher/src/pm_libparted.c

Removed Paths:
-------------
    trunk/partitionmorpher/debian/partitionmorpher.postinst.debhelper
    trunk/partitionmorpher/debian/partitionmorpher.prerm.debhelper
    trunk/partitionmorpher/debian/partitionmorpher.substvars

Modified: trunk/partitionmorpher/debian/changelog
===================================================================

--- trunk/partitionmorpher/debian/changelog	2007-05-26 20:59:27 UTC (rev 2504)
+++ trunk/partitionmorpher/debian/changelog	2007-06-01 11:05:53 UTC (rev 2505)
@@ -1,3 +1,11 @@
+partitionmorpher (0.3-6) unstable; urgency=low
+
+  * Switch to autodependency generation.
+  * build depends on libparted-dev - This future proofs builds when
+    libparted1.8 filters down..
+
+ -- Paul Corner <pa...@us...>  Fri,  1 Jun 2007 11:56:20 +0100
+
 partitionmorpher (0.3-5) unstable; urgency=low
 
   * adding fix for dependancy issue with sid (libparted1.6-12)

Modified: trunk/partitionmorpher/debian/control
===================================================================
--- trunk/partitionmorpher/debian/control	2007-05-26 20:59:27 UTC (rev 2504)
+++ trunk/partitionmorpher/debian/control	2007-06-01 11:05:53 UTC (rev 2505)
@@ -2,12 +2,12 @@
 Section: admin
 Priority: optional
 Maintainer: Alex de Landgraaf  <ale...@xs...>
-Build-Depends: debhelper (>= 4.0.0), libparted1.6-dev, libgtk2.0-dev
+Build-Depends: debhelper (>= 4.0.0), libparted-dev, libgtk2.0-dev
 Standards-Version: 3.6.0
 
 Package: partitionmorpher
 Architecture: i386 powerpc amd64
-Depends: libc6 (>= 2.3.2-1), libparted1.6-12 | libparted1.6-13, libglib2.0-0, libgtk2.0-0, libpango1.0-0
+Depends: libparted1.7-1, ${shlibs:Depends}
 Recommends: ntfstools, libreiserfs0.3-0
 Description: graphical stand-alone partitioner for Morphix
  Partition Magic clone, built for the Morphix project

Deleted: trunk/partitionmorpher/debian/partitionmorpher.postinst.debhelper
===================================================================
--- trunk/partitionmorpher/debian/partitionmorpher.postinst.debhelper	2007-05-26 20:59:27 UTC (rev 2504)
+++ trunk/partitionmorpher/debian/partitionmorpher.postinst.debhelper	2007-06-01 11:05:53 UTC (rev 2505)
@@ -1,3 +0,0 @@
-# Automatically added by dh_installmenu
-if [ "$1" = "configure" ] && [ -x /usr/bin/update-menus ]; then update-menus ; fi
-# End automatically added section

Deleted: trunk/partitionmorpher/debian/partitionmorpher.prerm.debhelper
===================================================================
--- trunk/partitionmorpher/debian/partitionmorpher.prerm.debhelper	2007-05-26 20:59:27 UTC (rev 2504)
+++ trunk/partitionmorpher/debian/partitionmorpher.prerm.debhelper	2007-06-01 11:05:53 UTC (rev 2505)
@@ -1,6 +0,0 @@
-# Automatically added by dh_installdocs
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r partitionmorpher
-fi
-# End automatically added section

Deleted: trunk/partitionmorpher/debian/partitionmorpher.substvars
===================================================================
--- trunk/partitionmorpher/debian/partitionmorpher.substvars	2007-05-26 20:59:27 UTC (rev 2504)
+++ trunk/partitionmorpher/debian/partitionmorpher.substvars	2007-06-01 11:05:53 UTC (rev 2505)
@@ -1 +0,0 @@
-shlibs:Depends=libatk1.0-0 (>= 1.7.2), libc6 (>= 2.3.2.ds1-4), libglib2.0-0 (>= 2.4.7), libgtk2.0-0 (>= 2.4.4), libpango1.0-0 (>= 1.6.0)

Modified: trunk/partitionmorpher/src/pm_libparted.c
===================================================================
--- trunk/partitionmorpher/src/pm_libparted.c	2007-05-26 20:59:27 UTC (rev 2504)
+++ trunk/partitionmorpher/src/pm_libparted.c	2007-06-01 11:05:53 UTC (rev 2505)
@@ -1227,7 +1227,7 @@
 				//g_free(partinfo[i].label);
 				label = ped_partition_get_name(part);
 				if (label != NULL) 
-					partinfo[i].label = label;
+					partinfo[i].label = (gchar*) label;
 			}
 			else {
 				pm_debug("Debug: filesystem couldn't be opened\n");
@@ -1270,9 +1270,9 @@
 	while (walk) {
 		fsinfo[i].name = malloc(strlen(walk->name) + 1);
 		strcpy(fsinfo[i].name,walk->name);
-		fsinfo[i].creatable = (gboolean) walk->ops->create;
-		fsinfo[i].resizeable = (gboolean) walk->ops->resize;
-		fsinfo[i].copyable  = (gboolean) walk->ops->copy;
+		fsinfo[i].creatable = (long) walk->ops->create;
+		fsinfo[i].resizeable = (long) walk->ops->resize;
+		fsinfo[i].copyable  = (long) walk->ops->copy;
 		fsinfo[i].color = i;
 		walk = ped_file_system_type_get_next(walk);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Morphix-cvs] SF.net SVN: morphix: [2505] trunk/partitionmorpher

morphix-cvs