- https-redirect.patch from PLD

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

diff --git a/poldek-config.patch b/poldek-config.patch
index 311a88b25c2d356bd6cd02a0213c59dbc2cfbefd..57abe210c334d02378e9114f435ae97d59b784ca 100644 (file)
--- a/poldek-config.patch
+++ b/poldek-config.patch
@@ -1,16 +1,17 @@
---- 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 @@
- #confirm removal = yes
- 
- # Let the user select package among equivalents.
--#choose equivalents manually = no
-+choose equivalents manually = yes
+--- poldek-0.30.0/conf/poldek.conf     2013-07-08 14:19:35.294351501 +0300
++++ poldek-0.30.0/conf/poldek.conf     2013-07-08 14:06:38.722878665 +0300
+@@ -132,12 +132,11 @@
  
  # 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*
++#hold = kernel*
  
  # Ignore package list - packages fits given mask will be invisible.
  # ignore = *-smp-* foo*
+-# ignore = vserver-packages
+-#ignore = vserver-packages
++ignore = vserver-packages
+ 
+ # Conflicts with already installed packages are treated as resolved
+ # if at least one of multiple-installed package satisfies conflict.