Author: wade
Date: 2006-10-04 20:08:13 -0400 (Wed, 04 Oct 2006)
New Revision: 66274

Modified:
   trunk/release/conf/gtk-sharp-2.0/ximian-build.conf
   trunk/release/conf/mono-tools/ximian-build.conf
   trunk/release/packaging/defs/gecko-sharp-2.0
   trunk/release/packaging/defs/gtksourceview-sharp-2.0
   trunk/release/packaging/defs/last-exit
   trunk/release/packaging/defs/mono-tools
   trunk/release/packaging/defs/monodevelop
Log:
gtk-sharp-2.0/ximian-build.conf:
-don't have doc package depend on mono-tools in order to
 avoid a circular dep

mono-tools/ximian-build.conf:
-update to build new version, which uses gtk#2 instead of gtk#1

defs:
-update silly deps where we pulled in gtk#1 or mono-tools because
 deps that no longer exist



Modified: trunk/release/conf/gtk-sharp-2.0/ximian-build.conf
===================================================================
--- trunk/release/conf/gtk-sharp-2.0/ximian-build.conf  2006-10-04 22:02:15 UTC 
(rev 66273)
+++ trunk/release/conf/gtk-sharp-2.0/ximian-build.conf  2006-10-05 00:08:13 UTC 
(rev 66274)
@@ -422,9 +422,10 @@
  
         <psdata id="group">Development/Libraries</psdata>
 
-        <dep id="requires">
+       <!-- nope... circular dep -->
+        <!-- <dep id="requires">
           <i>mono-tools</i>
-        </dep>
+        </dep> -->
  
         <files>
           <i>[[usrprefix]]/lib/monodoc</i>

Modified: trunk/release/conf/mono-tools/ximian-build.conf
===================================================================
--- trunk/release/conf/mono-tools/ximian-build.conf     2006-10-04 22:02:15 UTC 
(rev 66273)
+++ trunk/release/conf/mono-tools/ximian-build.conf     2006-10-05 00:08:13 UTC 
(rev 66274)
@@ -26,10 +26,14 @@
       <psdata id="buildarch">noarch</psdata>
 
       <builddep id="buildrequires">
-        <i>gtk-sharp</i>
+        <i>gecko-sharp2</i>
+        <i>gtk-sharp2</i>
+        <i>gconf-sharp2</i>
+        <i>glade-sharp2</i>
+        <i>gtkhtml-sharp2</i>
         <i>mono-devel</i>
+        <i>mono-nunit</i>
         <i>monodoc-core</i>
-        <i>gecko-sharp</i>
       </builddep>
       
       <package id="default">

Modified: trunk/release/packaging/defs/gecko-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gecko-sharp-2.0        2006-10-04 22:02:15 UTC 
(rev 66273)
+++ trunk/release/packaging/defs/gecko-sharp-2.0        2006-10-05 00:08:13 UTC 
(rev 66274)
@@ -26,7 +26,6 @@
        gtk-sharp-2.0
        monodoc
        mono-tools
-       gecko-sharp
 )
 
 get_destroot () {

Modified: trunk/release/packaging/defs/gtksourceview-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gtksourceview-sharp-2.0        2006-10-04 
22:02:15 UTC (rev 66273)
+++ trunk/release/packaging/defs/gtksourceview-sharp-2.0        2006-10-05 
00:08:13 UTC (rev 66274)
@@ -26,10 +26,7 @@
 MONO_DEPS=(
        mono
        gtk-sharp-2.0
-       gtk-sharp
        monodoc
-       mono-tools
-       gecko-sharp
 )
 
 

Modified: trunk/release/packaging/defs/last-exit
===================================================================
--- trunk/release/packaging/defs/last-exit      2006-10-04 22:02:15 UTC (rev 
66273)
+++ trunk/release/packaging/defs/last-exit      2006-10-05 00:08:13 UTC (rev 
66274)
@@ -8,10 +8,6 @@
 MONO_DEPS=(
        mono
        gtk-sharp-2.8
-       mono-tools
-       gtk-sharp
-       gecko-sharp
-       monodoc
 )
 
 get_destroot () {

Modified: trunk/release/packaging/defs/mono-tools
===================================================================
--- trunk/release/packaging/defs/mono-tools     2006-10-04 22:02:15 UTC (rev 
66273)
+++ trunk/release/packaging/defs/mono-tools     2006-10-05 00:08:13 UTC (rev 
66274)
@@ -30,14 +30,11 @@
        win-4-i386
 )
 
-# Ugh... mono-tools depends on itself because gtk-sharp-2.0 depends on 
mono-tools
 MONO_DEPS=(
        mono
        monodoc
-       gtk-sharp
        gtk-sharp-2.0
-       mono-tools
-       gecko-sharp
+       gecko-sharp-2.0
 )
 
 

Modified: trunk/release/packaging/defs/monodevelop
===================================================================
--- trunk/release/packaging/defs/monodevelop    2006-10-04 22:02:15 UTC (rev 
66273)
+++ trunk/release/packaging/defs/monodevelop    2006-10-05 00:08:13 UTC (rev 
66274)
@@ -29,16 +29,11 @@
        gtksourceview-sharp-2.0
        boo
        ikvm
-       mono-tools
-       gtk-sharp
-       gecko-sharp
        nant
        mono-basic
        xsp
 )
 
-# The above gtk# 1 deps had to be added because of the gtk-sharp-2.0 -> 
mono-tools req
-
 get_destroot () {
        DEST_ROOT=noarch
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to