[SCM] Debian packaging of dh-make-perl branch, master, updated. debian/0.74-1-34-g4296156

gregor herrmann gregoa at debian.org
Sat Dec 31 19:35:58 UTC 2011


The following commit has been merged in the master branch:
commit 7847167c8314e34295e55a6c5f5baf2f2e9a253f
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Dec 31 19:12:14 2011 +0100

    Treat META.json like META.yml (i.e. rm/unlink/ignore it).

diff --git a/.gitignore b/.gitignore
index 25f6934..5431e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 META.yml
+META.json
 Makefile.old
 cover_db
 blib
diff --git a/META.json b/META.json
deleted file mode 100644
index 1ab50de..0000000
--- a/META.json
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-   "abstract" : "create Debian source package from CPAN dist",
-   "author" : [
-      "unknown"
-   ],
-   "dynamic_config" : 1,
-   "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112580",
-   "keywords" : [
-      "debian",
-      "package",
-      "helper"
-   ],
-   "license" : [
-      "open_source"
-   ],
-   "meta-spec" : {
-      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
-   },
-   "name" : "DhMakePerl",
-   "no_index" : {
-      "directory" : [
-         "privinc",
-         "t",
-         "xt",
-         "share"
-      ]
-   },
-   "prereqs" : {
-      "build" : {
-         "requires" : {
-            "File::DirCompare" : 0,
-            "File::Touch" : 0,
-            "Test::Compile" : 0,
-            "Test::Deep" : 0,
-            "Test::Differences" : 0,
-            "Test::Exception" : 0,
-            "Test::More" : 0
-         }
-      },
-      "configure" : {
-         "requires" : {
-            "Module::Build" : "0.38"
-         }
-      },
-      "runtime" : {
-         "recommends" : {
-            "Git" : 0,
-            "IO::Dir" : 0
-         },
-         "requires" : {
-            "AptPkg::Cache" : 0,
-            "AptPkg::Config" : 0,
-            "Array::Unique" : 0,
-            "CPAN" : 0,
-            "CPAN::Meta" : 0,
-            "Carp" : 0,
-            "Cwd" : 0,
-            "Dpkg" : 0,
-            "Dpkg::Source::Package" : 0,
-            "Email::Address" : 0,
-            "Email::Date::Format" : 0,
-            "File::Basename" : 0,
-            "File::Copy" : 0,
-            "File::Find::Rule" : 0,
-            "File::Spec" : 0,
-            "File::Spec::Functions" : 0,
-            "File::Which" : 0,
-            "FindBin" : 0,
-            "Getopt::Long" : 0,
-            "IO::File" : 0,
-            "IO::Uncompress::Gunzip" : 0,
-            "List::MoreUtils" : 0,
-            "Module::Build" : 0,
-            "Module::CoreList" : 0,
-            "Module::Depends" : 0,
-            "Module::Depends::Intrusive" : 0,
-            "Parse::DebControl" : 0,
-            "Parse::DebianChangelog" : 0,
-            "Software::License::Artistic_2_0" : 0,
-            "Storable" : 0,
-            "Text::Diff" : 0,
-            "Text::Wrap" : 0,
-            "Tie::File" : 0,
-            "Tie::IxHash" : 0,
-            "User::pwent" : 0,
-            "WWW::Mechanize" : 0,
-            "YAML" : 0,
-            "perl" : "5.010",
-            "version" : 0
-         }
-      }
-   },
-   "provides" : {
-      "Debian::AptContents" : {
-         "file" : "lib/Debian/AptContents.pm",
-         "version" : 0
-      },
-      "Debian::Control" : {
-         "file" : "lib/Debian/Control.pm",
-         "version" : 0
-      },
-      "Debian::Control::FromCPAN" : {
-         "file" : "lib/Debian/Control/FromCPAN.pm",
-         "version" : 0
-      },
-      "Debian::Control::Stanza" : {
-         "file" : "lib/Debian/Control/Stanza.pm",
-         "version" : 0
-      },
-      "Debian::Control::Stanza::Binary" : {
-         "file" : "lib/Debian/Control/Stanza/Binary.pm",
-         "version" : 0
-      },
-      "Debian::Control::Stanza::CommaSeparated" : {
-         "file" : "lib/Debian/Control/Stanza/CommaSeparated.pm",
-         "version" : 0
-      },
-      "Debian::Control::Stanza::Source" : {
-         "file" : "lib/Debian/Control/Stanza/Source.pm",
-         "version" : 0
-      },
-      "Debian::Dependencies" : {
-         "file" : "lib/Debian/Dependencies.pm",
-         "version" : 0
-      },
-      "Debian::Dependency" : {
-         "file" : "lib/Debian/Dependency.pm",
-         "version" : 0
-      },
-      "Debian::DpkgLists" : {
-         "file" : "lib/Debian/DpkgLists.pm",
-         "version" : 0
-      },
-      "Debian::Rules" : {
-         "file" : "lib/Debian/Rules.pm",
-         "version" : 0
-      },
-      "Debian::WNPP::Bug" : {
-         "file" : "lib/Debian/WNPP/Bug.pm",
-         "version" : 0
-      },
-      "Debian::WNPP::Query" : {
-         "file" : "lib/Debian/WNPP/Query.pm",
-         "version" : 0
-      },
-      "DhMakePerl" : {
-         "file" : "lib/DhMakePerl.pm",
-         "version" : "0.74"
-      },
-      "DhMakePerl::Command::Packaging" : {
-         "file" : "lib/DhMakePerl/Command/Packaging.pm",
-         "version" : 0
-      },
-      "DhMakePerl::Command::dump_config" : {
-         "file" : "lib/DhMakePerl/Command/dump_config.pm",
-         "version" : 0
-      },
-      "DhMakePerl::Command::help" : {
-         "file" : "lib/DhMakePerl/Command/help.pm",
-         "version" : 0
-      },
-      "DhMakePerl::Command::locate" : {
-         "file" : "lib/DhMakePerl/Command/locate.pm",
-         "version" : 0
-      },
-      "DhMakePerl::Command::make" : {
-         "file" : "lib/DhMakePerl/Command/make.pm",
-         "version" : 0
-      },
-      "DhMakePerl::Command::refresh" : {
-         "file" : "lib/DhMakePerl/Command/refresh.pm",
-         "version" : 0
-      },
-      "DhMakePerl::Command::refresh_cache" : {
-         "file" : "lib/DhMakePerl/Command/refresh_cache.pm",
-         "version" : 0
-      },
-      "DhMakePerl::Config" : {
-         "file" : "lib/DhMakePerl/Config.pm",
-         "version" : 0
-      },
-      "DhMakePerl::PodParser" : {
-         "file" : "lib/DhMakePerl/PodParser.pm",
-         "version" : 0
-      },
-      "DhMakePerl::Utils" : {
-         "file" : "lib/DhMakePerl/Utils.pm",
-         "version" : 0
-      }
-   },
-   "release_status" : "stable",
-   "resources" : {
-      "license" : [
-         "http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt"
-      ],
-      "repository" : {
-         "url" : "http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/dh-make-perl.git"
-      }
-   },
-   "version" : "0.74"
-}
diff --git a/Makefile b/Makefile
index b19be2c..117b4e7 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,9 @@ clean:
 	[ ! -e Build ] || ./Build $@
 
 realclean distclean: clean
-	[ ! -e MANIFEST ] || rm MANIFEST
-	[ ! -e META.yml ] || rm META.yml
+	[ ! -e MANIFEST ]  || rm MANIFEST
+	[ ! -e META.yml ]  || rm META.yml
+	[ ! -e META.json ] || rm META.json
 
 .PHONY: all build install test orig dist manifest clean realclean distclean
 # vim: noet
diff --git a/privinc/My/Builder.pm b/privinc/My/Builder.pm
index 83e4699..7046271 100644
--- a/privinc/My/Builder.pm
+++ b/privinc/My/Builder.pm
@@ -22,7 +22,7 @@ sub ACTION_orig {
     print "Linking ../$orig to ../$dist\n";
     link "../$dist", "../$orig" or die "link( ../$dist, ../$orig ): $!";
     $self->ACTION_distclean;
-    unlink 'MANIFEST', 'MANIFEST.bak', 'META.yml';
+    unlink 'MANIFEST', 'MANIFEST.bak', 'META.yml', 'META.json';
 }
 
 sub ACTION_dist {

-- 
Debian packaging of dh-make-perl



More information about the Pkg-perl-cvs-commits mailing list