[Debpool-commits] [SCM] Debpool Project Repository branch, master, updated. debian/0.3.6-5-gcfa98b7

Thu Oct 16 21:41:07 UTC 2008

The following commit has been merged in the master branch:
commit cfa98b779f689c3ee08c17ecab704134091a1543
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Thu Oct 16 17:40:50 2008 -0400

      * Rename config file from Config.pm to debpoolrc.

diff --git a/bin/debpool b/bin/debpool
index 0288310..ffb741f 100755
--- a/bin/debpool
+++ b/bin/debpool
@@ -754,18 +754,18 @@ B<debpool --dists unstable=sid --dists experimental=experimental ...>
 
 =head1 OPTIONS
 
-See the L<DebPool::Config> manpage for details on all configuration
+See the L<debpoolrc> manpage for details on all configuration
 options and their defaults.
 
 =head1 FILES
 
 =over 4
 
-=item F</etc/debpool/Config.pm>
+=item F</etc/debpool/debpoolrc>
 
 System defaults file.
 
-=item F<$HOME/.debpool/Config.pm>
+=item F<$HOME/.debpool/debpoolrc>
 
 User-specific defaults file.
 
@@ -778,7 +778,7 @@ System.
 
 =head1 SEE ALSO
 
-L<DebPool::Config>
+L<debpoolrc>
 
 =head1 AUTHOR
 
diff --git a/debian/README.GnuPG b/debian/README.GnuPG
index 1ee75d8..7e547b1 100644
--- a/debian/README.GnuPG
+++ b/debian/README.GnuPG
@@ -63,8 +63,8 @@ Basic instructions for setting up GnuPG:
    turn off debpool's Release file generation and manully generate/sign a
    Release file for each section).
 
