From c2b21c01e1443d50d61852854b52a34c1a228633 Mon Sep 17 00:00:00 2001 From: damien Date: Thu, 28 Sep 2000 15:57:26 +0000 Subject: stc --- perl-install/ChangeLog | 11 +++++++++++ perl-install/Makefile | 3 +-- perl-install/Makefile.drakxtools | 1 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 0a2b4a548..6ae14facd 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,14 @@ +2000-09-28 dam's + + * interactive_gtk.pm (ask_from_list_with_helpW): no more theme + parsing, no more draknet.rc + + * netconnect.pm (read_net_conf): no adsl tree anymore. + + * netconnect.pm: drakgw called if enough card are installed. + + * netconnect.pm: minor bugs correction. + 2000-09-28 François Pons * diskdrake.pm: use corrected partition size when resizing a dos diff --git a/perl-install/Makefile b/perl-install/Makefile index 682b828f0..0b3b180dd 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -16,7 +16,7 @@ tar-drakxtools: clean $(MAKE) -C ../tools clean cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe tools/serial_probe drakxtools cd ../drakxtools ; rm -rf install* pkgs.pm ftp.pm t.pm */CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* . - cd .. ; tar cfI drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config share/MonitorsDB share/Cards+ share/CardsNames Newt c ddcprobe serial_probe share/po pci_probing sbus_probing resize_fat share/diskdrake.rc share/isdndb.net share/adsldb.net $(STANDALONEPMS) icons *.pm) + cd .. ; tar cfI drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config share/MonitorsDB share/Cards+ share/CardsNames Newt c ddcprobe serial_probe share/po pci_probing sbus_probing resize_fat share/diskdrake.rc share/isdndb.net $(STANDALONEPMS) icons *.pm) cd .. ; rm -rf drakxtools $(DIRS): @@ -121,7 +121,6 @@ endif cd share ; cp MonitorsDB Cards+ CardsNames $(DEST)/usr/X11R6/lib/X11 cd share ; cp *.xpm $(DEST)/usr/share cd share ; cp isdndb.net $(DEST)/usr/share/isdn_db.txt - cd share ; cp adsldb.net $(DEST)/usr/share/adsl_db.txt cd share ; cp -a themes $(DEST)/usr/share/gtk cd share ; cp compssUsers compssUsers.desktop compssList $(ROOTDEST)/Mandrake/base diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index 8b7bcf8eb..dc93aaf29 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -30,7 +30,6 @@ install: for i in *.pm ; do perl -pe '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/' $$i > $(LIBDEST)/$$i ; done install -m 644 share/isdndb.net $(DATADIR)/isdn_db.txt - install -m 644 share/adsldb.net $(DATADIR)/adsl_db.txt install -m 644 share/{MonitorsDB,CardsNames,Cards+} $(LIBX11DEST) install -m 644 share/diskdrake.rc $(ETCDEST) install -m 644 share/po/*.po $(LIBDEST)/po -- cgit v1.2.1