morphix-cvs

[Morphix-cvs] SF.net SVN: morphix: [2150] trunk/morphixinstaller

[<ale...@us...>]

Revision: 2150
Author:   alextreme
Date:     2006-03-21 12:06:10 -0800 (Tue, 21 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2150&view=rev

Log Message:
-----------
  * cleaning up
  * making MI compileable again

Modified Paths:
--------------
    trunk/morphixinstaller/configure.in
    trunk/morphixinstaller/debian/files
    trunk/morphixinstaller/debian/morphixinstaller.substvars

Removed Paths:
-------------
    trunk/morphixinstaller/autom4te.cache/
Modified: trunk/morphixinstaller/configure.in
===================================================================
--- trunk/morphixinstaller/configure.in	2006-03-21 19:37:56 UTC (rev 2149)
+++ trunk/morphixinstaller/configure.in	2006-03-21 20:06:10 UTC (rev 2150)
@@ -38,7 +38,10 @@
 
 dnl Add the languages which your application supports here.
 dnl Please keep them in alphabetical order
-ALL_LINGUAS="es fr gl ml he it zh nl sl"
+
+dnl es, zh disabled, fuzzy
+
+ALL_LINGUAS="fr gl ml he it nl sl"
 AM_GLIB_GNU_GETTEXT
 
 GETTEXT_PACKAGE=morphixinstaller

Modified: trunk/morphixinstaller/debian/files
===================================================================
--- trunk/morphixinstaller/debian/files	2006-03-21 19:37:56 UTC (rev 2149)
+++ trunk/morphixinstaller/debian/files	2006-03-21 20:06:10 UTC (rev 2150)
@@ -1 +1 @@
-morphixinstaller_0.5-7_i386.deb admin optional
+morphixinstaller_0.5-9_i386.deb admin optional

Modified: trunk/morphixinstaller/debian/morphixinstaller.substvars
===================================================================
--- trunk/morphixinstaller/debian/morphixinstaller.substvars	2006-03-21 19:37:56 UTC (rev 2149)
+++ trunk/morphixinstaller/debian/morphixinstaller.substvars	2006-03-21 20:06:10 UTC (rev 2150)
@@ -1 +1 @@
-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)
+shlibs:Depends=libatk1.0-0 (>= 1.9.0), libc6 (>= 2.3.5-1), libcairo2 (>= 1.0.2-2), libfontconfig1 (>= 2.3.0), libglib2.0-0 (>= 2.8.5), libgtk2.0-0 (>= 2.8.0), libpango1.0-0 (>= 1.10.4), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxi6, libxinerama1, libxrandr2, libxrender1 (>= 1:0.9.0.2)


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

[Morphix-cvs] SF.net SVN: morphix: [2444] trunk/morphixinstaller

[<ale...@us...>]

Revision: 2444
          http://svn.sourceforge.net/morphix/?rev=2444&view=rev
Author:   alextreme
Date:     2006-12-08 03:26:58 -0800 (Fri, 08 Dec 2006)

Log Message:
-----------
  * segfault-fixes. don't laugh.

Modified Paths:
--------------
    trunk/morphixinstaller/debian/changelog
    trunk/morphixinstaller/debian/files
    trunk/morphixinstaller/debian/morphixinstaller.substvars
    trunk/morphixinstaller/src/instlib.c

Modified: trunk/morphixinstaller/debian/changelog
===================================================================
--- trunk/morphixinstaller/debian/changelog	2006-12-05 09:27:16 UTC (rev 2443)
+++ trunk/morphixinstaller/debian/changelog	2006-12-08 11:26:58 UTC (rev 2444)
@@ -1,3 +1,9 @@
+morphixinstaller (0.5-10) unstable; urgency=low
+
+  * segfault due to integer-void fixes
+
+ -- Alex <al...@al...>  Fri,  8 Dec 2006 12:08:52 +0100
+
 morphixinstaller (0.5-9) unstable; urgency=low
 
   * minor fixes

Modified: trunk/morphixinstaller/debian/files
===================================================================
--- trunk/morphixinstaller/debian/files	2006-12-05 09:27:16 UTC (rev 2443)
+++ trunk/morphixinstaller/debian/files	2006-12-08 11:26:58 UTC (rev 2444)
@@ -1 +1 @@
-morphixinstaller_0.5-9_i386.deb admin optional
+morphixinstaller_0.5-10_i386.deb admin optional

Modified: trunk/morphixinstaller/debian/morphixinstaller.substvars
===================================================================
--- trunk/morphixinstaller/debian/morphixinstaller.substvars	2006-12-05 09:27:16 UTC (rev 2443)
+++ trunk/morphixinstaller/debian/morphixinstaller.substvars	2006-12-08 11:26:58 UTC (rev 2444)
@@ -1 +1 @@
-shlibs:Depends=libatk1.0-0 (>= 1.9.0), libc6 (>= 2.3.5-1), libcairo2 (>= 1.0.2-2), libfontconfig1 (>= 2.3.0), libglib2.0-0 (>= 2.8.5), libgtk2.0-0 (>= 2.8.0), libpango1.0-0 (>= 1.10.4), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxi6, libxinerama1, libxrandr2, libxrender1 (>= 1:0.9.0.2)
+shlibs:Depends=libatk1.0-0 (>= 1.12.2), libc6 (>= 2.3.6-6), libcairo2 (>= 1.2.4), libfontconfig1 (>= 2.4.0), libglib2.0-0 (>= 2.12.0), libgtk2.0-0 (>= 2.8.0), libpango1.0-0 (>= 1.14.8), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxfixes3 (>= 1:4.0.1), libxi6, libxinerama1, libxrandr2, libxrender1 (>= 1:0.9.0.2)