-6. Edit the appropriate Config.pm file (/etc/debpool/Config.pm or
-   ~/.debpool/Config.pm), set $Options{'sign_release'} to 1 and
+6. Edit the appropriate debpoolrc file (/etc/debpool/debpoolrc or
+   ~/.debpool/debpoolrc), set $Options{'sign_release'} to 1 and
    $Options{'gpg_sign_key'} to the key ID of your archive signing key.
    Note that this won't have any effect unless you also enable Release
    file generation (but it won't hurt anything, either).
diff --git a/debian/README.User b/debian/README.User
index a0f9a9f..8047f9e 100644
--- a/debian/README.User
+++ b/debian/README.User
@@ -22,7 +22,7 @@ Basic instructions for setting up a system-wide debpool archive with a
 
    dpkg-statoverride --update --add debpool debpool 0755 /var/cache/debpool
 
-3. Edit /etc/debpool/Config.pm. The following item is of particular note:
+3. Edit /etc/debpool/debpoolrc. The following item is of particular note:
 
    * archive-dir (the archive directory chosen in step 2)
      - You may wish to double-check the *_mode settings as well
diff --git a/debian/TODO b/debian/TODO
index 798a05f..8a4cbab 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -25,8 +25,6 @@ Features, fixes, and other stuff to be done.
 
 (config file)
 
-* Perhaps change the name of config file to debpoolrc.
-  - will need to change man pages and other documentation as well.
 * Some way to double-parse values in $archive (allowing the equivalent of
   relative path references from archive_dir, so that changes are reflected
   in all other paths by default).
diff --git a/debian/changelog b/debian/changelog
index 2ccbc6f..fc51fcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ debpool (0.3.8) experimental; urgency=low
     + Changed debpool to not check for existence of Proc::Daemon, since it will
       now be installed by default.
   * Write an entry about dependencies in the README.Debian file.
+  * Rename config file from Config.pm to debpoolrc.
 
  -- Andres Mejia <mcitadel at gmail.com>  Thu, 16 Oct 2008 16:55:37 -0400
 
diff --git a/debian/debpool.default b/debian/debpool.default
index 10be776..86f0ee1 100644
--- a/debian/debpool.default
+++ b/debian/debpool.default
@@ -4,7 +4,7 @@
 # Change to anything except "0" to enable running debpool as a daemon.
 ENABLED="0"
 
-# Parameters passed to debpool. See DebPool::Config(5). You don't have
+# Parameters passed to debpool. See debpoolrc(5). You don't have
 # to specify --daemon.
 OPTIONS=""
 
diff --git a/debian/debpool.install b/debian/debpool.install
index 2b05afa..24ee625 100644
--- a/debian/debpool.install
+++ b/debian/debpool.install
@@ -1,3 +1 @@
-examples/Config.pm etc/debpool
-
-
+examples/debpoolrc etc/debpool
diff --git a/debian/rules b/debian/rules
index a5b64b2..4d56a4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,13 +22,13 @@ build-stamp:
 	$(PERL) Makefile.PL INSTALLDIRS=vendor \
         VERSION=$(DEBPOOL_VERSION)
 	$(MAKE)
-	pod2man --name="DebPool::Config" \
+	pod2man --name="debpoolrc" \
 		--center="DebPool Configuration" \
 		--release="debpool v$(DEBPOOL_VERSION)" \
 		--date=$(shell date +%Y-%m-%d) \
 		--section=5 \
 		lib/DebPool/Config.pm \
-		DebPool::Config.5
+		debpoolrc.5
 	pod2man --name="debpool" \
 		--center="debpool" \
 		--release="debpool v$(DEBPOOL_VERSION)" \
diff --git a/examples/Config.pm b/examples/debpoolrc
similarity index 100%
rename from examples/Config.pm
rename to examples/debpoolrc
diff --git a/examples/multiple_debpools/debpool-distro.default b/examples/multiple_debpools/debpool-distro.default
index 5b1c8f8..d77963a 100644
--- a/examples/multiple_debpools/debpool-distro.default
+++ b/examples/multiple_debpools/debpool-distro.default
@@ -4,9 +4,9 @@
 # Change to anything except "0" to enable running debpool as a daemon.
 ENABLED="0"
 
-# Parameters passed to debpool. See DebPool::Config(5). You don't have
+# Parameters passed to debpool. See debpoolrc(5). You don't have
 # to specify --daemon.
-OPTIONS="--config /etc/debpool/$DISTRO-Config.pm"
+OPTIONS="--config /etc/debpool/$DISTRO-debpoolrc"
 
 # User and group to run debpool as. If you leave DEBPOOL_USER empty, debpool
 # will run as root. If you leave the group empty, DEBPOOL_GROUP will be the
diff --git a/examples/multiple_debpools/distro-Config.pm b/examples/multiple_debpools/distro-debpoolrc
similarity index 100%
rename from examples/multiple_debpools/distro-Config.pm
rename to examples/multiple_debpools/distro-debpoolrc
diff --git a/lib/DebPool/Config.pm b/lib/DebPool/Config.pm
index af836a3..2c7a3ce 100644
--- a/lib/DebPool/Config.pm
+++ b/lib/DebPool/Config.pm
@@ -57,8 +57,8 @@ package DebPool::Config;
 =head1 DESCRIPTION
 
 The DebPool::Config file is normally found in three places;
-F</usr/share/debpool/Config.pm>, F</etc/debpool/Config.pm>, and
-F<$HOME/.debpool/Config.pm> (in ascending order of precedence);
+F</usr/share/perl5/DebPool/Config.pm>, F</etc/debpool/debpoolrc>, and
+F<$HOME/.debpool/debpoolrc> (in ascending order of precedence);
 further locations can also be specified on the command line with the
 '--config=<file>' option, which overrides all of these (and is, in turn,
 overridden by any command line options). Also of note is the --nodefault
@@ -186,12 +186,12 @@ Clean_Options();
 sub Load_Default_Configs {
     Load_Internal_Configs();
 
-    if (-r '/etc/debpool/Config.pm') {
-        do '/etc/debpool/Config.pm'; # System defaults
+    if (-r '/etc/debpool/debpoolrc') {
+        do '/etc/debpool/debpoolrc'; # System defaults
     }
 
-    if (-r "$ENV{'HOME'}/.debpool/Config.pm") {
-        do "$ENV{'HOME'}/.debpool/Config.pm"; # User defaults
+    if (-r "$ENV{'HOME'}/.debpool/debpoolrc") {
+        do "$ENV{'HOME'}/.debpool/debpoolrc"; # User defaults
     }
 }
 
@@ -1038,7 +1038,7 @@ __END__
 
 =head1 CAVEATS
 
-Command line options will override all Config.pm declarations.
+Command line options will override all debpoolrc declarations.
 
 =cut
 

-- 
Debpool Project Repository

