- merged update to 0.30.0rc7 from PLD

[packages/poldek.git] / poldek-config.patch

diff --git a/poldek-config.patch b/poldek-config.patch
index 311a88b25c2d356bd6cd02a0213c59dbc2cfbefd..5f1f5a35da8030483231cc26d7a1fd45dfbe31a9 100644 (file)
--- a/poldek-config.patch
+++ b/poldek-config.patch
@@ -1,6 +1,26 @@
---- poldek-0.30-cvs20080519.22/conf/poldek.conf        2008-05-19 22:09:20.000000000 +0200
-+++ poldek-0.30-cvs20080519.22.new/conf/poldek.conf    2008-05-19 22:34:49.000000000 +0200
-@@ -127,11 +127,10 @@
+--- poldek-0.30/doc/poldek.conf.xml    2012-04-04 11:37:12.737381529 +0300
++++ poldek-0.30/doc/poldek.conf.xml    2012-04-04 11:38:47.231352866 +0300
+@@ -369,7 +369,7 @@
+     </description>
+   </option>
+ 
+-  <option name="choose equivalents manually" type="boolean" default="no" op="EQPKG_ASKUSER">
++  <option name="choose equivalents manually" type="boolean" default="yes" op="EQPKG_ASKUSER">
+     <description>
+     Let the user select package among equivalents.
+     </description>
+@@ -598,7 +598,7 @@
+     </description>
+   </option>
+ 
+-  <option name="hold" type="string" list="yes" default="" multiple="yes">
++  <option name="hold" type="string" list="yes" default="kernel*" multiple="yes">
+     <description>
+     Have the same meaning as [ global ] parameter. Example:
+     [screen]
+--- poldek-0.30/conf/poldek.conf~      2010-08-22 14:19:51.000000000 +0300
++++ poldek-0.30/conf/poldek.conf       2010-08-22 14:20:28.524878981 +0300
+@@ -128,11 +128,11 @@
  #confirm removal = yes
  
  # Let the user select package among equivalents.
@@ -10,7 +30,19 @@
  # Prevent package listed from being upgraded if they are already installed.
 -# hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
 -#hold = 
++# hold = kernel* foo*.i686 ti-ready:bar*.x86_64
 +hold = kernel*
  
  # Ignore package list - packages fits given mask will be invisible.
  # ignore = *-smp-* foo*
+--- poldek-0.30/conf_sections.c~       2012-04-04 12:01:04.000000000 +0300
++++ poldek-0.30/conf_sections.c        2012-04-04 12:04:46.080171888 +0300
+@@ -173,7 +173,7 @@
+              
+    { "choose equivalents manually", 
+      CONF_TYPE_BOOLEAN,
+-             "no",
++             "yes",
+              POLDEK_OP_EQPKG_ASKUSER, { 0 } },
+              
+    { "hold",