Menu
▾
▴
morphix-cvs — A list for all cvs commits done, to easily keep track of development
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
| 2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
| 2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
| 2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
| 2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <ale...@us...> - 2004-03-14 21:39:10
|
Update of /cvsroot/morphix/morphixinstaller/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22469/debian Modified Files: changelog control files Log Message: more fixes, changes, initrd stuff. I don't remember, I don't care. No, it isn't tested, that's what you're good for. HAH! Index: changelog =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/changelog,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** changelog 11 Mar 2004 00:54:34 -0000 1.5 --- changelog 14 Mar 2004 21:30:09 -0000 1.6 *************** *** 1,2 **** --- 1,8 ---- + morphixinstaller (0.2-3) unstable; urgency=low + + * grub fixes + + -- Alex de Labdgraaf <ale...@xs...> Fri, 12 Mar 2004 00:11:58 +0000 + morphixinstaller (0.2-2) unstable; urgency=low Index: control =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/control,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** control 15 Feb 2004 23:41:51 -0000 1.2 --- control 14 Mar 2004 21:30:09 -0000 1.3 *************** *** 8,12 **** Package: morphixinstaller Architecture: i386 ! Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libglib2.0-0, libgtk2.0-0, libpango1.0-0, partitionmorpher Description: Install-to-harddisk tool for Morphix-based livecds Initially only for Morphix-based livecds, this tool lets users easily --- 8,12 ---- Package: morphixinstaller Architecture: i386 ! Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libglib2.0-0, libgtk2.0-0, libpango1.0-0, partitionmorpher pivotroot Description: Install-to-harddisk tool for Morphix-based livecds Initially only for Morphix-based livecds, this tool lets users easily Index: files =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/files,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** files 11 Mar 2004 23:17:14 -0000 1.5 --- files 14 Mar 2004 21:30:09 -0000 1.6 *************** *** 1 **** ! morphixinstaller_0.2-2_i386.deb admin optional --- 1 ---- ! morphixinstaller_0.2-3_i386.deb admin optional |
|
From: <ale...@us...> - 2004-03-14 21:39:10
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22469 Modified Files: configure.in morphixinstaller.glade trans.c Log Message: more fixes, changes, initrd stuff. I don't remember, I don't care. No, it isn't tested, that's what you're good for. HAH! Index: configure.in =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.in 29 Feb 2004 15:56:19 -0000 1.5 --- configure.in 14 Mar 2004 21:30:09 -0000 1.6 *************** *** 7,10 **** --- 7,11 ---- AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE + AM_CFLAGS="-O2" AC_ISC_POSIX Index: morphixinstaller.glade =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/morphixinstaller.glade,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** morphixinstaller.glade 11 Mar 2004 00:54:33 -0000 1.16 --- morphixinstaller.glade 14 Mar 2004 21:30:09 -0000 1.17 *************** *** 1650,1655 **** <property name="label" translatable="yes">The selected root partition doesn't appear to have enough free space available for a complete Morphix install ! You may continue, but be advised that the install procedure will likely fail. ! You are advised to go back and select a larger root partition.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> --- 1650,1656 ---- <property name="label" translatable="yes">The selected root partition doesn't appear to have enough free space available for a complete Morphix install ! You may continue, but be advised that the install procedure will likely fail! ! ! You are advised to go back and select a larger root partition (it should be at least 2 GiB)</property> <property name="use_underline">False</property> <property name="use_markup">False</property> *************** *** 1659,1663 **** <property name="xalign">0.5</property> <property name="yalign">0.5</property> ! <property name="xpad">0</property> <property name="ypad">0</property> </widget> --- 1660,1664 ---- <property name="xalign">0.5</property> <property name="yalign">0.5</property> ! <property name="xpad">8</property> <property name="ypad">0</property> </widget> *************** *** 4457,4459 **** --- 4458,4610 ---- </widget> + <widget class="GtkDialog" id="DataRoot"> + <property name="visible">True</property> + <property name="title" translatable="yes">Morphix Install</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">False</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="has_separator">True</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="vbox49"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">8</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="hbuttonbox12"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button1"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-help</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">-11</property> + <signal name="clicked" handler="gtk_widget_show" object="HelpDialog" last_modification_time="Mon, 17 Feb 2003 23:22:37 GMT"/> + </widget> + </child> + + <child> + <widget class="GtkButton" id="buttonbackDataRoot"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="label">gtk-go-back</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">-7</property> + <signal name="clicked" handler="on_buttonbackDataRoot_clicked" last_modification_time="Sat, 13 Mar 2004 16:40:20 GMT"/> + </widget> + </child> + + <child> + <widget class="GtkButton" id="buttonforwardDataRoot"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_buttonforwardDataRoot_clicked" last_modification_time="Sat, 13 Mar 2004 16:40:08 GMT"/> + + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + + <child> + <widget class="GtkHBox" id="hbox39"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image38"> + <property name="visible">True</property> + <property name="stock">gtk-go-forward</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label57"> + <property name="visible">True</property> + <property name="label" translatable="yes">Yes, I'm sure!</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label56"> + <property name="visible">True</property> + <property name="label" translatable="yes">The selected root partition already appears to contain data. + + Are you sure you want to overwrite the existing data on the partition with Morphix?</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">8</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">8</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </glade-interface> Index: trans.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/trans.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** trans.c 7 Mar 2004 03:40:51 -0000 1.14 --- trans.c 14 Mar 2004 21:30:09 -0000 1.15 *************** *** 86,91 **** gchar *s = N_("The selected root partition doesn't appear to have enough free space available for a complete Morphix install\n" "\n" ! "You may continue, but be advised that the install procedure will likely fail.\n" ! "You are advised to go back and select a larger root partition."); gchar *s = N_("Processing..."); gchar *s = N_("<b>Creating filesystem, please wait...</b>"); --- 86,92 ---- gchar *s = N_("The selected root partition doesn't appear to have enough free space available for a complete Morphix install\n" "\n" ! "You may continue, but be advised that the install procedure will likely fail!\n" ! "\n" ! "You are advised to go back and select a larger root partition (it should be at least 2 GiB)"); gchar *s = N_("Processing..."); gchar *s = N_("<b>Creating filesystem, please wait...</b>"); *************** *** 264,265 **** --- 265,271 ---- gchar *s = N_("/boot"); gchar *s = N_("/usr"); + gchar *s = N_("Morphix Install"); + gchar *s = N_("Yes, I'm sure!"); + gchar *s = N_("The selected root partition already appears to contain data. \n" + "\n" + "Are you sure you want to overwrite the existing data on the partition with Morphix?"); |
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31135 Modified Files: callbacks.c callbacks.h instlib.c instlib.h interface.c interface.h main.c ui.c ui.h Removed Files: matty.png Log Message: added warning for when partition contains data Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** callbacks.c 11 Mar 2004 23:17:15 -0000 1.20 --- callbacks.c 14 Mar 2004 16:25:53 -0000 1.21 *************** *** 53,56 **** --- 53,57 ---- extern GtkWidget *HelpDialog; extern GtkWidget *SelectPartExpert; + extern GtkWidget *DataRoot; /* *************** *** 183,187 **** SetSavedCdromSize(GetCdromSize()); if (CheckSizeRootpartition()) { ! DoInstallProcess(); } // else let DIP be done from SmallRoot callback --- 184,190 ---- SetSavedCdromSize(GetCdromSize()); if (CheckSizeRootpartition()) { ! if (CheckDataRootpartition()) { ! DoInstallProcess(); ! } } // else let DIP be done from SmallRoot callback *************** *** 700,704 **** { gtk_widget_hide(SmallRoot); ! DoInstallProcess(); } --- 703,707 ---- { gtk_widget_hide(SmallRoot); ! DoInstallProcess(); /* this should be handled more genericaly, though */ } *************** *** 710,711 **** --- 713,731 ---- } + + void + on_buttonbackDataRoot_clicked (GtkButton *button, + gpointer user_data) + { + gtk_widget_hide(DataRoot); + } + + + void + on_buttonforwardDataRoot_clicked (GtkButton *button, + gpointer user_data) + { + gtk_widget_hide(DataRoot); + DoInstallProcess(); + } + Index: callbacks.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** callbacks.h 7 Mar 2004 21:19:07 -0000 1.8 --- callbacks.h 14 Mar 2004 16:25:53 -0000 1.9 *************** *** 261,262 **** --- 261,270 ---- on_backbuttonErrorLabel_clicked (GtkButton *button, gpointer user_data); + + void + on_buttonbackDataRoot_clicked (GtkButton *button, + gpointer user_data); + + void + on_buttonforwardDataRoot_clicked (GtkButton *button, + gpointer user_data); Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** instlib.c 12 Mar 2004 11:55:54 -0000 1.19 --- instlib.c 14 Mar 2004 16:25:53 -0000 1.20 *************** *** 330,333 **** --- 330,349 ---- } + /* use syscall instead? */ + gboolean MountPartition(gchar *partition, gchar *destination) { + if (!g_file_test(destination,G_FILE_TEST_EXISTS)) { + mkdir(destination); + if (!g_file_test(destination,G_FILE_TEST_EXISTS)) { + debug("Error: Couldn't make directory %s for mounting of parition %s\n",destination,partition); + return FALSE; + } + } + gchar *cmdline = g_strdup_printf("mount %s %s",partition,destination); + ExecuteCommand(cmdline); + g_free(cmdline); + return TRUE; + } + + gpointer BuildRoot(gpointer data) { gchar mod_buf[256]; Index: instlib.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** instlib.h 11 Mar 2004 00:52:51 -0000 1.9 --- instlib.h 14 Mar 2004 16:25:53 -0000 1.10 *************** *** 73,76 **** --- 73,77 ---- gchar *GetSelectedFilesystemName(); void FreeInstallProcess(); + gboolean MountPartition(gchar *partition, gchar *destination); /* Index: interface.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** interface.c 11 Mar 2004 00:52:51 -0000 1.17 --- interface.c 14 Mar 2004 16:25:53 -0000 1.18 *************** *** 891,898 **** gtk_widget_show (vbox14); ! label55 = gtk_label_new (_("The selected root partition doesn't appear to have enough free space available for a complete Morphix install\n\nYou may continue, but be advised that the install procedure will likely fail.\nYou are advised to go back and select a larger root partition.")); gtk_widget_show (label55); gtk_box_pack_start (GTK_BOX (vbox14), label55, FALSE, FALSE, 8); gtk_label_set_line_wrap (GTK_LABEL (label55), TRUE); hbuttonbox2 = GTK_DIALOG (SmallRoot)->action_area; --- 891,899 ---- gtk_widget_show (vbox14); ! label55 = gtk_label_new (_("The selected root partition doesn't appear to have enough free space available for a complete Morphix install\n\nYou may continue, but be advised that the install procedure will likely fail!\n\nYou are advised to go back and select a larger root partition (it should be at least 2 GiB)")); gtk_widget_show (label55); gtk_box_pack_start (GTK_BOX (vbox14), label55, FALSE, FALSE, 8); gtk_label_set_line_wrap (GTK_LABEL (label55), TRUE); + gtk_misc_set_padding (GTK_MISC (label55), 8, 0); hbuttonbox2 = GTK_DIALOG (SmallRoot)->action_area; *************** *** 2311,2312 **** --- 2312,2404 ---- } + GtkWidget* + create_DataRoot (void) + { + GtkWidget *DataRoot; + GtkWidget *vbox49; + GtkWidget *label56; + GtkWidget *hbuttonbox12; + GtkWidget *button1; + GtkWidget *buttonbackDataRoot; + GtkWidget *buttonforwardDataRoot; + GtkWidget *alignment2; + GtkWidget *hbox39; + GtkWidget *image38; + GtkWidget *label57; + + DataRoot = gtk_dialog_new (); + gtk_window_set_title (GTK_WINDOW (DataRoot), _("Morphix Install")); + gtk_window_set_position (GTK_WINDOW (DataRoot), GTK_WIN_POS_CENTER); + + vbox49 = GTK_DIALOG (DataRoot)->vbox; + gtk_widget_show (vbox49); + + label56 = gtk_label_new (_("The selected root partition already appears to contain data. \n\nAre you sure you want to overwrite the existing data on the partition with Morphix?")); + gtk_widget_show (label56); + gtk_box_pack_start (GTK_BOX (vbox49), label56, FALSE, FALSE, 8); + gtk_label_set_line_wrap (GTK_LABEL (label56), TRUE); + gtk_misc_set_padding (GTK_MISC (label56), 8, 0); + + hbuttonbox12 = GTK_DIALOG (DataRoot)->action_area; + gtk_widget_show (hbuttonbox12); + gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox12), GTK_BUTTONBOX_END); + + button1 = gtk_button_new_from_stock ("gtk-help"); + gtk_widget_show (button1); + gtk_dialog_add_action_widget (GTK_DIALOG (DataRoot), button1, GTK_RESPONSE_HELP); + GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT); + + buttonbackDataRoot = gtk_button_new_from_stock ("gtk-go-back"); + gtk_widget_show (buttonbackDataRoot); + gtk_dialog_add_action_widget (GTK_DIALOG (DataRoot), buttonbackDataRoot, GTK_RESPONSE_CLOSE); + GTK_WIDGET_SET_FLAGS (buttonbackDataRoot, GTK_CAN_DEFAULT); + + buttonforwardDataRoot = gtk_button_new (); + gtk_widget_show (buttonforwardDataRoot); + gtk_dialog_add_action_widget (GTK_DIALOG (DataRoot), buttonforwardDataRoot, 0); + GTK_WIDGET_SET_FLAGS (buttonforwardDataRoot, GTK_CAN_DEFAULT); + + alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_show (alignment2); + gtk_container_add (GTK_CONTAINER (buttonforwardDataRoot), alignment2); + + hbox39 = gtk_hbox_new (FALSE, 2); + gtk_widget_show (hbox39); + gtk_container_add (GTK_CONTAINER (alignment2), hbox39); + + image38 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image38); + gtk_box_pack_start (GTK_BOX (hbox39), image38, FALSE, FALSE, 0); + + label57 = gtk_label_new_with_mnemonic (_("Yes, I'm sure!")); + gtk_widget_show (label57); + gtk_box_pack_start (GTK_BOX (hbox39), label57, FALSE, FALSE, 0); + + g_signal_connect_swapped ((gpointer) button1, "clicked", + G_CALLBACK (gtk_widget_show), + GTK_OBJECT (HelpDialog)); + g_signal_connect ((gpointer) buttonbackDataRoot, "clicked", + G_CALLBACK (on_buttonbackDataRoot_clicked), + NULL); + g_signal_connect ((gpointer) buttonforwardDataRoot, "clicked", + G_CALLBACK (on_buttonforwardDataRoot_clicked), + NULL); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (DataRoot, DataRoot, "DataRoot"); + GLADE_HOOKUP_OBJECT_NO_REF (DataRoot, vbox49, "vbox49"); + GLADE_HOOKUP_OBJECT (DataRoot, label56, "label56"); + GLADE_HOOKUP_OBJECT_NO_REF (DataRoot, hbuttonbox12, "hbuttonbox12"); + GLADE_HOOKUP_OBJECT (DataRoot, button1, "button1"); + GLADE_HOOKUP_OBJECT (DataRoot, buttonbackDataRoot, "buttonbackDataRoot"); + GLADE_HOOKUP_OBJECT (DataRoot, buttonforwardDataRoot, "buttonforwardDataRoot"); + GLADE_HOOKUP_OBJECT (DataRoot, alignment2, "alignment2"); + GLADE_HOOKUP_OBJECT (DataRoot, hbox39, "hbox39"); + GLADE_HOOKUP_OBJECT (DataRoot, image38, "image38"); + GLADE_HOOKUP_OBJECT (DataRoot, label57, "label57"); + + gtk_widget_grab_focus (buttonbackDataRoot); + gtk_widget_grab_default (buttonbackDataRoot); + return DataRoot; + } + Index: interface.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/interface.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** interface.h 16 Feb 2004 23:42:12 -0000 1.5 --- interface.h 14 Mar 2004 16:25:53 -0000 1.6 *************** *** 21,22 **** --- 21,23 ---- GtkWidget* create_HelpDialog (void); GtkWidget* create_SelectPartExpert (void); + GtkWidget* create_DataRoot (void); Index: main.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** main.c 7 Mar 2004 21:19:07 -0000 1.10 --- main.c 14 Mar 2004 16:25:53 -0000 1.11 *************** *** 48,51 **** --- 48,52 ---- GtkWidget *HelpDialog; GtkWidget *SelectPartExpert; + GtkWidget *DataRoot; int debug(const char *fmt, ...) { Index: ui.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/ui.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ui.c 11 Mar 2004 23:17:15 -0000 1.4 --- ui.c 14 Mar 2004 16:25:53 -0000 1.5 *************** *** 53,56 **** --- 53,57 ---- extern GtkWidget *HelpDialog; extern GtkWidget *SelectPartExpert; + extern GtkWidget *DataRoot; gint global_cdrom_size; *************** *** 110,113 **** --- 111,139 ---- /* + returns if the selected root partition's used size is more than 100 + if so, return TRUE + if not, or any error, return FALSE + maybe move the mounting to instlib? + */ + + gboolean CheckDataRootpartition() { + if (!MountPartition(GetSelectedRoot(),TEMP_MOUNT_DIR)) { + debug("Couldn't check size of root partition\n"); + return FALSE; + } + gint curr_size = GetUsedPartSize(GetSelectedRoot()); + debug("Info: Current size on root: %d\n",curr_size); + umount(TEMP_MOUNT_DIR); + if (curr_size >= 100) { + DataRoot = create_DataRoot(); + gtk_widget_show(DataRoot); + debug("Info: Root partition already has data, sure to overwrite?\n"); + return FALSE; + } + return TRUE; + } + + + /* timeout function for the installing-process */ Index: ui.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/ui.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ui.h 7 Mar 2004 03:40:51 -0000 1.2 --- ui.h 14 Mar 2004 16:25:53 -0000 1.3 *************** *** 24,27 **** --- 24,29 ---- */ + #define TEMP_MOUNT_DIR "/tmp/tempmountdir" + extern GtkWidget *HelpDialog; --- matty.png DELETED --- |
|
From: <gan...@us...> - 2004-03-12 12:23:18
|
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26636/morphixinstaller/src Modified Files: instlib.c Log Message: fix for #914638 Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** instlib.c 11 Mar 2004 23:17:15 -0000 1.18 --- instlib.c 12 Mar 2004 11:55:54 -0000 1.19 *************** *** 982,994 **** if (grub_mode == 1) { // install to mbr of selected device ! cmdline = g_strdup_printf("grub-install --root-directory=%s/boot /dev/%s",ROOT_MOUNTPOINT,GetSelectedHarddisk()); } else if (grub_mode == 2) { // install to root partition ! cmdline = g_strdup_printf("grub-install --root-directory=%s/boot %s",ROOT_MOUNTPOINT,GetSelectedRoot()); } else { // install to boot partitoin ! cmdline = g_strdup_printf("grub-install --root-directory=%s/boot %s",ROOT_MOUNTPOINT,GetSelectedBoot()); } ExecuteCommand(cmdline); --- 982,994 ---- if (grub_mode == 1) { // install to mbr of selected device ! cmdline = g_strdup_printf("grub-install --root-directory=%s/ /dev/%s",ROOT_MOUNTPOINT,GetSelectedHarddisk()); } else if (grub_mode == 2) { // install to root partition ! cmdline = g_strdup_printf("grub-install --root-directory=%s/ %s",ROOT_MOUNTPOINT,GetSelectedRoot()); } else { // install to boot partitoin ! cmdline = g_strdup_printf("grub-install --root-directory=%s/ %s",ROOT_MOUNTPOINT,GetSelectedBoot()); } ExecuteCommand(cmdline); |
|
From: <ale...@us...> - 2004-03-11 23:44:16
|
Update of /cvsroot/morphix/morphixinstaller/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22056/debian Modified Files: files Log Message: - added some grub fixes - more progressbar changes *crossesfingers* Index: files =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/files,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** files 7 Mar 2004 21:19:07 -0000 1.4 --- files 11 Mar 2004 23:17:14 -0000 1.5 *************** *** 1 **** ! morphixinstaller_0.2-1_i386.deb admin optional --- 1 ---- ! morphixinstaller_0.2-2_i386.deb admin optional |
|
From: <ale...@us...> - 2004-03-11 23:44:16
|
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22056/src Modified Files: callbacks.c instlib.c ui.c Log Message: - added some grub fixes - more progressbar changes *crossesfingers* Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** callbacks.c 11 Mar 2004 00:52:51 -0000 1.19 --- callbacks.c 11 Mar 2004 23:17:15 -0000 1.20 *************** *** 477,481 **** } - void on_SelectRoot_show (GtkWidget *widget, --- 477,480 ---- *************** *** 506,510 **** } - void on_ErrorMessage_show (GtkWidget *widget, --- 505,508 ---- *************** *** 515,521 **** } - - - void on_ErrorLabel_show (GtkWidget *widget, --- 513,516 ---- Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** instlib.c 11 Mar 2004 00:52:51 -0000 1.17 --- instlib.c 11 Mar 2004 23:17:15 -0000 1.18 *************** *** 413,416 **** --- 413,420 ---- } + /* make the boot device */ + sprintf(cmdline,"mkdir %s/boot",ROOT_MOUNTPOINT); + ExecuteCommand(cmdline); + /* remove the old hosts file */ sprintf(cmdline,"rm %s/etc/hosts",ROOT_MOUNTPOINT); *************** *** 962,966 **** gchar kernel[256]; gchar *cmdline = NULL; ! gchar *outbuffer; gint exitstatus; GString *kernelarguments = GetKernelArgumentsString(); --- 966,970 ---- gchar kernel[256]; gchar *cmdline = NULL; ! gchar *outbuffer = NULL; gint exitstatus; GString *kernelarguments = GetKernelArgumentsString(); *************** *** 978,998 **** if (grub_mode == 1) { // install to mbr of selected device ! cmdline = g_strdup_printf("grub-install %s",GetSelectedHarddisk()); } else if (grub_mode == 2) { // install to root partition ! cmdline = g_strdup_printf("grub-install %s",GetSelectedRoot()); } else { // install to boot partitoin ! cmdline = g_strdup_printf("grub-install %s",GetSelectedBoot()); } ExecuteCommand(cmdline); g_free(cmdline); // grub should be installed to /boot/grub now ! if (g_file_test("/boot/grub",G_FILE_TEST_EXISTS) != TRUE) { debug("Warning: Grub wasn't installed correctly it seems, aborting\n"); return FALSE; } if (grub_mode == 1) { // install to mbr of device --- 982,1004 ---- if (grub_mode == 1) { // install to mbr of selected device ! cmdline = g_strdup_printf("grub-install --root-directory=%s/boot /dev/%s",ROOT_MOUNTPOINT,GetSelectedHarddisk()); } else if (grub_mode == 2) { // install to root partition ! cmdline = g_strdup_printf("grub-install --root-directory=%s/boot %s",ROOT_MOUNTPOINT,GetSelectedRoot()); } else { // install to boot partitoin ! cmdline = g_strdup_printf("grub-install --root-directory=%s/boot %s",ROOT_MOUNTPOINT,GetSelectedBoot()); } ExecuteCommand(cmdline); g_free(cmdline); // grub should be installed to /boot/grub now ! cmdline = g_strdup_printf("%s/boot/grub",ROOT_MOUNTPOINT); ! if (g_file_test(cmdline,G_FILE_TEST_EXISTS) != TRUE) { debug("Warning: Grub wasn't installed correctly it seems, aborting\n"); return FALSE; } + g_free(cmdline); if (grub_mode == 1) { // install to mbr of device *************** *** 1022,1033 **** debug("\n"); } g_free(cmdline); cmdline = g_strdup_printf("%s%s",ROOT_MOUNTPOINT,GRUB_MENU_LOCATION); file = fopen(cmdline,"w"); - g_free(cmdline); debug("%s\n",outbuffer); fprintf(file,"%s\n",outbuffer); fclose(file); ! // grub should be all setup now return TRUE; --- 1028,1048 ---- debug("\n"); } + if (outbuffer == NULL) { + debug("Output of gengrubmenu is empty, aborting\n"); + return FALSE; + } g_free(cmdline); cmdline = g_strdup_printf("%s%s",ROOT_MOUNTPOINT,GRUB_MENU_LOCATION); file = fopen(cmdline,"w"); debug("%s\n",outbuffer); + if (file == NULL) { + debug("Error: grub failed, couldn't write to output file\n"); + g_free(cmdline); + return FALSE; + } fprintf(file,"%s\n",outbuffer); fclose(file); ! g_free(cmdline); ! g_free(outbuffer); // grub should be all setup now return TRUE; Index: ui.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/ui.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ui.c 11 Mar 2004 00:52:51 -0000 1.3 --- ui.c 11 Mar 2004 23:17:15 -0000 1.4 *************** *** 259,263 **** GtkWidget *labelInstallprocess = lookup_widget(DoInstall,"labelInstallprocess"); gchar *label_str = NULL; ! if (total <= 0) { label_str = g_strdup_printf("Couldn't detect size of files in /cdrom,\n%dMiB have been copied\n",current); } --- 259,266 ---- GtkWidget *labelInstallprocess = lookup_widget(DoInstall,"labelInstallprocess"); gchar *label_str = NULL; ! if (current <= 0) { ! label_str = g_strdup_printf("Copying commencing...\n"); ! } ! else if (total <= 0) { label_str = g_strdup_printf("Couldn't detect size of files in /cdrom,\n%dMiB have been copied\n",current); } |
|
From: <ale...@us...> - 2004-03-11 01:20:50
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14513 Modified Files: morphixinstaller.glade Log Message: - glade cleanups - version bumped Index: morphixinstaller.glade =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/morphixinstaller.glade,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** morphixinstaller.glade 7 Mar 2004 21:19:07 -0000 1.15 --- morphixinstaller.glade 11 Mar 2004 00:54:33 -0000 1.16 *************** *** 1589,1593 **** <property name="visible">True</property> <property name="homogeneous">False</property> ! <property name="spacing">0</property> <child internal-child="action_area"> --- 1589,1593 ---- <property name="visible">True</property> <property name="homogeneous">False</property> ! <property name="spacing">8</property> <child internal-child="action_area"> *************** *** 1663,1667 **** </widget> <packing> ! <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> --- 1663,1667 ---- </widget> <packing> ! <property name="padding">8</property> <property name="expand">False</property> <property name="fill">False</property> |
|
From: <ale...@us...> - 2004-03-11 01:20:50
|
Update of /cvsroot/morphix/morphixinstaller/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14513/debian Modified Files: changelog Log Message: - glade cleanups - version bumped Index: changelog =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/changelog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** changelog 7 Mar 2004 21:19:07 -0000 1.4 --- changelog 11 Mar 2004 00:54:34 -0000 1.5 *************** *** 1,2 **** --- 1,12 ---- + morphixinstaller (0.2-2) unstable; urgency=low + + * restructured partition size requests + * niceified debugging output (for own sanity, or what's left of it) + * fixed error label (should have been SmallRoot dialog) + * other cleanups i rather not mention... + + + -- Alex de Labdgraaf <ale...@xs...> Thu, 11 Mar 2004 01:47:16 +0000 + morphixinstaller (0.2-1) unstable; urgency=low |
|
From: <ale...@us...> - 2004-03-11 01:19:11
|
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14049 Modified Files: callbacks.c instlib.c instlib.h interface.c ui.c Log Message: - restructured partition size requests - niceified debugging output (for own sanity, or what's left of it) - fixed error label (should have been SmallRoot dialog) - other cleanups i rather not mention... Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** callbacks.c 7 Mar 2004 21:19:07 -0000 1.18 --- callbacks.c 11 Mar 2004 00:52:51 -0000 1.19 *************** *** 556,559 **** --- 556,560 ---- GtkWidget *image = lookup_widget(widget,"imageInstallProcess"); DoAnimation(image,PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/dancingpenguin.gif"); + ProgressTimeoutSize(progbar); timer = g_timeout_add(10000, (GSourceFunc)ProgressTimeoutSize,progbar); } Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** instlib.c 10 Mar 2004 19:46:14 -0000 1.16 --- instlib.c 11 Mar 2004 00:52:51 -0000 1.17 *************** *** 917,921 **** gchar *contents = NULL; if (!g_file_get_contents(PROC_CMDLINE,&contents,&length,NULL)) { ! debug("Can't get kernel arguments, aborting grub\n"); return FALSE; } --- 917,921 ---- gchar *contents = NULL; if (!g_file_get_contents(PROC_CMDLINE,&contents,&length,NULL)) { ! debug("Warning: Can't get kernel arguments, aborting grub\n"); return FALSE; } *************** *** 923,927 **** if (contents_array == NULL) { g_free(contents); ! debug("Can't get kernel arguments, aborting grub\n"); return FALSE; } --- 923,927 ---- if (contents_array == NULL) { g_free(contents); ! debug("Warning: Can't get kernel arguments, aborting grub\n"); return FALSE; } *************** *** 968,972 **** if (grub_mode < 1 || grub_mode > 4) { ! debug("Invalid grub mode %d, aborting\n",grub_mode); return FALSE; } --- 968,972 ---- if (grub_mode < 1 || grub_mode > 4) { ! debug("Warning: Invalid grub mode %d, aborting\n",grub_mode); return FALSE; } *************** *** 992,996 **** // grub should be installed to /boot/grub now if (g_file_test("/boot/grub",G_FILE_TEST_EXISTS) != TRUE) { ! debug("Grub wasn't installed correctly it seems, aborting\n"); return FALSE; } --- 992,996 ---- // grub should be installed to /boot/grub now if (g_file_test("/boot/grub",G_FILE_TEST_EXISTS) != TRUE) { ! debug("Warning: Grub wasn't installed correctly it seems, aborting\n"); return FALSE; } *************** *** 1018,1022 **** debug("Exec: %s\n",cmdline); if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! debug("Error occured executing command:\n"); debug(outbuffer); debug("\n"); --- 1018,1022 ---- debug("Exec: %s\n",cmdline); if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! debug("Error: error occured executing command:\n"); debug(outbuffer); debug("\n"); *************** *** 1319,1323 **** if (g_file_test("/morphix/preinst.sh",G_FILE_TEST_EXISTS) == TRUE) { ! debug("Executing preinstall script\n"); cmdline = g_strdup_printf("chroot %s sh /morphix/preinst.sh",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); --- 1319,1323 ---- if (g_file_test("/morphix/preinst.sh",G_FILE_TEST_EXISTS) == TRUE) { ! debug("Info: Executing preinstall script\n"); cmdline = g_strdup_printf("chroot %s sh /morphix/preinst.sh",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); *************** *** 1326,1330 **** } if (g_file_test("/morphix/gtkinstaller/preinst.sh",G_FILE_TEST_EXISTS) == TRUE) { ! debug("Executing DEPRECATED preinstall script, use /morphix/preinst.sh instead!\n"); cmdline = g_strdup_printf("chroot %s sh /morphix/gtkinstaller/preinst.sh",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); --- 1326,1330 ---- } if (g_file_test("/morphix/gtkinstaller/preinst.sh",G_FILE_TEST_EXISTS) == TRUE) { ! debug("Warning: Executing DEPRECATED preinstall script, use /morphix/preinst.sh instead!\n"); cmdline = g_strdup_printf("chroot %s sh /morphix/gtkinstaller/preinst.sh",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); *************** *** 1337,1341 **** gchar *cmdline; if (g_file_test("/morphix/postinst.sh",G_FILE_TEST_EXISTS) == TRUE) { ! debug("Executing postinstall script\n"); cmdline = g_strdup_printf("chroot %s sh /morphix/postinst.sh",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); --- 1337,1341 ---- gchar *cmdline; if (g_file_test("/morphix/postinst.sh",G_FILE_TEST_EXISTS) == TRUE) { ! debug("Info: Executing postinstall script\n"); cmdline = g_strdup_printf("chroot %s sh /morphix/postinst.sh",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); *************** *** 1344,1348 **** } if (g_file_test("/morphix/gtkinstaller/postinst.sh",G_FILE_TEST_EXISTS) == TRUE) { ! debug("Executing DEPRECATED postinstall script, use /morphix/postinst.sh instead!\n"); cmdline = g_strdup_printf("chroot %s sh /morphix/gtkinstaller/postinst.sh",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); --- 1344,1348 ---- } if (g_file_test("/morphix/gtkinstaller/postinst.sh",G_FILE_TEST_EXISTS) == TRUE) { ! debug("Warning: Executing DEPRECATED postinstall script, use /morphix/postinst.sh instead!\n"); cmdline = g_strdup_printf("chroot %s sh /morphix/gtkinstaller/postinst.sh",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); *************** *** 1448,1452 **** g_free(cmdline); ! debug("Unmounting target\n"); cmdline = g_strdup_printf("umount %s",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); --- 1448,1452 ---- g_free(cmdline); ! debug("Info: Unmounting target\n"); cmdline = g_strdup_printf("umount %s",ROOT_MOUNTPOINT); ExecuteCommand(cmdline); *************** *** 1492,1496 **** if (g_file_test(PM_PATH,G_FILE_TEST_EXISTS)) { if (xfree86) { ! partlistnames = g_list_append(partlistnames,g_strdup(_("PartitionMorpher - Graphical Partitioner"))); } } --- 1492,1496 ---- if (g_file_test(PM_PATH,G_FILE_TEST_EXISTS)) { if (xfree86) { ! partlistnames = g_list_append(partlistnames,g_strdup(_("Partition Morpher - Graphical Partitioner"))); } } *************** *** 1574,1578 **** // try to get a list of all harddisk partitions if (!g_file_get_contents(PROC_PARTITIONS,&part,&part_len,NULL)) { ! debug("Can't get partition info\n"); return NULL; } --- 1574,1578 ---- // try to get a list of all harddisk partitions if (!g_file_get_contents(PROC_PARTITIONS,&part,&part_len,NULL)) { ! debug("Warning: Can't get partition info from harddisk: %s\n",PROC_PARTITIONS); return NULL; } *************** *** 1597,1601 **** if (name) { hdd_buffer = g_strdup_printf("%s with %d MiB, Hardware raid",temp_string,hdd_size); ! debug("scsi hdd found: %s\n",hdd_buffer); harddisk_list = g_list_append (harddisk_list,hdd_buffer); } --- 1597,1601 ---- if (name) { hdd_buffer = g_strdup_printf("%s with %d MiB, Hardware raid",temp_string,hdd_size); ! debug("Info: scsi hdd found: %s\n",hdd_buffer); harddisk_list = g_list_append (harddisk_list,hdd_buffer); } *************** *** 1613,1617 **** if (name) { hdd_buffer = g_strdup_printf(hdd_buffer,"RAID: %s",temp_string); ! debug("Software RAID found: %s\n",hdd_buffer); harddisk_list = g_list_append (harddisk_list,hdd_buffer); } --- 1613,1617 ---- if (name) { hdd_buffer = g_strdup_printf(hdd_buffer,"RAID: %s",temp_string); ! debug("Info: Software RAID found: %s\n",hdd_buffer); harddisk_list = g_list_append (harddisk_list,hdd_buffer); } *************** *** 1628,1632 **** model[strlen(model) -1] = '\0'; hdd_buffer = g_strdup_printf("%s with %d MiB, %s",temp_string,hdd_size,model); ! debug("hdd found: %s\n",hdd_buffer); harddisk_list = g_list_append (harddisk_list,hdd_buffer); } --- 1628,1632 ---- model[strlen(model) -1] = '\0'; hdd_buffer = g_strdup_printf("%s with %d MiB, %s",temp_string,hdd_size,model); ! debug("Info: hdd found: %s\n",hdd_buffer); harddisk_list = g_list_append (harddisk_list,hdd_buffer); } *************** *** 1644,1648 **** if (name) { hdd_buffer = g_strdup_printf("%s with %d MiB, SCSI",temp_string,hdd_size); ! debug("scsi hdd found: %s\n",hdd_buffer); harddisk_list = g_list_append (harddisk_list,hdd_buffer); } --- 1644,1648 ---- if (name) { hdd_buffer = g_strdup_printf("%s with %d MiB, SCSI",temp_string,hdd_size); ! debug("Info: scsi hdd found: %s\n",hdd_buffer); harddisk_list = g_list_append (harddisk_list,hdd_buffer); } *************** *** 1659,1662 **** --- 1659,1673 ---- } + /* + get a list of the partitions. + swap means only return the swap partitions, + otherwise return all linux'ed partitions + fluffy will put some extra info behind the partition names + + returned GList should be free'ed when done + returns NULL when there's something wrong or when the list is empty + note that swap will automatically add a No Swap entry + */ + GList *GetPartList(gboolean swap,gboolean fluffy) { /* fluffy wuffy names! */ gchar *outbuffer; *************** *** 1680,1693 **** cmdline = g_strdup_printf("fdisk -l /dev/%s",GetSelectedHarddisk()); if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! debug("No Swap Error"); ! /* error */ } g_free(cmdline); part_array = g_strsplit(outbuffer,"\n",0); root_num = 0; i = 6; if (part_array[0] == NULL) { ! debug("Fatal error, partitions not found for %s!\n",GetSelectedHarddisk()); ! return; } // for every partition, check to see if it's a default Linux type or --- 1691,1705 ---- cmdline = g_strdup_printf("fdisk -l /dev/%s",GetSelectedHarddisk()); if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! debug("Error: No fdisk?"); ! return NULL; } g_free(cmdline); part_array = g_strsplit(outbuffer,"\n",0); + g_free(outbuffer); root_num = 0; i = 6; if (part_array[0] == NULL) { ! debug("Fatal: partitions not found for %s!\n",GetSelectedHarddisk()); ! return NULL; } // for every partition, check to see if it's a default Linux type or *************** *** 1701,1709 **** } } ! debug("Partition %s size: %s\n",device,size_str); size = atoi(size_str); if (id == 83 && !swap) { ! debug("linux part found: %s\n",device); if (fluffy) { size = size / 1024; --- 1713,1721 ---- } } ! debug("Info: Partition %s size: %s\n",device,size_str); size = atoi(size_str); if (id == 83 && !swap) { ! debug("Info: linux part found: %s\n",device); if (fluffy) { size = size / 1024; *************** *** 1716,1720 **** } if (id == 82 && swap) { ! debug("swap part found: %s\n",device); if (fluffy) { size = size / 1024; --- 1728,1732 ---- } if (id == 82 && swap) { ! debug("Info: swap part found: %s\n",device); if (fluffy) { size = size / 1024; *************** *** 1728,1731 **** --- 1740,1744 ---- i++; } + g_strfreev(part_array); // added for those that don't run with swap. // harddisks are slow anyways... *************** *** 1810,1828 **** g_strfreev(output_array); ! debug("total size cdrom: %d MB\n",total_size_mb); if (total_size_mb > 0) { return total_size_mb; } ! debug("Error, size of /cdrom could not be found\n"); return -1; } /* returns the used size of the partition in MB's returns -1 if the partition couldn't be found */ ! gint GetPartUsedSize(gchar *partition) { gchar *cmdline; gchar *outbuffer; --- 1823,1906 ---- g_strfreev(output_array); ! debug("Info: total size cdrom: %d MB\n",total_size_mb); if (total_size_mb > 0) { return total_size_mb; } ! debug("Error: size of /cdrom could not be found\n"); ! return -1; ! } ! ! /* ! returns the total allocated size of the partition, ! uses fdisk, can be used when unmounted ! returns size, or -1 when you fscked something up ! */ ! ! gint GetTotalPartSize(gchar *partition) { ! gchar *outbuffer; ! gchar **part_array; ! gchar *cmdline; ! gchar *swap_buf; ! gchar *root_buf; ! gint exitstatus; ! gchar device[256]; ! gchar *swap_item; ! gchar size_str[256]; ! ! gint size; ! gint part_len; ! gint i, j; ! gint id; ! ! GList *list = NULL; ! ! // get a list of partitions on the selected harddisk ! cmdline = g_strdup_printf("fdisk -l /dev/%s",GetSelectedHarddisk()); ! if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! debug("Error: no fdisk?"); ! return -1; ! } ! g_free(cmdline); ! part_array = g_strsplit(outbuffer,"\n",0); ! g_free(outbuffer); ! root_num = 0; ! i = 6; ! if (part_array[0] == NULL) { ! debug("Fatal: partitions not found for %s!\n",GetSelectedHarddisk()); ! return; ! } ! // for every partition, check to see if it's a default Linux type or ! // a swap type partition we can use ! while (part_array[i] != NULL) { ! if (sscanf(part_array[i],"%255s %*d %*d %d",device,&size) < 2) { ! if (sscanf(part_array[i],"%255s * %*d %*d %d",device,&size) < 2) { ! /* error */ ! i++; ! continue; ! } ! } ! if (device != NULL && partition != NULL) { ! if (strncmp(device,partition,strlen(partition)) == 0) { ! debug("Info: Partition %s size: %d\n",device,size); ! break; /* AWAY FROM THIS LUNACY!!! AAARRRGGG!!! */ ! } ! } ! i++; ! } ! g_strfreev(part_array); ! if (size > 0) { ! return size / 1024; ! } return -1; } /* + NOTE: ASSUMES PARTITION IS MOUNTED! returns the used size of the partition in MB's returns -1 if the partition couldn't be found */ ! gint GetUsedPartSize(gchar *partition) { gchar *cmdline; gchar *outbuffer; *************** *** 1832,1835 **** --- 1910,1915 ---- gint total_size_mb = 0; + debug("Info: returning size from partition %s\n",partition); + cmdline = g_strdup_printf("df -m %s",partition); g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL); *************** *** 1843,1848 **** gint num_finds = 0; num_finds = sscanf(output_array[i],"%63s %*s %63s %*s %*s %*s",device,size); ! ! if (num_finds > 0) { // found the partition (hopefully) --- 1923,1930 ---- gint num_finds = 0; num_finds = sscanf(output_array[i],"%63s %*s %63s %*s %*s %*s",device,size); ! debug("Info: filtered used size: %s\n",size); ! ! debug("Info: line: %s\n",output_array[i]); ! if (num_finds > 0 && strcmp(device,partition) == 0) { // found the partition (hopefully) *************** *** 1854,1857 **** --- 1936,1941 ---- g_strfreev(output_array); + debug("Info: Returned size: %d MiB\n",total_size_mb); + if (total_size_mb > 0) { return total_size_mb; *************** *** 1865,1869 **** */ ! gdouble GetCurrentSize(gint cdrom_size) { return cdrom_size * 2.8; } --- 1949,1953 ---- */ ! gint GetCurrentSize(gint cdrom_size) { return cdrom_size * 2.8; } *************** *** 1874,1878 **** perc = (gdouble)curr_rootpart_size / unpacked_cdrom_size; ! debug("total size: %f with cdrom_size: %d and rootpartsize: %d\n",perc,cdrom_size,curr_rootpart_size); if (perc >= 0.99) return 0.99; --- 1958,1962 ---- perc = (gdouble)curr_rootpart_size / unpacked_cdrom_size; ! debug("Info: total size: %f with cdrom_size: %d and rootpartsize: %d\n",perc,cdrom_size,curr_rootpart_size); if (perc >= 0.99) return 0.99; Index: instlib.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** instlib.h 10 Mar 2004 19:46:14 -0000 1.8 --- instlib.h 11 Mar 2004 00:52:51 -0000 1.9 *************** *** 268,277 **** /* ! returns the used size of the partition in MB's returns -1 if the partition couldn't be found */ ! gint GetPartUsedSize(gchar *partition); ! gdouble GetCurrentSize(gint cdrom_size); /* --- 268,285 ---- /* ! returns the used/total size of the partition in MB's returns -1 if the partition couldn't be found */ + gint GetTotalPartSize(gchar *partition); + gint GetUsedPartSize(gchar *partition); ! /* ! returns the current size of the to be installed system ! in effect, it just multiplies the value with 2.8, ! as that's about the compression ratio with cloop. ! it's messy, but this can always be improved :) ! */ ! ! gint GetCurrentSize(gint cdrom_size); /* Index: interface.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** interface.c 7 Mar 2004 21:19:07 -0000 1.16 --- interface.c 11 Mar 2004 00:52:51 -0000 1.17 *************** *** 893,897 **** label55 = gtk_label_new (_("The selected root partition doesn't appear to have enough free space available for a complete Morphix install\n\nYou may continue, but be advised that the install procedure will likely fail.\nYou are advised to go back and select a larger root partition.")); gtk_widget_show (label55); ! gtk_box_pack_start (GTK_BOX (vbox14), label55, FALSE, FALSE, 0); gtk_label_set_line_wrap (GTK_LABEL (label55), TRUE); --- 893,897 ---- label55 = gtk_label_new (_("The selected root partition doesn't appear to have enough free space available for a complete Morphix install\n\nYou may continue, but be advised that the install procedure will likely fail.\nYou are advised to go back and select a larger root partition.")); gtk_widget_show (label55); ! gtk_box_pack_start (GTK_BOX (vbox14), label55, FALSE, FALSE, 8); gtk_label_set_line_wrap (GTK_LABEL (label55), TRUE); Index: ui.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/ui.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ui.c 7 Mar 2004 03:40:51 -0000 1.2 --- ui.c 11 Mar 2004 00:52:51 -0000 1.3 *************** *** 96,108 **** gboolean CheckSizeRootpartition() { ! if (GetCurrentSize(global_cdrom_size) >= GetPartUsedSize(GetSelectedRoot())) { ! ErrorLabel = create_ErrorLabel(); ! gtk_widget_show(ErrorLabel); ! return FALSE; ! } ! if (GetCurrentSize(global_cdrom_size) >= GetPartUsedSize(GetSelectedRoot()) + 100) { ! ErrorLabel = create_ErrorLabel(); ! gtk_widget_show(ErrorLabel); ! debug("Root partition size dangerously low, but installing shouldn't fail"); return FALSE; } --- 96,107 ---- gboolean CheckSizeRootpartition() { ! debug("Info: global cdrom size: %d\nInfo: part used size: %d\n",GetCurrentSize(global_cdrom_size),GetTotalPartSize(GetSelectedRoot())); ! gint expected_size = GetCurrentSize(global_cdrom_size); ! gint available_size = GetTotalPartSize(GetSelectedRoot()); ! debug("Info: Expected size: %d Available size on root: %d\n",expected_size,available_size); ! if (expected_size + 100 >= available_size) { ! SmallRoot = create_SmallRoot(); ! gtk_widget_show(SmallRoot); ! debug("Warning: Root partition size dangerously low or not enough for safely installing Morphix\n"); return FALSE; } *************** *** 119,125 **** if (data == NULL) return FALSE; ! gint curr_rootpart_size = GetPartUsedSize(GetSelectedRoot()); gdouble fraction = GetCurrentPercentage(global_cdrom_size,curr_rootpart_size); ! printf("Curr rootpart: %d\nCurr fraction: %f\nCurr global cdrom size: %d\n", curr_rootpart_size,fraction,global_cdrom_size); updateInstallLabel(curr_rootpart_size,GetCurrentSize(global_cdrom_size)); --- 118,124 ---- if (data == NULL) return FALSE; ! gint curr_rootpart_size = GetUsedPartSize(GetSelectedRoot()); gdouble fraction = GetCurrentPercentage(global_cdrom_size,curr_rootpart_size); ! debug("Info: Curr rootpart: %d\nInfo: Curr fraction: %f\nInfo: Curr global cdrom size: %d\n", curr_rootpart_size,fraction,global_cdrom_size); updateInstallLabel(curr_rootpart_size,GetCurrentSize(global_cdrom_size)); *************** *** 259,266 **** void updateInstallLabel(gint current, gint total) { GtkWidget *labelInstallprocess = lookup_widget(DoInstall,"labelInstallprocess"); ! if (current > total) { ! current = total - 1; } - gchar *label_str = g_strdup_printf("%dMiB from a total of approx. %dMiB have been copied\n",current,total); gtk_label_set_text(GTK_LABEL(labelInstallprocess),label_str); g_free(label_str); --- 258,271 ---- void updateInstallLabel(gint current, gint total) { GtkWidget *labelInstallprocess = lookup_widget(DoInstall,"labelInstallprocess"); ! gchar *label_str = NULL; ! if (total <= 0) { ! label_str = g_strdup_printf("Couldn't detect size of files in /cdrom,\n%dMiB have been copied\n",current); ! } ! else { ! if (current > total) { ! current = total - 1; ! } ! label_str = g_strdup_printf("%dMiB from a total of approx. %dMiB have been copied\n",current,total); } gtk_label_set_text(GTK_LABEL(labelInstallprocess),label_str); g_free(label_str); |
|
From: <ale...@us...> - 2004-03-10 20:12:21
|
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10501 Modified Files: instlib.c instlib.h Log Message: fixed const, fixed scandir NULL-function (could use a test though) Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** instlib.c 7 Mar 2004 21:19:07 -0000 1.15 --- instlib.c 10 Mar 2004 19:46:14 -0000 1.16 *************** *** 60,64 **** gchar *cmdline; gchar *entryname; ! GDir *dir = g_dir_open("/mnt",0,NULL); if (dir == NULL) return FALSE; --- 60,64 ---- gchar *cmdline; gchar *entryname; ! GDir *dir = g_dir_open(PATH_MNT_DIR,0,NULL); if (dir == NULL) return FALSE; *************** *** 571,578 **** } - static int one (struct dirent *unused) { - return 1; - } - void CopyKernel() { /* --- 571,574 ---- *************** *** 612,616 **** // if we have scsi harddisks, check to see which scsi modules we need if (strstr(GetSelectedHarddisk(),"sd") != NULL) { ! n = scandir(scsipath,&ep, one,alphasort); if (n >= 0) { int cnt; --- 608,612 ---- // if we have scsi harddisks, check to see which scsi modules we need if (strstr(GetSelectedHarddisk(),"sd") != NULL) { ! n = scandir(scsipath,&ep, NULL,alphasort); if (n >= 0) { int cnt; Index: instlib.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** instlib.h 16 Feb 2004 23:42:12 -0000 1.7 --- instlib.h 10 Mar 2004 19:46:14 -0000 1.8 *************** *** 29,32 **** --- 29,33 ---- #define MAX_MINIMODULES 64 + #define PATH_MNT_DIR "/mnt" #define GRUB_MENU_LOCATION "/boot/grub/menu.lst" #define PROC_CMDLINE "/proc/cmdline" |
|
From: <gan...@us...> - 2004-03-08 23:27:12
|
Update of /cvsroot/morphix/mcp/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14730/mcp/debian Modified Files: changelog Log Message: * small fixes to that packages is almost lintian clean now Index: changelog =================================================================== RCS file: /cvsroot/morphix/mcp/debian/changelog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** changelog 8 Mar 2004 22:41:10 -0000 1.2 --- changelog 8 Mar 2004 23:02:33 -0000 1.3 *************** *** 1,6 **** mcp (0.2-0) unstable; urgency=low * added libegg iconviewer instead - * added suggests line -- Jure Cuhalev <ga...@a1...> Mon, 8 Mar 2004 23:50:05 +0100 --- 1,13 ---- + mcp (0.2-1) unstable; urgency=low + + * added recommends + * moved README.Debian to README + * fixed a typo in copyrights + + -- Jure Cuhalev <ga...@a1...> Tue, 9 Mar 2004 00:01:22 +0100 + mcp (0.2-0) unstable; urgency=low * added libegg iconviewer instead -- Jure Cuhalev <ga...@a1...> Mon, 8 Mar 2004 23:50:05 +0100 |
|
From: <gan...@us...> - 2004-03-08 23:23:37
|
Update of /cvsroot/morphix/mcp/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13932/mcp/debian Removed Files: README.Debian Log Message: * bye bye file until we need it again --- README.Debian DELETED --- |
|
From: <gan...@us...> - 2004-03-08 23:12:25
|
Update of /cvsroot/morphix/mcp/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11285/mcp/debian Modified Files: copyright Log Message: * fixed a typo Index: copyright =================================================================== RCS file: /cvsroot/morphix/mcp/debian/copyright,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copyright 7 Mar 2004 23:14:27 -0000 1.1 --- copyright 8 Mar 2004 22:47:47 -0000 1.2 *************** *** 4,8 **** It was downloaded from http://www.morphix.org ! Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers Copyright (C) 2003-2004 Alex de Landgraaf --- 4,8 ---- It was downloaded from http://www.morphix.org ! Upstream Authors: Alex de Landgraaf <ale...@xs...> and a few contributers Copyright (C) 2003-2004 Alex de Landgraaf |
|
From: <gan...@us...> - 2004-03-08 23:09:08
|
Update of /cvsroot/morphix/mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650/mcp Modified Files: README Log Message: * now is non-empty Index: README =================================================================== RCS file: /cvsroot/morphix/mcp/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README 1 Sep 2003 19:25:12 -0000 1.1.1.1 --- README 8 Mar 2004 22:44:30 -0000 1.2 *************** *** 0 **** --- 1,7 ---- + mcp for Debian + -------------- + + morphix-control-panel: mcp with default panel + mcp: single panel binary, give directory as argument + + See: http://www.morphix.org for more information |
|
From: <gan...@us...> - 2004-03-08 23:05:47
|
Update of /cvsroot/morphix/mcp/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9933/mcp/debian Modified Files: changelog Log Message: Index: changelog =================================================================== RCS file: /cvsroot/morphix/mcp/debian/changelog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** changelog 7 Mar 2004 23:14:27 -0000 1.1 --- changelog 8 Mar 2004 22:41:10 -0000 1.2 *************** *** 2,7 **** * added libegg iconviewer instead ! -- Alex de Landgraaf <ale...@xs...> Mon, 8 Mar 2004 00:04:34 +0000 mcp (0.1-2) unstable; urgency=low --- 2,8 ---- * added libegg iconviewer instead + * added suggests line ! -- Jure Cuhalev <ga...@a1...> Mon, 8 Mar 2004 23:50:05 +0100 mcp (0.1-2) unstable; urgency=low |
|
From: <gan...@us...> - 2004-03-08 23:05:20
|
Update of /cvsroot/morphix/mcp/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9838/mcp/debian Modified Files: control Log Message: * added suggests Index: control =================================================================== RCS file: /cvsroot/morphix/mcp/debian/control,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** control 7 Mar 2004 23:14:27 -0000 1.1 --- control 8 Mar 2004 22:40:42 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- Replaces: mcp2 Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libglib2.0-0, libgtk2.0-0, libpango1.0-0, libxml2 + Recommends: datetimeconf, gpppoeconf, keybconf, langconf, morphixinstaller, networkconf, partitionmorpher Description: Morphix Control Panel A simple panel, taking an xml file as input to display |
|
From: <ale...@us...> - 2004-03-08 21:56:06
|
Update of /cvsroot/morphix/mcp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25728/src Modified Files: Makefile Makefile.am Makefile.in eggiconlist.o eggmarshalers.o eggtrayicon.o Log Message: various makefile/debian fixes (think mcp needs some cleaning up by the looks of this commit...) Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 7 Mar 2004 22:58:24 -0000 1.7 --- Makefile 8 Mar 2004 21:31:29 -0000 1.8 *************** *** 114,118 **** includedir = ${prefix}/include infodir = ${prefix}/share/info ! install_sh = /root/morphix/mcp/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec --- 114,118 ---- includedir = ${prefix}/include infodir = ${prefix}/share/info ! install_sh = /root/morphix/mcp-0.1/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec *************** *** 133,138 **** - bin_SCRIPTS = morphix-control-panel - bin_PROGRAMS = mcp --- 133,136 ---- *************** *** 166,171 **** mcp_DEPENDENCIES = mcp_LDFLAGS = - SCRIPTS = $(bin_SCRIPTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --- 164,167 ---- *************** *** 223,246 **** @rm -f mcp$(EXEEXT) $(LINK) $(mcp_LDFLAGS) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS) - binSCRIPT_INSTALL = $(INSTALL_SCRIPT) - install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ - $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - - uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ - done mostlyclean-compile: --- 219,222 ---- *************** *** 371,378 **** check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) $(SCRIPTS) installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am --- 347,354 ---- check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am *************** *** 419,423 **** install-data-am: ! install-exec-am: install-binPROGRAMS install-binSCRIPTS install-info: install-info-am --- 395,399 ---- install-data-am: ! install-exec-am: install-binPROGRAMS install-info: install-info-am *************** *** 444,461 **** ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ ! uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-binPROGRAMS \ ! install-binSCRIPTS install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-binSCRIPTS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 420,435 ---- ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-binPROGRAMS install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-man install-strip installcheck \ ! installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 7 Mar 2004 22:58:24 -0000 1.6 --- Makefile.am 8 Mar 2004 21:31:29 -0000 1.7 *************** *** 6,11 **** @PACKAGE_CFLAGS@ - bin_SCRIPTS = morphix-control-panel - bin_PROGRAMS = mcp --- 6,9 ---- Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 7 Mar 2004 22:58:24 -0000 1.7 --- Makefile.in 8 Mar 2004 21:31:29 -0000 1.8 *************** *** 133,138 **** - bin_SCRIPTS = morphix-control-panel - bin_PROGRAMS = mcp --- 133,136 ---- *************** *** 166,171 **** mcp_DEPENDENCIES = mcp_LDFLAGS = - SCRIPTS = $(bin_SCRIPTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --- 164,167 ---- *************** *** 223,246 **** @rm -f mcp$(EXEEXT) $(LINK) $(mcp_LDFLAGS) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS) - binSCRIPT_INSTALL = $(INSTALL_SCRIPT) - install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ - $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - - uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ - done mostlyclean-compile: --- 219,222 ---- *************** *** 371,378 **** check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) $(SCRIPTS) installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am --- 347,354 ---- check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am *************** *** 419,423 **** install-data-am: ! install-exec-am: install-binPROGRAMS install-binSCRIPTS install-info: install-info-am --- 395,399 ---- install-data-am: ! install-exec-am: install-binPROGRAMS install-info: install-info-am *************** *** 444,461 **** ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ ! uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-binPROGRAMS \ ! install-binSCRIPTS install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-binSCRIPTS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 420,435 ---- ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-binPROGRAMS install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-man install-strip installcheck \ ! installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: eggiconlist.o =================================================================== RCS file: /cvsroot/morphix/mcp/src/eggiconlist.o,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsbMQLC1 and /tmp/cvsYW3h1B differ Index: eggmarshalers.o =================================================================== RCS file: /cvsroot/morphix/mcp/src/eggmarshalers.o,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsnnoavk and /tmp/cvsVwMh1U differ Index: eggtrayicon.o =================================================================== RCS file: /cvsroot/morphix/mcp/src/eggtrayicon.o,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsqwBwtt and /tmp/cvsPXZp63 differ |
|
From: <ale...@us...> - 2004-03-08 21:56:04
|
Update of /cvsroot/morphix/mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25728 Modified Files: Makefile config.log config.status Log Message: various makefile/debian fixes (think mcp needs some cleaning up by the looks of this commit...) Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 7 Mar 2004 22:58:23 -0000 1.4 --- Makefile 8 Mar 2004 21:31:28 -0000 1.5 *************** *** 114,118 **** includedir = ${prefix}/include infodir = ${prefix}/share/info ! install_sh = /root/morphix/mcp/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec --- 114,118 ---- includedir = ${prefix}/include infodir = ${prefix}/share/info ! install_sh = /root/morphix/mcp-0.1/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec Index: config.log =================================================================== RCS file: /cvsroot/morphix/mcp/config.log,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.log 7 Mar 2004 22:58:24 -0000 1.5 --- config.log 8 Mar 2004 21:31:28 -0000 1.6 *************** *** 569,573 **** includedir='${prefix}/include' infodir='${prefix}/share/info' ! install_sh='/root/morphix/mcp/install-sh' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' --- 569,573 ---- includedir='${prefix}/include' infodir='${prefix}/share/info' ! install_sh='/root/morphix/mcp-0.1/install-sh' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' Index: config.status =================================================================== RCS file: /cvsroot/morphix/mcp/config.status,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.status 7 Mar 2004 22:58:24 -0000 1.4 --- config.status 8 Mar 2004 21:31:28 -0000 1.5 *************** *** 499,503 **** s,@MAKEINFO@,makeinfo,;t t s,@AMTAR@,tar,;t t ! s,@install_sh@,/root/morphix/mcp/install-sh,;t t s,@STRIP@,,;t t s,@ac_ct_STRIP@,,;t t --- 499,503 ---- s,@MAKEINFO@,makeinfo,;t t s,@AMTAR@,tar,;t t ! s,@install_sh@,/root/morphix/mcp-0.1/install-sh,;t t s,@STRIP@,,;t t s,@ac_ct_STRIP@,,;t t |
|
From: <ale...@us...> - 2004-03-08 21:56:04
|
Update of /cvsroot/morphix/mcp/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25728/debian Added Files: README.Debian compat Log Message: various makefile/debian fixes (think mcp needs some cleaning up by the looks of this commit...) --- NEW FILE: README.Debian --- mcp for Debian -------------- morphix-control-panel: mcp with default panel mcp: single panel binary, give directory as argument -- Alex de Landgraaf <ale...@xs...>, Mon, 8 Mar 2004 22:14:52 +0000 --- NEW FILE: compat --- 4 |
|
From: <ale...@us...> - 2004-03-08 01:05:16
|
Update of /cvsroot/morphix/mcp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11543/src Modified Files: callbacks.c callbacks.h dirtree.c dirtree.h iconviewer.c interface.c Log Message: mcp now starts itself when selecting item in dirtree (was this already done in your version Tiago?) anyway, it now uses the paned widget, resizes itself when .directory items are in subdirectories. makes itself smaller when tree widget is hidden think i'll call it a night... Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/callbacks.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** callbacks.c 3 Mar 2004 21:16:43 -0000 1.16 --- callbacks.c 8 Mar 2004 00:41:17 -0000 1.17 *************** *** 82,90 **** GtkWidget *treeview = lookup_widget(MainWindow,"treeview1"); GtkWidget *scrolledwindow = lookup_widget(MainWindow,"scrolledwindow3"); gtk_widget_show(treeview); gtk_widget_show(scrolledwindow); ! dirtree_new(treeview,get_panel_path(),FALSE,FALSE,NULL); ! gtk_widget_set_size_request(treeview,100,100); ! gtk_widget_set_size_request(scrolledwindow,100,100); } --- 82,92 ---- GtkWidget *treeview = lookup_widget(MainWindow,"treeview1"); GtkWidget *scrolledwindow = lookup_widget(MainWindow,"scrolledwindow3"); + GtkWidget *paned = lookup_widget(MainWindow,"hpaned1"); gtk_widget_show(treeview); gtk_widget_show(scrolledwindow); ! dirtree_new(treeview,get_panel_path(),FALSE,FALSE,FALSE,NULL); ! gtk_paned_set_position(GTK_PANED(paned),160); ! // gtk_widget_set_size_request(treeview,100,100); ! // gtk_widget_set_size_request(scrolledwindow,100,100); } *************** *** 92,95 **** --- 94,98 ---- GtkWidget *treeview = lookup_widget(MainWindow,"scrolledwindow3"); gtk_widget_hide(treeview); + gtk_window_resize(GTK_WINDOW(MainWindow),455,400); } *************** *** 101,105 **** { gboolean expand = FALSE; - GtkWidget *da = lookup_widget(MainWindow,"MainDrawingArea"); GtkWidget *scrolledwindow = lookup_widget(MainWindow,"scrolledwindow2"); --- 104,107 ---- *************** *** 132,133 **** --- 134,153 ---- } + + void + on_treeview1_row_activated (GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer user_data) + { + gchar *str = dirtree_get_selected(gtk_tree_view_get_selection(treeview)); + if (str == NULL) { + debug("Can't use selected item, no filename\n"); + return; + } + gchar *cmd = g_strdup_printf("mcp %s/",str); + g_free(str); + ExecuteAsyncCommand(cmd); + g_free(cmd); + } + Index: callbacks.h =================================================================== RCS file: /cvsroot/morphix/mcp/src/callbacks.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** callbacks.h 2 Mar 2004 17:09:11 -0000 1.4 --- callbacks.h 8 Mar 2004 00:41:17 -0000 1.5 *************** *** 44,45 **** --- 44,51 ---- GdkEventConfigure *event, gpointer user_data); + + void + on_treeview1_row_activated (GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer user_data); Index: dirtree.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/dirtree.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dirtree.c 2 Mar 2004 23:41:05 -0000 1.8 --- dirtree.c 8 Mar 2004 00:41:17 -0000 1.9 *************** *** 17,20 **** --- 17,30 ---- }; + void dirtree_set_include_nondirfile(GtkWidget *tree, gboolean inc) + { + g_object_set_data(G_OBJECT(tree), "include-nondirfile", GINT_TO_POINTER(inc)); + } + + gboolean dirtree_get_include_nondirfile(GtkWidget *tree) + { + return (gboolean) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tree), "include-nondirfile")); + } + void dirtree_set_include_base(GtkWidget *tree, gboolean inc) { *************** *** 59,63 **** /** * Imports a dir and checks for the .directory file which holds the dir properties ! * Note: the filename must *not* have a trayling slash * Alloced: * dir --- 69,73 ---- /** * Imports a dir and checks for the .directory file which holds the dir properties ! * Note: the filename must *not* have a trailing slash * Alloced: * dir *************** *** 84,88 **** // TODO remove this check if(filename[strlen(filename) - 1] == '/') { ! debug("dirtree_set_dir: The following thir was given a trailing slash \"%s\"\n", filename); filename[strlen(filename) - 1] = 0; } --- 94,98 ---- // TODO remove this check if(filename[strlen(filename) - 1] == '/') { ! debug("dirtree_set_dir: The following dir was given a trailing slash \"%s\"\n", filename); filename[strlen(filename) - 1] = 0; } *************** *** 131,137 **** gnome_desktop_file_free(df); } else { ! title = dir; ! comment = g_strdup(""); ! buf = dirtree_get_default_icon(tree); } // Free the .directory filename --- 141,149 ---- gnome_desktop_file_free(df); } else { ! if (dirtree_get_include_nondirfile(tree)) { ! title = dir; ! comment = g_strdup(""); ! buf = dirtree_get_default_icon(tree); ! } } // Free the .directory filename *************** *** 143,147 **** COMMENT_COL, comment, -1); - } --- 155,158 ---- *************** *** 258,261 **** --- 269,274 ---- if(g_object_get_data(G_OBJECT(tree), "include-base") == NULL) dirtree_set_include_base(tree, FALSE); + if(g_object_get_data(G_OBJECT(tree), "include-nondirfile") == NULL) + dirtree_set_include_nondirfile(tree, FALSE); gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store)); *************** *** 302,310 **** * base, when it's invalid */ ! void dirtree_new (GtkWidget *tree,gchar* base, gboolean show_hidden, gboolean include_base, GdkPixbuf* default_icon) { base = g_strdup(base); if(base[strlen(base) - 1] == '/') { ! debug("dirtree_new: The following thir was given a trailing slash \"%s\"\n", base); base[strlen(base) - 1] = '\0'; debug("dirtree_new: New path \"%s\"\n", base); --- 315,323 ---- * base, when it's invalid */ ! void dirtree_new (GtkWidget *tree,gchar* base, gboolean show_hidden, gboolean include_base, gboolean include_nondirfile, GdkPixbuf* default_icon) { base = g_strdup(base); if(base[strlen(base) - 1] == '/') { ! debug("dirtree_new: The following dir was given a trailing slash \"%s\"\n", base); base[strlen(base) - 1] = '\0'; debug("dirtree_new: New path \"%s\"\n", base); *************** *** 314,317 **** --- 327,331 ---- dirtree_set_default_icon(tree, default_icon); dirtree_set_include_base(tree, include_base); + dirtree_set_include_nondirfile(tree, include_nondirfile); dirtree_setup(tree); return tree; Index: dirtree.h =================================================================== RCS file: /cvsroot/morphix/mcp/src/dirtree.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dirtree.h 2 Mar 2004 23:41:05 -0000 1.4 --- dirtree.h 8 Mar 2004 00:41:17 -0000 1.5 *************** *** 3,6 **** --- 3,13 ---- /* + * Wether or not to include subdirectories without .directory files + */ + + void dirtree_set_include_nondirfile(GtkWidget *tree, gboolean inc); + gboolean dirtree_get_include_nondirfile(GtkWidget *tree); + + /* * Wether or not to include the base directory into the tree */ *************** *** 45,49 **** * Creates a new dirtree object */ ! void dirtree_new (GtkWidget *treeview,gchar* base, gboolean show_hidden, gboolean include_base, GdkPixbuf *icon); ! ! --- 52,54 ---- * Creates a new dirtree object */ ! void dirtree_new (GtkWidget *treeview,gchar* base, gboolean show_hidden, gboolean include_base, gboolean include_nondirfile, GdkPixbuf *icon); Index: iconviewer.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/iconviewer.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** iconviewer.c 3 Mar 2004 21:16:44 -0000 1.8 --- iconviewer.c 8 Mar 2004 00:41:17 -0000 1.9 *************** *** 28,31 **** --- 28,34 ---- extern GtkWidget *MainWindow; + #define MAX_ICON_WIDTH 32 + #define MAX_ICON_HEIGHT 32 + /* globals */ GList *items; *************** *** 34,56 **** int iconviewer_width; - #define MAX_ICON_WIDTH 32 - #define MAX_ICON_HEIGHT 32 - - GdkPixbuf *image; - - /* GDK_WINDOW coord helpers */ - int top_border = 5; - int side_border = 5; - int box_width = 84; - int box_height = 84; - int icon_width = MAX_ICON_WIDTH; - int icon_height = MAX_ICON_HEIGHT; - int icon_from_top = 0; - int text_from_top = 20; - - GdkPixbuf *iv_get_image() { - return image; - } - gboolean ExecuteAsyncCommand(gchar *command) { debug("Exec: %s\n",command); --- 37,40 ---- Index: interface.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/interface.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** interface.c 3 Mar 2004 21:16:44 -0000 1.5 --- interface.c 8 Mar 2004 00:41:17 -0000 1.6 *************** *** 40,44 **** MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (MainWindow), _("Morphix Control Panel")); ! gtk_window_set_default_size (GTK_WINDOW (MainWindow), 450, 350); gtk_window_set_destroy_with_parent (GTK_WINDOW (MainWindow), TRUE); --- 40,44 ---- MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (MainWindow), _("Morphix Control Panel")); ! gtk_window_set_default_size (GTK_WINDOW (MainWindow), 650, 400); gtk_window_set_destroy_with_parent (GTK_WINDOW (MainWindow), TRUE); *************** *** 54,58 **** scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow3); ! gtk_paned_pack1 (GTK_PANED (hpaned1), scrolledwindow3, FALSE, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); --- 54,58 ---- scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow3); ! gtk_paned_pack1 (GTK_PANED (hpaned1), scrolledwindow3, TRUE, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); *************** *** 81,84 **** --- 81,87 ---- G_CALLBACK (on_MainWindow_configure_event), NULL); + g_signal_connect ((gpointer) treeview1, "row_activated", + G_CALLBACK (on_treeview1_row_activated), + NULL); /* Store pointers to all widgets, for use by lookup_widget(). */ |
|
From: <ale...@us...> - 2004-03-08 01:05:16
|
Update of /cvsroot/morphix/mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11543 Modified Files: mcp.glade Log Message: mcp now starts itself when selecting item in dirtree (was this already done in your version Tiago?) anyway, it now uses the paned widget, resizes itself when .directory items are in subdirectories. makes itself smaller when tree widget is hidden think i'll call it a night... Index: mcp.glade =================================================================== RCS file: /cvsroot/morphix/mcp/mcp.glade,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mcp.glade 7 Mar 2004 22:58:24 -0000 1.4 --- mcp.glade 8 Mar 2004 00:41:17 -0000 1.5 *************** *** 10,15 **** <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> ! <property name="default_width">450</property> ! <property name="default_height">350</property> <property name="resizable">True</property> <property name="destroy_with_parent">True</property> --- 10,15 ---- <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> ! <property name="default_width">650</property> ! <property name="default_height">400</property> <property name="resizable">True</property> <property name="destroy_with_parent">True</property> *************** *** 48,51 **** --- 48,52 ---- <property name="reorderable">False</property> <property name="enable_search">True</property> + <signal name="row_activated" handler="on_treeview1_row_activated" last_modification_time="Mon, 08 Mar 2004 00:17:59 GMT"/> </widget> </child> *************** *** 53,57 **** <packing> <property name="shrink">True</property> ! <property name="resize">False</property> </packing> </child> --- 54,58 ---- <packing> <property name="shrink">True</property> ! <property name="resize">True</property> </packing> </child> |
|
From: <ale...@us...> - 2004-03-08 01:02:46
|
Update of /cvsroot/morphix/mcp/data/main-mcp/modmorph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11459/data/main-mcp/modmorph Added Files: .directory Log Message: lets not forget this one... --- NEW FILE: .directory --- [Desktop Entry] Name=Module Tools Comment=Morphix menu Exec=cd ../ Icon=/usr/share/mcp/pixmaps/mcp.png Type=Directory |
|
From: <ale...@us...> - 2004-03-08 01:02:06
|
Update of /cvsroot/morphix/mcp/data/main-mcp/modmorph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11243/data/main-mcp/modmorph Added Files: cdpersistant.desktop install2mainmod.desktop Log Message: adding mcp data subdir --- NEW FILE: cdpersistant.desktop --- [Desktop Entry] Name=Save homedirectory as minimodule Comment=Save homedirectory Exec=cdpersistent Icon=/usr/share/mcp/pixmaps/mcp.png --- NEW FILE: install2mainmod.desktop --- [Desktop Entry] Name=Build mainmodule from system Comment=Build mainmodule from system Exec=xterm -e install2mainmod Icon=/usr/share/mcp/pixmaps/mcp.png |
|
From: <ale...@us...> - 2004-03-08 01:00:34
|
Update of /cvsroot/morphix/mcp/data/main-mcp/modmorph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11018/data/main-mcp/modmorph Log Message: Directory /cvsroot/morphix/mcp/data/main-mcp/modmorph added to the repository |
|
From: <ale...@us...> - 2004-03-07 23:38:19
|
Update of /cvsroot/morphix/mcp/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31013 Added Files: changelog control copyright dirs docs rules Log Message: adding debian stuff --- NEW FILE: changelog --- mcp (0.2-0) unstable; urgency=low * added libegg iconviewer instead -- Alex de Landgraaf <ale...@xs...> Mon, 8 Mar 2004 00:04:34 +0000 mcp (0.1-2) unstable; urgency=low * removed html stuff -- Alex de Landgraaf <ale...@xs...> Mon, 2 Feb 2004 02:18:49 +0000 mcp (0.1-1) unstable; urgency=low * Initial Release. -- Alex de Landgraaf <ale...@xs...> Sat, 3 Jan 2004 15:41:49 +0000 --- NEW FILE: control --- Source: mcp Section: admin Priority: optional Maintainer: Alex de Landgraaf <ale...@xs...> Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.6.0 Package: mcp Architecture: i386 Conflicts: mcp2 Replaces: mcp2 Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libglib2.0-0, libgtk2.0-0, libpango1.0-0, libxml2 Description: Morphix Control Panel A simple panel, taking an xml file as input to display a number of options. Flexible to be used for a number of uses, however mcp was designed to be used for easily starting various system administration tools. --- NEW FILE: copyright --- This package was debianized by Alex de Landgraaf <ale...@xs...> on Sat, 3 Jan 2004 14:58:44 +0000. It was downloaded from http://www.morphix.org Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers Copyright (C) 2003-2004 Alex de Landgraaf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. --- NEW FILE: dirs --- usr/bin usr/sbin --- NEW FILE: docs --- NEWS README --- NEW FILE: rules --- #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif config.status: configure dh_testdir # Add here commands to configure the package. ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info build: build-stamp build-stamp: config.status dh_testdir # Add here commands to compile the package. $(MAKE) touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the package into debian/mcp. $(MAKE) install DESTDIR=$(CURDIR)/debian/mcp # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs dh_installexamples # dh_install # dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime # dh_installinit # dh_installcron # dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms # dh_perl # dh_python # dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install |
1 message has been excluded from this view by a project administrator.
