SOURCES: anaconda-branding.patch, anaconda-kernel.patch, anaconda-...
patrys
patrys at pld-linux.org
Thu Dec 13 22:36:13 CET 2007
Author: patrys Date: Thu Dec 13 21:36:13 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- 11.4.0.8
---- Files affected:
SOURCES:
anaconda-branding.patch (1.4 -> 1.5) , anaconda-kernel.patch (1.6 -> 1.7) , anaconda-libdir.patch (1.5 -> 1.6) , anaconda-pld-release.patch (1.3 -> 1.4) , anaconda-timezone.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/anaconda-branding.patch
diff -u SOURCES/anaconda-branding.patch:1.4 SOURCES/anaconda-branding.patch:1.5
--- SOURCES/anaconda-branding.patch:1.4 Tue Feb 20 21:41:31 2007
+++ SOURCES/anaconda-branding.patch Thu Dec 13 22:36:08 2007
@@ -1,18 +1,18 @@
--- anaconda-11.2.0.24.org/product.py 2006-05-08 22:22:44.000000000 +0200
+++ anaconda-11.2.0.24/product.py 2007-02-20 19:14:33.134623000 +0100
-@@ -23,10 +23,11 @@
+@@ -23,11 +23,11 @@
path = None
productStamp = ""
-productName = "anaconda"
-productVersion = "bluesky"
-productPath = "anaconda"
--bugUrl = "your distribution provided bug reporting tool."
+productName = "PLD Linux Distribution"
+productVersion = "3.0 (Th)"
+productPath = "PLD"
+ productArch = None
+-bugUrl = "your distribution provided bug reporting tool."
+bugUrl = "http://bugs.pld-linux.org/"
-+
if path is not None:
f = open(path, "r")
================================================================
Index: SOURCES/anaconda-kernel.patch
diff -u SOURCES/anaconda-kernel.patch:1.6 SOURCES/anaconda-kernel.patch:1.7
--- SOURCES/anaconda-kernel.patch:1.6 Tue Feb 20 21:41:32 2007
+++ SOURCES/anaconda-kernel.patch Thu Dec 13 22:36:08 2007
@@ -1,11 +1,10 @@
--- anaconda-11.2.0.24.org/yuminstall.py 2007-02-13 14:56:08.000000000 +0100
+++ anaconda-11.2.0.24/yuminstall.py 2007-02-20 19:12:05.894623000 +0100
-@@ -1009,7 +1009,7 @@
-
+@@ -1009,6 +1009,7 @@
# FIXME: this is a bit of a hack. we shouldn't hard-code and
# instead check by provides. but alas.
-- for k in ("kernel", "kernel-smp", "kernel-xen0", "kernel-xen"):
-+ for k in ("kernel", "kernel-smp", "kernel-grsecurity", "kernel-grsecurity-smp", "kernel-xen0", "kernel-xen"):
- if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:
- foundkernel = True
-
+ for k in ("kernel", "kernel-smp", "kernel-xen0", "kernel-xen",
++ "kernel-grsecurity", "kernel-grsecurity-smp",
+ "kernel-PAE"):
+ if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:
+ self.selectModulePackages(anaconda, k)
================================================================
Index: SOURCES/anaconda-libdir.patch
diff -u SOURCES/anaconda-libdir.patch:1.5 SOURCES/anaconda-libdir.patch:1.6
--- SOURCES/anaconda-libdir.patch:1.5 Tue Feb 20 21:41:32 2007
+++ SOURCES/anaconda-libdir.patch Thu Dec 13 22:36:08 2007
@@ -110,18 +110,6 @@
import isys
import string
import stat
-diff -ur anaconda-11.2.0.24/command-stubs/pump-stub anaconda-11.2.0.24/command-stubs/pump-stub
---- anaconda-11.2.0.24/command-stubs/pump-stub 2004-01-23 05:01:21.000000000 +0100
-+++ anaconda-11.2.0.24/command-stubs/pump-stub 2007-02-20 18:19:06.622623000 +0100
-@@ -7,7 +7,7 @@
- if (os.path.exists('isys')):
- sys.path.append('isys')
-
--sys.path.append('/usr/lib/anaconda')
-+sys.path.append('/usr/%s/anaconda' % sys.lib)
-
- import isys
- from sys import argv
diff -ur anaconda-11.2.0.24/command-stubs/raidstart-stub anaconda-11.2.0.24/command-stubs/raidstart-stub
--- anaconda-11.2.0.24/command-stubs/raidstart-stub 2006-03-28 18:49:14.000000000 +0200
+++ anaconda-11.2.0.24/command-stubs/raidstart-stub 2007-02-20 18:19:36.002623000 +0100
================================================================
Index: SOURCES/anaconda-pld-release.patch
diff -u SOURCES/anaconda-pld-release.patch:1.3 SOURCES/anaconda-pld-release.patch:1.4
--- SOURCES/anaconda-pld-release.patch:1.3 Tue Feb 20 21:41:32 2007
+++ SOURCES/anaconda-pld-release.patch Thu Dec 13 22:36:08 2007
@@ -1,15 +1,3 @@
-diff -ur anaconda-11.2.0.24.org/docs/command-line.txt anaconda-11.2.0.24/docs/command-line.txt
---- anaconda-11.2.0.24.org/docs/command-line.txt 2006-12-04 23:05:25.000000000 +0100
-+++ anaconda-11.2.0.24/docs/command-line.txt 2007-02-20 18:24:43.130623000 +0100
-@@ -144,7 +144,7 @@
-
- updates=http://<path> Image containing updates over HTTP.
-
--upgradeany Don't require an /etc/redhat-release that matches the
-+upgradeany Don't require an /etc/pld-release that matches the
- expected syntax to upgrade.
-
- vnc Enable vnc-based installation. You will need to connect
diff -ur anaconda-11.2.0.24.org/partedUtils.py anaconda-11.2.0.24/partedUtils.py
--- anaconda-11.2.0.24.org/partedUtils.py 2007-01-16 20:58:13.000000000 +0100
+++ anaconda-11.2.0.24/partedUtils.py 2007-02-20 18:33:58.522623000 +0100
@@ -96,15 +84,6 @@
diff -ur anaconda-11.2.0.24.org/yuminstall.py anaconda-11.2.0.24/yuminstall.py
--- anaconda-11.2.0.24.org/yuminstall.py 2007-02-13 14:56:08.000000000 +0100
+++ anaconda-11.2.0.24/yuminstall.py 2007-02-20 18:26:50.814623000 +0100
-@@ -495,7 +495,7 @@
- self.conf.reposdir="/tmp/repos.d"
- self.conf.logfile="/tmp/yum.log"
- self.conf.obsoletes=True
-- self.conf.exclude=["*debuginfo*"]
-+ self.conf.exclude=["*debuginfo*", "vserver-packages"]
- self.conf.cache=0
- self.conf.cachedir = '/tmp/cache/'
- self.conf.metadata_expire = 0
@@ -1269,7 +1269,7 @@
# Figure out current version for upgrade nag and for determining weird
# upgrade cases
@@ -114,3 +93,14 @@
n, a, e, v, r = pkgtup
if supportedUpgradeVersion <= 0:
val = rpmUtils.miscutils.compareEVR((None, '3', '1'),
+--- anaconda-11.4.0.8/docs/command-line.txt~ 2007-12-13 22:09:32.000000000 +0100
++++ anaconda-11.4.0.8/docs/command-line.txt 2007-12-13 22:10:12.367665081 +0100
+@@ -319,7 +319,7 @@
+
+ upgradeany
+
+- o Don't require an /etc/redhat-release that matches the expected syntax
++ o Don't require an /etc/pld-release that matches the expected syntax
+ to upgrade.
+
+ usefbx
================================================================
Index: SOURCES/anaconda-timezone.patch
diff -u SOURCES/anaconda-timezone.patch:1.4 SOURCES/anaconda-timezone.patch:1.5
--- SOURCES/anaconda-timezone.patch:1.4 Tue Feb 20 21:41:32 2007
+++ SOURCES/anaconda-timezone.patch Thu Dec 13 22:36:08 2007
@@ -5,7 +5,7 @@
gtk.glade.set_custom_handler(self.custom_widget_handler)
# Set the default now. We'll fix it for real in getScreen.
-- self.default = "America/New_York"
+- self.default = "America/New York"
+ self.default = "Europe/Warsaw"
self.zonetab = zonetab.ZoneTab()
@@ -17,22 +17,13 @@
- self.default = "America/New_York"
+ self.default = "Europe/Warsaw"
- # Now fix the default we set when we made the timezone map widget.
- self.tz.setCurrent(self.zonetab.findEntryByTZ(self.default))
-@@ -126,7 +126,7 @@
- if tz.lat >= latmin and tz.lat <= latmax and tz.long >= longmin and tz.long <= longmax:
- return True
- elif user_data.currentEntry == None:
-- if model.get_value(iter, 1) == "America/New_York":
-+ if model.get_value(iter, 1) == "Europe/Warsaw":
- return True
- else:
- return False
+ self.default = self.default.replace("_", " ")
+
@@ -151,7 +151,7 @@
weight=pango.WEIGHT_BOLD)
self.markers[entry.tz] = marker
-- if entry.tz == "America/New_York":
+- if entry.tz == "America/New York":
+ if entry.tz == "Europe/Warsaw":
# In case the /etc/sysconfig/clock is messed up, use New
# York as the default.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-branding.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-kernel.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-libdir.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-pld-release.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-timezone.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list