Modified: trunk/morphixinstaller/src/instlib.c
===================================================================
--- trunk/morphixinstaller/src/instlib.c	2006-12-05 09:27:16 UTC (rev 2443)
+++ trunk/morphixinstaller/src/instlib.c	2006-12-08 11:26:58 UTC (rev 2444)
@@ -390,7 +390,7 @@
 void MakeRoot(gpointer data) {
 
   gchar cmdline[256];
-  gint i;
+  gint i = 0;
 
   /* umount the partitions for sure and check for duplicating */
   // somewhere should be check is target directory empty or not
@@ -514,7 +514,8 @@
 	gchar **mod_array;
 	gchar *modules;
 //	gchar *modules_length;
-	gint i, j;
+	gint i = 0;
+	gint j = 0;
 	FILE *file;
 	gint modules_len;
 	gchar **contents_array;
@@ -875,7 +876,7 @@
 	gint n;
 	gchar *scsipath = NULL;
 	FILE *file;
-	gint i;
+	gint i = 0;
 	gint exitstatus;
 	gchar *outbuffer;
 	gchar **output_array;
@@ -1458,7 +1459,7 @@
 
 void UnmountTarget() {
   gchar *cmdline;
-  gint i;
+  gint i = 0;
 
 // target/miniroot and expert partitions should be unmounted first
 
@@ -1635,7 +1636,8 @@
 	gint part_len;
 	gint media_len;
 	gint model_len;
-	gint i, j;
+	gint i = 0;
+	gint j = 0;
 	gint hdd_size;
 
 	GList *harddisk_list = NULL;
@@ -1750,7 +1752,7 @@
 	gchar size_str[256];
 
 	gint size;
-	gint i;
+	gint i = 0;
 	gint id;
 
 	GList *list = NULL;
@@ -1925,7 +1927,7 @@
 	gchar device[256];
 
 	gint size;
-	gint i;
+	gint i = 0;
 
 	// get a list of partitions on the selected harddisk
 	cmdline = g_strdup_printf("fdisk -l /dev/%s",GetSelectedHarddisk());


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

[Morphix-cvs] SF.net SVN: morphix: [2608] trunk/morphixinstaller

[<pa...@us...>]

Revision: 2608
          http://morphix.svn.sourceforge.net/morphix/?rev=2608&view=rev
Author:   paul_c
Date:     2008-01-17 08:00:34 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
Clean up a couple of compile time warnings and silence a configure warning about
datarootdir.

Modified Paths:
--------------
    trunk/morphixinstaller/autogen.sh
    trunk/morphixinstaller/src/instlib.c

Modified: trunk/morphixinstaller/autogen.sh
===================================================================
--- trunk/morphixinstaller/autogen.sh	2007-12-31 17:03:36 UTC (rev 2607)
+++ trunk/morphixinstaller/autogen.sh	2008-01-17 16:00:34 UTC (rev 2608)
@@ -134,6 +134,10 @@
 	  libtoolize --force --copy
 	fi
       fi
+      # Ward of any complaints about datarootdir being ignored.
+      if test `grep "^pkgdatadir" po/Makefile.in.in 2> /dev/null | wc -l` -eq 0; then
+        echo "pkgdatadir = @datarootdir@" >> po/Makefile.in.in
+      fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
@@ -141,7 +145,7 @@
 	autoheader
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      automake --add-missing --copy --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
     )

Modified: trunk/morphixinstaller/src/instlib.c
===================================================================
--- trunk/morphixinstaller/src/instlib.c	2007-12-31 17:03:36 UTC (rev 2607)
+++ trunk/morphixinstaller/src/instlib.c	2008-01-17 16:00:34 UTC (rev 2608)
@@ -517,10 +517,10 @@
 	gint i = 0;
 	gint j = 0;
 	FILE *file;
-	gint modules_len;
+	gsize modules_len;
 	gchar **contents_array;
 	gchar *contents_etc;
-	gint length;
+	gsize length;
 	gchar temp_str[20];
 
 	/* Make the mountdir */
@@ -694,11 +694,11 @@
 	file = fopen(cmdline,"w");
 	if (file == NULL) {
 		debug("Unable to open %s, something went very wrong during the install. Aborting!\n",cmdline);
-		return FALSE;
+		return;
 	}
 	if (GetSelectedRoot() == NULL || GetSelectedFilesystemName() == NULL || (swapon == TRUE && GetSelectedSwap() == NULL)) {
 		debug("GetSelectedRoot(), GetSelectedFilesystemName() or GetSelectedSwap() returned NULL, aborting install!\n");
-		return FALSE;
+		return;
 	}
 	debug("%s \t / %s \t defaults \t 0 \t 1\n",GetSelectedRoot(),GetSelectedFilesystemName());
 
@@ -1188,7 +1188,8 @@
 */
 
 GString *GetKernelArgumentsString() {
-	int length, i;
+        int i;
+	gsize length;
 	gchar **contents_array = NULL;
 	GString *kernelarguments = g_string_new("");
 	gchar *contents = NULL;
@@ -1633,9 +1634,9 @@
 	gchar *hdd_buffer = NULL;
 	gchar model_buffer[256];
 
-	gint part_len;
-	gint media_len;
-	gint model_len;
+	gsize part_len;
+	gsize media_len;
+	gsize model_len;
 	gint i = 0;
 	gint j = 0;
 	gint hdd_size;


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