The following commit has been merged in the master branch:
commit 3962394d844af44555c81a8120fe4669e3828c7d
Author: Guillem Jover <[email protected]>
Date: Sat Apr 20 03:17:03 2013 +0200
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.
diff --git a/debian/dselect.install b/debian/dselect.install
index 65487d7..d840e8c 100644
--- a/debian/dselect.install
+++ b/debian/dselect.install
@@ -4,5 +4,5 @@ etc/dpkg/dselect.cfg.d
usr/bin/dselect
usr/lib/dpkg/methods
usr/share/locale/*/LC_MESSAGES/dselect.mo
-usr/share/perl5/Debian
+usr/share/perl5/Dselect
var/lib/dpkg/methods
diff --git a/dselect/methods/Debian/Dselect/Ftp.pm
b/dselect/methods/Dselect/Ftp.pm
similarity index 99%
rename from dselect/methods/Debian/Dselect/Ftp.pm
rename to dselect/methods/Dselect/Ftp.pm
index f0f98de..436ecdb 100644
--- a/dselect/methods/Debian/Dselect/Ftp.pm
+++ b/dselect/methods/Dselect/Ftp.pm
@@ -10,7 +10,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-package Debian::Dselect::Ftp;
+package Dselect::Ftp;
use Net::FTP;
use Exporter;
diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am
index 09194af..1f916bb 100644
--- a/dselect/methods/Makefile.am
+++ b/dselect/methods/Makefile.am
@@ -33,7 +33,7 @@ nobase_dist_methods_SCRIPTS = \
multicd/install
perllibdir = $(PERL_LIBDIR)
-nobase_dist_perllib_DATA = Debian/Dselect/Ftp.pm
+nobase_dist_perllib_DATA = Dselect/Ftp.pm
EXTRA_DIST = multicd/README.multicd
diff --git a/dselect/methods/ftp/install b/dselect/methods/ftp/install
index 6c153b1..2e9d1ce 100755
--- a/dselect/methods/ftp/install
+++ b/dselect/methods/ftp/install
@@ -22,9 +22,6 @@ use warnings;
use vars qw(%config $ftp);
#use diagnostics;
-use lib '/usr/lib/perl5/Debian';
-use lib '/usr/share/perl5/Debian';
-
eval q{
use Net::FTP;
use File::Path;
diff --git a/dselect/methods/ftp/setup b/dselect/methods/ftp/setup
index f20e8cd..233def0 100755
--- a/dselect/methods/ftp/setup
+++ b/dselect/methods/ftp/setup
@@ -22,9 +22,6 @@ use warnings;
use vars qw(%config);
#use diagnostics;
-use lib '/usr/lib/perl5/Debian';
-use lib '/usr/share/perl5/Debian';
-
eval 'use Net::FTP;';
if ($@) {
print STDERR "Please install the 'perl' package if you want to use the\n" .
diff --git a/dselect/methods/ftp/update b/dselect/methods/ftp/update
index 02c77d5..ba2f98a 100755
--- a/dselect/methods/ftp/update
+++ b/dselect/methods/ftp/update
@@ -21,9 +21,6 @@ use warnings;
#use diagnostics;
-use lib '/usr/lib/perl5/Debian';
-use lib '/usr/share/perl5/Debian';
-
eval 'use Net::FTP;';
if ($@) {
print STDERR "Please install the 'perl' package if you want to use the\n" .
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
