packages: poldek/poldek-config.patch - it totally sucks that config can't b...

glen glen at pld-linux.org
Wed Apr 4 11:00:26 CEST 2012


Author: glen                         Date: Wed Apr  4 09:00:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- it totally sucks that config can't be patched, it gets overwriten by .xml generation

---- Files affected:
packages/poldek:
   poldek-config.patch (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/poldek/poldek-config.patch
diff -u packages/poldek/poldek-config.patch:1.10 packages/poldek/poldek-config.patch:1.11
--- packages/poldek/poldek-config.patch:1.10	Tue Jun 29 17:26:46 2010
+++ packages/poldek/poldek-config.patch	Wed Apr  4 11:00:20 2012
@@ -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
+@@ -127,11 +127,11 @@
  #confirm removal = yes
  
  # Let the user select package among equivalents.
@@ -8,7 +28,7 @@
 +choose equivalents manually = yes
  
  # Prevent package listed from being upgraded if they are already installed.
--# hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
+ # hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
 -#hold = 
 +hold = kernel*
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/poldek/poldek-config.patch?r1=1.10&r2=1.11



More information about the pld-cvs-commit mailing list