From: Guillem Jover Date: Fri, 17 Feb 2006 02:34:25 +0000 (+0000) Subject: Move the methods directory to dselect/methods, so the contents will not X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00959fb95f66873087420a0afd79a0f36ab5bc2a;p=dpkg Move the methods directory to dselect/methods, so the contents will not be installed if dselect is not to be built. --- diff --git a/ChangeLog b/ChangeLog index 789004ec..92021e54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-02-17 Guillem Jover + + * methods/: Move directory to dselect/methods/. + * Makefile.am (SUBDIRS): Move methods to ... + * dselect/Makefile.am (SUBDIRS): ... here. New variable. + * configure.ac (AC_CONFIG_FILES): Rename methods/Makefile to + dselect/methods/Makefile. + 2006-02-17 Guillem Jover * configure.ac: Require gettext 0.14.5. diff --git a/Makefile.am b/Makefile.am index 297524da..d913d60b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ SUBDIRS = \ utils \ scripts \ po \ - methods \ origins \ man diff --git a/configure.ac b/configure.ac index 567a7364..b783f08c 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ AC_CONFIG_FILES([ Makefile dpkg-deb/Makefile dpkg-split/Makefile dselect/Makefile + dselect/methods/Makefile getopt/Makefile intl/Makefile lib/Makefile @@ -116,7 +117,6 @@ AC_CONFIG_FILES([ Makefile man/pt_BR/Makefile man/ru/Makefile man/sv/Makefile - methods/Makefile origins/Makefile po/Makefile.in scripts/Makefile diff --git a/debian/changelog b/debian/changelog index e81161ba..fc7353b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dpkg (1.13.16~) UNRELEASED; urgency=low [ Guillem Jover ] * Move auxiliary autotools scripts to config/. * Require gettext 0.14.5. + * Move the methods directory to dselect/methods, so the contents will not + be installed if dselect is not to be built. -- Guillem Jover Fri, 17 Feb 2006 03:52:59 +0200 diff --git a/dselect/Makefile.am b/dselect/Makefile.am index 6fa7ec9c..12c5401e 100644 --- a/dselect/Makefile.am +++ b/dselect/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +SUBDIRS = methods + localedir = $(datadir)/locale INCLUDES = \ -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ diff --git a/methods/Makefile.am b/dselect/methods/Makefile.am similarity index 100% rename from methods/Makefile.am rename to dselect/methods/Makefile.am diff --git a/methods/disk/desc.cdrom b/dselect/methods/disk/desc.cdrom similarity index 100% rename from methods/disk/desc.cdrom rename to dselect/methods/disk/desc.cdrom diff --git a/methods/disk/desc.harddisk b/dselect/methods/disk/desc.harddisk similarity index 100% rename from methods/disk/desc.harddisk rename to dselect/methods/disk/desc.harddisk diff --git a/methods/disk/desc.mounted b/dselect/methods/disk/desc.mounted similarity index 100% rename from methods/disk/desc.mounted rename to dselect/methods/disk/desc.mounted diff --git a/methods/disk/desc.nfs b/dselect/methods/disk/desc.nfs similarity index 100% rename from methods/disk/desc.nfs rename to dselect/methods/disk/desc.nfs diff --git a/methods/disk/install b/dselect/methods/disk/install similarity index 100% rename from methods/disk/install rename to dselect/methods/disk/install diff --git a/methods/disk/names b/dselect/methods/disk/names similarity index 100% rename from methods/disk/names rename to dselect/methods/disk/names diff --git a/methods/disk/setup b/dselect/methods/disk/setup similarity index 100% rename from methods/disk/setup rename to dselect/methods/disk/setup diff --git a/methods/disk/update b/dselect/methods/disk/update similarity index 100% rename from methods/disk/update rename to dselect/methods/disk/update diff --git a/methods/floppy/desc.floppy b/dselect/methods/floppy/desc.floppy similarity index 100% rename from methods/floppy/desc.floppy rename to dselect/methods/floppy/desc.floppy diff --git a/methods/floppy/install b/dselect/methods/floppy/install similarity index 100% rename from methods/floppy/install rename to dselect/methods/floppy/install diff --git a/methods/floppy/names b/dselect/methods/floppy/names similarity index 100% rename from methods/floppy/names rename to dselect/methods/floppy/names diff --git a/methods/floppy/setup b/dselect/methods/floppy/setup similarity index 100% rename from methods/floppy/setup rename to dselect/methods/floppy/setup diff --git a/methods/floppy/update b/dselect/methods/floppy/update similarity index 100% rename from methods/floppy/update rename to dselect/methods/floppy/update