summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-15 09:21:12 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-15 09:21:12 +0000
commit6db8f32bd315ae235b1d7b53b491cc7a1e078080 (patch)
tree983d12151ccd0814b6cce8ae560ec204c91c2ac6
parent0449880d2b7e903ab41ea37dbac76d61a804f5f9 (diff)
downloaddrakx-backup-do-not-use-6db8f32bd315ae235b1d7b53b491cc7a1e078080.tar
drakx-backup-do-not-use-6db8f32bd315ae235b1d7b53b491cc7a1e078080.tar.gz
drakx-backup-do-not-use-6db8f32bd315ae235b1d7b53b491cc7a1e078080.tar.bz2
drakx-backup-do-not-use-6db8f32bd315ae235b1d7b53b491cc7a1e078080.tar.xz
drakx-backup-do-not-use-6db8f32bd315ae235b1d7b53b491cc7a1e078080.zip
- add missing printer directory
- bump version to 9.1 like most of our packages
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/Makefile.drakxtools2
-rw-r--r--perl-install/drakxtools.spec10
-rw-r--r--perl-install/harddrake/sound.pm2
4 files changed, 12 insertions, 4 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index cdd3b5eeb..70d149cfa 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -11,7 +11,7 @@ endif
VERSION = 2.2.10-BOOT
SUDO = sudo
SO_FILES = c/blib/arch/auto/c/c.so
-PMS_DIRS = Newt Xconfig c diskdrake harddrake interactive modules network partition_table resize_fat sbus_probing security
+PMS_DIRS = Newt Xconfig c diskdrake harddrake interactive modules network partition_table printer resize_fat sbus_probing security
PMS = *.pm $(PMS_DIRS:%=%/*.pm) commands install2 g_auto_install live_install live_install2 share/advertising/*.pl
STANDALONEPMS_ = XFdrake adduserdrake diskdrake drakTermServ drakautoinst drakbackup drakboot drakbug drakbug_report drakconnect drakfirewall drakfloppy drakfont drakgw drakperm drakproxy draksec draksound draksplash drakupdate_fstab drakxservices drakxtv fileshareset harddrake2 keyboarddrake livedrake localedrake logdrake lsnetdrake mousedrake net_monitor printerdrake scannerdrake service_harddrake service_harddrake.sh
STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index e719d9cc8..72769763e 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -3,7 +3,7 @@ include Makefile.config
INLIBDEST_DIRS = Newt c resize_fat sbus_probing
HAVEINST_DIRS = share/po standalone/interactive_http
-DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) ddcprobe serial_probe harddrake
+DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) ddcprobe harddrake printer serial_probe
NAME = libDrakX
PREFIX =
LIBDIR = $(PREFIX)/usr/lib
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index bdee38b27..4490792f4 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -1,7 +1,7 @@
Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
Name: drakxtools
-Version: 1.1.12
-Release: 1mdk
+Version: 9.1
+Release: 0.1mdk
Url: http://www.linux-mandrake.com/en/drakx.php3
Source0: %name-%version.tar.bz2
License: GPL
@@ -207,6 +207,8 @@ my \$res = \$in->ask_okcancel(\$ARGV[0], \$ARGV[1], 1);
EOF
chmod +x $RPM_BUILD_ROOT{%_datadir/harddrake/*,%_sysconfdir/X11/xinit.d/harddrake2}
+# temporary fix until we reenable this feature
+rm -f $RPM_BUILD_ROOT%_sysconfdir/X11/xinit.d/harddrake2
%find_lang libDrakX
cat libDrakX.lang >> %name.list
@@ -286,6 +288,10 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
%config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
%changelog
+* Fri Nov 15 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.1-0.1mdk
+- bump version
+- add missing printer/ directory
+
* Thu Nov 14 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 1.1.12-1mdk
- printerdrake cleanups
- various perl lifting
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 267edd1de..1d7d4c2d8 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -24,6 +24,8 @@ use modules;
use standalone;
use list_modules;
+my $has_nvaudio = -x '/lib/modules/' . c::kernel_version() . '/';
+
my %alsa2oss =
(
"snd-ad1816a" => [ "ad1816" ], # isa