Bläddra i källkod

Debian::Dselect::Ftp: Move module to Dselect::Ftp

This gets rid of the need to hardcode the perl module path in the
scripts. The Dselect methods are not really Debian specific anyway.
Guillem Jover 13 år sedan
förälder
incheckning
3962394d84

+ 1 - 1
debian/dselect.install

@@ -4,5 +4,5 @@ etc/dpkg/dselect.cfg.d
 usr/bin/dselect
 usr/bin/dselect
 usr/lib/dpkg/methods
 usr/lib/dpkg/methods
 usr/share/locale/*/LC_MESSAGES/dselect.mo
 usr/share/locale/*/LC_MESSAGES/dselect.mo
-usr/share/perl5/Debian
+usr/share/perl5/Dselect
 var/lib/dpkg/methods
 var/lib/dpkg/methods

+ 1 - 1
dselect/methods/Debian/Dselect/Ftp.pm

@@ -10,7 +10,7 @@
 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-package Debian::Dselect::Ftp;
+package Dselect::Ftp;
 
 
 use Net::FTP;
 use Net::FTP;
 use Exporter;
 use Exporter;

+ 1 - 1
dselect/methods/Makefile.am

@@ -33,7 +33,7 @@ nobase_dist_methods_SCRIPTS = \
 	multicd/install
 	multicd/install
 
 
 perllibdir = $(PERL_LIBDIR)
 perllibdir = $(PERL_LIBDIR)
-nobase_dist_perllib_DATA = Debian/Dselect/Ftp.pm
+nobase_dist_perllib_DATA = Dselect/Ftp.pm
 
 
 EXTRA_DIST = multicd/README.multicd
 EXTRA_DIST = multicd/README.multicd
 
 

+ 0 - 3
dselect/methods/ftp/install

@@ -22,9 +22,6 @@ use warnings;
 use vars qw(%config $ftp);
 use vars qw(%config $ftp);
 #use diagnostics;
 #use diagnostics;
 
 
-use lib '/usr/lib/perl5/Debian';
-use lib '/usr/share/perl5/Debian';
-
 eval q{
 eval q{
     use Net::FTP;
     use Net::FTP;
     use File::Path;
     use File::Path;

+ 0 - 3
dselect/methods/ftp/setup

@@ -22,9 +22,6 @@ use warnings;
 use vars qw(%config);
 use vars qw(%config);
 #use diagnostics;
 #use diagnostics;
 
 
-use lib '/usr/lib/perl5/Debian';
-use lib '/usr/share/perl5/Debian';
-
 eval 'use Net::FTP;';
 eval 'use Net::FTP;';
 if ($@) {
 if ($@) {
     print STDERR "Please install the 'perl' package if you want to use the\n" .
     print STDERR "Please install the 'perl' package if you want to use the\n" .

+ 0 - 3
dselect/methods/ftp/update

@@ -21,9 +21,6 @@ use warnings;
 
 
 #use diagnostics;
 #use diagnostics;
 
 
-use lib '/usr/lib/perl5/Debian';
-use lib '/usr/share/perl5/Debian';
-
 eval 'use Net::FTP;';
 eval 'use Net::FTP;';
 if ($@) {
 if ($@) {
     print STDERR "Please install the 'perl' package if you want to use the\n" .
     print STDERR "Please install the 'perl' package if you want to use the\n" .