fpm 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5242a72c4435675eabd2eb890ac8296bf77553b
-  data.tar.gz: 3aeda059fb3d5cfab49e0eaff6cb457c7a61e374
+  metadata.gz: ce725d9c506143e502cfc1e27ff5c6346240f305
+  data.tar.gz: 09b9b1840e5525eb9930e7dad71070abc589275a
 SHA512:
-  metadata.gz: 91d43f3e9ec89f218d08f2d05a0b2cf43c6e06ea2e617ce353bd4be58892167b7617f50f2bc1758a5946033ffc974d05bb9be01396759f79e8b532f5aa5efb93
-  data.tar.gz: 613babff93a8b1e0acf992ea46d4de82bfa0f175f20b1194f039049480f818a3d52cce267c282ec2721324a839de72da5a777c454a264f914e276b02c54ca4b4
+  metadata.gz: 4a33d2dc5a2ca57fcceef601c5ed80da8021bbd8ae6365ec62b5a2b91bc7c2bd59f62ced044dafe592dd48b6f211b68c6200cd761dbd105f0d684c56105d2922
+  data.tar.gz: 526287eceec55b3280544fbfcf851f091bc614a14137efbaf796a5ac549a7743ee04438099901f7896a823f627d731c019a44f6ac2f623f8b38bf0fc0edf30d7

data/CHANGELIST

@@ -1,4 +1,35 @@
-1.4.0 (???)
+1.5.0 (April 12, 2016)
+  - Arch package support is now available via -s pacman and -t pacman. 
+    (#916; wonderful community effort making this happen!)
+  - FreeBSD packages can now be built `-t freebsd` 
+    (#1073; huge community effort making this happen!)
+  - You can now set fpm flags and arguments with the FPMOPTS environment
+    variable (#977, mildred)
+  - Using --exclude-file no longer causes a crash. Yay! (#982, wyaeld)
+  - A new rake task is available for folks who want to invoke fpm from rake
+    (#756, pstengel)
+  - On FreeBSD, when tarring, gtar is now used. (#1008, liv3d)
+  - virtualenv: Add --virtualenv-pypi-extra-url flag to specify additional PyPI
+    locations to use when searching for packages (#1012, Paul Krohn)
+  - deb: Init scripts, etc/default, and upstart files are automatically added
+    as config files in a debian package. Disable this behavior with
+    ---deb-auto-config-files
+  - deb: Small changes to make lintian complain less about our resulting debs.
+  - deb: New flag --deb-systemd lets you specify a systemd service file to include
+    in your package. (#952, Jens Peter Schroer)
+  - cpan: Add --[no-]cpan-cpanm-force flag to pass --force to cpanm.
+  - rpm: File names with both spaces and symbols should now be packageable.
+    (#946, iwonbigbro)
+  - cpan: Now queries MetaCPAN for package info if we can't find any in the
+    cpan archive we just downloaded. (#849, BaxterStockman)
+  - rpm: You can now specify custom rpm tags at the command line. Be careful,
+    as no validation is done on this before sending to rpmbuild. (#687, vStone)
+  - cpan: Install if the package name given is a local file (#986, mdom)
+  - sh: Metadata now available as env vars for post-install scripts (#1006, Ed Healy)
+  - rpm: No more warning if you don't set an epoch. (#1053, Joseph Frazier)
+
+
+1.4.0 (July 26, 2015)
   - Solaris 11 IPS packages 'p5p' now supported `-t p5p`. (Jonathan Craig)
   - Python Virtualenv is now supported `-t virtualenv` (#930, Simone
     Margaritelli and Daniel Haskin)

data/lib/fpm.rb

@@ -16,3 +16,4 @@ require "fpm/package/osxpkg"
 require "fpm/package/solaris"
 require "fpm/package/p5p"
 require "fpm/package/pkgin"
+require "fpm/package/freebsd"

data/lib/fpm/command.rb

@@ -56,8 +56,8 @@ class FPM::Command < Clamp::Command
     :attribute_name => :chdir
   option "--prefix", "PREFIX",
     "A path to prefix files with when building the target package. This may " \
-    "be necessary for all input packages. For example, the 'gem' type will " \
-    "prefix with your gem directory automatically."
+    "not be necessary for all input packages. For example, the 'gem' type " \
+    "will prefix with your gem directory automatically."
   option ["-p", "--package"], "OUTPUT", "The package file path to output."
   option ["-f", "--force"], :flag, "Force output even if it will overwrite an " \
     "existing file", :default => false
@@ -107,7 +107,7 @@ class FPM::Command < Clamp::Command
     "specified multiple times.", :multivalued => true,
     :attribute_name => :provides
   option "--conflicts", "CONFLICTS",
-    "Other packages/versions this package conflicts with. This flag can " \
+    "Other packages/versions this package conflicts with. This flag can be " \
     "specified multiple times.", :multivalued => true,
     :attribute_name => :conflicts
   option "--replaces", "REPLACES",
@@ -122,7 +122,9 @@ class FPM::Command < Clamp::Command
     "directory all files inside it will be recursively marked as config files.",
     :multivalued => true, :attribute_name => :config_files
   option "--directories", "DIRECTORIES", "Recursively mark a directory as being owned " \
-    "by the package", :multivalued => true, :attribute_name => :directories
+    "by the package. Use this flag multiple times if you have multiple directories " \
+    "and they are not under the same parent directory ", :multivalued => true,
+    :attribute_name => :directories
   option ["-a", "--architecture"], "ARCHITECTURE",
     "The architecture name. Usually matches 'uname -m'. For automatic values," \
     " you can use '-a all' or '-a native'. These two strings will be " \
@@ -149,11 +151,8 @@ class FPM::Command < Clamp::Command
     "patterns to exclude from input."
 
   option "--description", "DESCRIPTION", "Add a description for this package." \
-    " You can include '\n' sequences to indicate newline breaks.",
-    :default => "no description" do |val|
-    # Replace literal "\n" sequences with a newline character.
-    val.gsub("\\n", "\n")
-  end
+    " You can include '\\n' sequences to indicate newline breaks.",
+    :default => "no description"
   option "--url", "URI", "Add a url for this package.",
     :default => "http://example.com/no-uri-given"
   option "--inputs", "INPUTS_PATH",
@@ -202,7 +201,7 @@ class FPM::Command < Clamp::Command
         "--before-install, --after-install, --before-remove, and \n" \
         "--after-remove will behave in a backwards-compatible manner\n" \
         "(they will not be upgrade-case aware).\n" \
-        "Currently only supports deb and rpm packages." do |val|
+        "Currently only supports deb, rpm and pacman packages." do |val|
     File.expand_path(val) # Get the full path to the script
   end # --after-upgrade
   option "--before-upgrade", "FILE",
@@ -210,7 +209,7 @@ class FPM::Command < Clamp::Command
         "--before-install, --after-install, --before-remove, and \n" \
         "--after-remove will behave in a backwards-compatible manner\n" \
         "(they will not be upgrade-case aware).\n" \
-        "Currently only supports deb and rpm packages." do |val|
+        "Currently only supports deb, rpm and pacman packages." do |val|
     File.expand_path(val) # Get the full path to the script
   end # --before-upgrade
 
@@ -314,7 +313,7 @@ class FPM::Command < Clamp::Command
     #
     # Things like '--foo-bar' will be available as pkg.attributes[:foo_bar]
     self.class.declared_options.each do |option|
-      with(option.attribute_name) do |attr|
+      option.attribute_name.tap do |attr|
         next if attr == "help"
         # clamp makes option attributes available as accessor methods
         # --foo-bar is available as 'foo_bar'. Put these in the package
@@ -363,11 +362,13 @@ class FPM::Command < Clamp::Command
         return 1
       end
 
+      # Ensure hash is initialized
+      input.attributes[:excludes] ||= []
+
       # Read each line as a path
-      File.new(exclude-file, "r").each_line do |line| 
+      File.new(exclude_file, "r").each_line do |line|
         # Handle each line as if it were an argument
-        # 'excludes' is defined above near the -x option.
-        excludes << line.strip
+        input.attributes[:excludes] << line.strip
       end
     end
 
@@ -396,7 +397,6 @@ class FPM::Command < Clamp::Command
     set.call(input, :url)
     set.call(input, :vendor)
     set.call(input, :version)
-    set.call(input, :architecture)
 
     input.conflicts += conflicts
     input.dependencies += dependencies
@@ -414,7 +414,6 @@ class FPM::Command < Clamp::Command
 
     input.attrs = h
 
-
     script_errors = []
     setscript = proc do |scriptname|
       # 'self.send(scriptname) == self.before_install == --before-install
@@ -509,7 +508,7 @@ class FPM::Command < Clamp::Command
     end
   end # def execute
 
-  def run(*args)
+  def run(*run_args)
     logger.subscribe(STDOUT)
 
     # fpm initialization files, note the order of the following array is
@@ -518,21 +517,41 @@ class FPM::Command < Clamp::Command
     rc_files = [ ".fpm" ]
     rc_files << File.join(ENV["HOME"], ".fpm") if ENV["HOME"]
 
+    rc_args = []
+
+    if ENV["FPMOPTS"]
+      logger.warn("Loading flags from FPMOPTS environment variable")
+      rc_args.push(*Shellwords.shellsplit(ENV["FPMOPTS"]))
+    end
+
     rc_files.each do |rc_file|
       if File.readable? rc_file
         logger.warn("Loading flags from rc file #{rc_file}")
-        File.readlines(rc_file).each do |line|
-          # reverse becasue 'unshift' pushes onto the left side of the array.
-          Shellwords.shellsplit(line).reverse.each do |arg|
-            # Put '.fpm'-file flags *before* the command line flags
-            # so that we the CLI can override the .fpm flags
-            ARGV.unshift(arg)
-          end
-        end
+        rc_args.push(*Shellwords.shellsplit(File.read(rc_file)))
       end
     end
 
-    super(*args)
+    flags = []
+    args = []
+    while rc_args.size > 0 do
+      arg = rc_args.shift
+      opt = self.class.find_option(arg)
+      if opt and not opt.flag?
+        flags.push(arg)
+        flags.push(rc_args.shift)
+      elsif opt or arg[0] == "-"
+        flags.push(arg)
+      else
+        args.push(arg)
+      end
+    end
+
+    logger.warn("Additional options: #{flags.join " "}") if flags.size > 0
+    logger.warn("Additional arguments: #{args.join " "}") if args.size > 0
+
+    ARGV.unshift(*flags)
+    ARGV.push(*args)
+    super(*run_args)
   rescue FPM::Package::InvalidArgument => e
     logger.error("Invalid package argument: #{e}")
     return 1
@@ -567,21 +586,21 @@ class FPM::Command < Clamp::Command
 
       # Verify the types requested are valid
       types = FPM::Package.types.keys.sort
-      with(@command.input_type) do |val|
+      @command.input_type.tap do |val|
         next if val.nil?
         mandatory(FPM::Package.types.include?(val),
                   "Invalid input package -s flag) type #{val.inspect}. " \
                   "Expected one of: #{types.join(", ")}")
       end
 
-      with(@command.output_type) do |val|
+      @command.output_type.tap do |val|
         next if val.nil?
         mandatory(FPM::Package.types.include?(val),
                   "Invalid output package (-t flag) type #{val.inspect}. " \
                   "Expected one of: #{types.join(", ")}")
       end
 
-      with (@command.dependencies) do |dependencies|
+      @command.dependencies.tap do |dependencies|
         # Verify dependencies don't include commas (#257)
         dependencies.each do |dep|
           next unless dep.include?(",")

data/lib/fpm/package.rb

@@ -155,7 +155,7 @@ class FPM::Package
     # Iterate over all the options and set defaults
     if self.class.respond_to?(:declared_options)
       self.class.declared_options.each do |option|
-        with(option.attribute_name) do |attr|
+        option.attribute_name.tap do |attr|
           # clamp makes option attributes available as accessor methods
           # do --foo-bar is available as 'foo_bar'
           # make these available as package attributes.
@@ -216,7 +216,7 @@ class FPM::Package
     return pkg
   end # def convert
 
-  # This method is invoked on a package when it has been covered to a new
+  # This method is invoked on a package when it has been converted to a new
   # package format. The purpose of this method is to do any extra conversion
   # steps, like translating dependency conditions, etc.
   def converted_from(origin)
@@ -351,7 +351,7 @@ class FPM::Package
     system("#{editor} #{Shellwords.escape(path)}")
     if !$?.success?
       raise ProcessFailed.new("'#{editor}' failed (exit code " \
-                              "#{$?.exitstatus}) Full command was: "\
+                              "#{$?.exitstatus}) Full command was: " \
                               "#{command}");
     end
 
@@ -379,7 +379,7 @@ class FPM::Package
 
         if File.fnmatch(wildcard, match_path)
           logger.info("Removing excluded path", :path => match_path, :matches => wildcard)
-          FileUtils.remove_entry_secure(path)
+          FileUtils.rm_r(path)
           Find.prune
           break
         end

data/lib/fpm/package/cpan.rb

@@ -30,6 +30,9 @@ class FPM::Package::CPAN < FPM::Package
   option "--sandbox-non-core", :flag,
     "Sandbox all non-core modules, even if they're already installed", :default => true
 
+  option "--cpanm-force", :flag,
+    "Pass the --force parameter to cpanm", :default => false
+
   private
   def input(package)
     #if RUBY_VERSION =~ /^1\.8/
@@ -43,7 +46,7 @@ class FPM::Package::CPAN < FPM::Package
     require "net/http"
     require "json"
 
-    if (attributes[:cpan_local_module?])
+    if File.exist?(package)
       moduledir = package
     else
       result = search(package)
@@ -53,19 +56,28 @@ class FPM::Package::CPAN < FPM::Package
 
     # Read package metadata (name, version, etc)
     if File.exist?(File.join(moduledir, "META.json"))
-      metadata = JSON.parse(File.read(File.join(moduledir, ("META.json"))))
+      local_metadata = JSON.parse(File.read(File.join(moduledir, ("META.json"))))
     elsif File.exist?(File.join(moduledir, ("META.yml")))
       require "yaml"
-      metadata = YAML.load_file(File.join(moduledir, ("META.yml")))
+      local_metadata = YAML.load_file(File.join(moduledir, ("META.yml")))
     elsif File.exist?(File.join(moduledir, "MYMETA.json"))
-      metadata = JSON.parse(File.read(File.join(moduledir, ("MYMETA.json"))))
+      local_metadata = JSON.parse(File.read(File.join(moduledir, ("MYMETA.json"))))
     elsif File.exist?(File.join(moduledir, ("MYMETA.yml")))
       require "yaml"
-      metadata = YAML.load_file(File.join(moduledir, ("MYMETA.yml")))
-    else
+      local_metadata = YAML.load_file(File.join(moduledir, ("MYMETA.yml")))
+    end
+
+    # Merge the MetaCPAN query result and the metadata pulled from the local
+    # META file(s).  The local data overwrites the query data for all keys the
+    # two hashes have in common.  Merge with an empty hash if there was no
+    # local META file.
+    metadata = result.merge(local_metadata || {})
+
+    if metadata.empty?
       raise FPM::InvalidPackageConfiguration,
-        "Could not find package metadata. Checked for META.json and META.yml"
+        "Could not find package metadata. Checked for META.json, META.yml, and MetaCPAN API data"
     end
+
     self.version = metadata["version"]
     self.description = metadata["abstract"]
 
@@ -116,6 +128,7 @@ class FPM::Package::CPAN < FPM::Package
     cpanm_flags += ["-n"] if !attributes[:cpan_test?]
     cpanm_flags += ["--mirror", "#{attributes[:cpan_mirror]}"] if !attributes[:cpan_mirror].nil?
     cpanm_flags += ["--mirror-only"] if attributes[:cpan_mirror_only?] && !attributes[:cpan_mirror].nil?
+    cpanm_flags += ["--force"] if attributes[:cpan_cpanm_force?]
 
     safesystem(attributes[:cpan_cpanm_bin], *cpanm_flags)
 

data/lib/fpm/package/deb.rb

@@ -87,6 +87,10 @@ class FPM::Package::Deb < FPM::Package
     File.expand_path(file)
   end
 
+  option "--upstream-changelog", "FILEPATH", "Add FILEPATH as upstream changelog" do |file|
+    File.expand_path(file)
+  end
+
   option "--recommends", "PACKAGE", "Add PACKAGE to Recommends" do |pkg|
     @recommends ||= []
     @recommends << pkg
@@ -128,26 +132,38 @@ class FPM::Package::Deb < FPM::Package
     "Do not add all files in /etc as configuration files by default for Debian packages.",
     :default => false
 
+  option "--auto-config-files", :flag,
+    "Init script and default configuration files will be labeled as " \
+    "configuration files for Debian packages.",
+    :default => true
+
   option "--shlibs", "SHLIBS", "Include control/shlibs content. This flag " \
     "expects a string that is used as the contents of the shlibs file. " \
     "See the following url for a description of this file and its format: " \
     "http://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-shlibs"
 
   option "--init", "FILEPATH", "Add FILEPATH as an init script",
-	:multivalued => true do |file|
+    :multivalued => true do |file|
     next File.expand_path(file)
   end
 
   option "--default", "FILEPATH", "Add FILEPATH as /etc/default configuration",
-	:multivalued => true do |file|
+    :multivalued => true do |file|
     next File.expand_path(file)
   end
 
   option "--upstart", "FILEPATH", "Add FILEPATH as an upstart script",
+    :multivalued => true do |file|
+    next File.expand_path(file)
+  end
+
+  option "--systemd", "FILEPATH", "Add FILEPATH as a systemd script",
 	:multivalued => true do |file|
     next File.expand_path(file)
   end
 
+  option "--systemd-restart-after-upgrade", :flag , "Restart service after upgrade", :default => true
+
   def initialize(*args)
     super(*args)
     attributes[:deb_priority] = "extra"
@@ -224,7 +240,7 @@ class FPM::Package::Deb < FPM::Package
   end # def input
 
   def extract_info(package)
-    with(build_path("control")) do |path|
+    build_path("control").tap do |path|
       FileUtils.mkdir(path) if !File.directory?(path)
       # Unpack the control tarball
       safesystem("ar p #{package} control.tar.gz | tar -zxf - -C #{path}")
@@ -256,7 +272,7 @@ class FPM::Package::Deb < FPM::Package
       self.name = parse.call("Package")
       self.url = parse.call("Homepage")
       self.vendor = parse.call("Vendor") || self.vendor
-      with(parse.call("Provides")) do |provides_str|
+      parse.call("Provides").tap do |provides_str|
         next if provides_str.nil?
         self.provides = provides_str.split(/\s*,\s*/)
       end
@@ -371,14 +387,26 @@ class FPM::Package::Deb < FPM::Package
       end
     end
 
-    if script?(:before_upgrade) or script?(:after_upgrade)
+    attributes.fetch(:deb_systemd_list, []).each do |systemd|
+      name = File.basename(systemd, ".service")
+      dest_systemd = staging_path("lib/systemd/system/#{name}.service")
+      mkdir_p(File.dirname(dest_systemd))
+      FileUtils.cp(systemd, dest_systemd)
+      File.chmod(0644, dest_systemd)
+
+      # set the attribute with the systemd service name
+      attributes[:deb_systemd] = name
+    end
+
+    if script?(:before_upgrade) or script?(:after_upgrade) or attributes[:deb_systemd]
+      puts "Adding action files"
       if script?(:before_install) or script?(:before_upgrade)
         scripts[:before_install] = template("deb/preinst_upgrade.sh.erb").result(binding)
       end
-      if script?(:before_remove)
+      if script?(:before_remove) or attributes[:deb_systemd]
         scripts[:before_remove] = template("deb/prerm_upgrade.sh.erb").result(binding)
       end
-      if script?(:after_install) or script?(:after_upgrade)
+      if script?(:after_install) or script?(:after_upgrade) or attributes[:deb_systemd]
         scripts[:after_install] = template("deb/postinst_upgrade.sh.erb").result(binding)
       end
       if script?(:after_remove)
@@ -404,9 +432,14 @@ class FPM::Package::Deb < FPM::Package
           "Unknown compression type '#{self.attributes[:deb_compression]}'"
     end
 
-    # Write the changelog file
+    # There are two changelogs that may appear:
+    #   - debian-specific changelog, which should be archived as changelog.Debian.gz
+    #   - upstream changelog, which should be archived as changelog.gz
+    # see https://www.debian.org/doc/debian-policy/ch-docs.html#s-changelogs
+
+    # Write the changelog.Debian.gz file
     dest_changelog = File.join(staging_path, "usr/share/doc/#{name}/changelog.Debian.gz")
-    FileUtils.mkdir_p(File.dirname(dest_changelog))
+    mkdir_p(File.dirname(dest_changelog))
     File.new(dest_changelog, "wb", 0644).tap do |changelog|
       Zlib::GzipWriter.new(changelog, Zlib::BEST_COMPRESSION).tap do |changelog_gz|
         if attributes[:deb_changelog]
@@ -423,10 +456,30 @@ class FPM::Package::Deb < FPM::Package
       end.close
     end # No need to close, GzipWriter#close will close it.
 
+    # Write the changelog.gz file (upstream changelog)
+    dest_upstream_changelog = File.join(staging_path, "usr/share/doc/#{name}/changelog.gz")
+    if attributes[:deb_upstream_changelog]
+      File.new(dest_upstream_changelog, "wb", 0644).tap do |changelog|
+        Zlib::GzipWriter.new(changelog, Zlib::BEST_COMPRESSION).tap do |changelog_gz|
+            logger.info("Writing user-specified upstream changelog", :source => attributes[:deb_upstream_changelog])
+            File.new(attributes[:deb_upstream_changelog]).tap do |fd|
+              chunk = nil
+              # Ruby 1.8.7 doesn't have IO#copy_stream
+              changelog_gz.write(chunk) while chunk = fd.read(16384)
+            end.close
+        end.close
+      end # No need to close, GzipWriter#close will close it.
+    end
+
+    if File.exists?(dest_changelog) and not File.exists?(dest_upstream_changelog)
+      # see https://www.debian.org/doc/debian-policy/ch-docs.html#s-changelogs
+      File.rename(dest_changelog, dest_upstream_changelog)
+    end
+
     attributes.fetch(:deb_init_list, []).each do |init|
       name = File.basename(init, ".init")
       dest_init = File.join(staging_path, "etc/init.d/#{name}")
-      FileUtils.mkdir_p(File.dirname(dest_init))
+      mkdir_p(File.dirname(dest_init))
       FileUtils.cp init, dest_init
       File.chmod(0755, dest_init)
     end
@@ -434,7 +487,7 @@ class FPM::Package::Deb < FPM::Package
     attributes.fetch(:deb_default_list, []).each do |default|
       name = File.basename(default, ".default")
       dest_default = File.join(staging_path, "etc/default/#{name}")
-      FileUtils.mkdir_p(File.dirname(dest_default))
+      mkdir_p(File.dirname(dest_default))
       FileUtils.cp default, dest_default
       File.chmod(0644, dest_default)
     end
@@ -442,22 +495,48 @@ class FPM::Package::Deb < FPM::Package
     attributes.fetch(:deb_upstart_list, []).each do |upstart|
       name = File.basename(upstart, ".upstart")
       dest_upstart = staging_path("etc/init/#{name}.conf")
-      FileUtils.mkdir_p(File.dirname(dest_upstart))
+      mkdir_p(File.dirname(dest_upstart))
       FileUtils.cp(upstart, dest_upstart)
       File.chmod(0644, dest_upstart)
 
       # Install an init.d shim that calls upstart
-      dest_init = staging_path("/etc/init.d/#{name}")
-      FileUtils.mkdir_p(File.dirname(dest_init))
+      dest_init = staging_path("etc/init.d/#{name}")
+      mkdir_p(File.dirname(dest_init))
       FileUtils.ln_s("/lib/init/upstart-job", dest_init)
     end
 
+    attributes.fetch(:deb_systemd_list, []).each do |systemd|
+      name = File.basename(systemd, ".service")
+      dest_systemd = staging_path("lib/systemd/system/#{name}.service")
+      mkdir_p(File.dirname(dest_systemd))
+      FileUtils.cp(systemd, dest_systemd)
+      File.chmod(0644, dest_systemd)
+    end
+
+    write_control_tarball
+
+    # Tar up the staging_path into data.tar.{compression type}
+    case self.attributes[:deb_compression]
+      when "gz", nil
+        datatar = build_path("data.tar.gz")
+        compression = "-z"
+      when "bzip2"
+        datatar = build_path("data.tar.bz2")
+        compression = "-j"
+      when "xz"
+        datatar = build_path("data.tar.xz")
+        compression = "-J"
+      else
+        raise FPM::InvalidPackageConfiguration,
+          "Unknown compression type '#{self.attributes[:deb_compression]}'"
+    end
+
     args = [ tar_cmd, "-C", staging_path, compression ] + data_tar_flags + [ "-cf", datatar, "." ]
     safesystem(*args)
 
     # pack up the .deb, which is just an 'ar' archive with 3 files
     # the 'debian-binary' file has to be first
-    with(File.expand_path(output_path)) do |output_path|
+    File.expand_path(output_path).tap do |output_path|
       ::Dir.chdir(build_path) do
         safesystem("ar", "-qc", output_path, "debian-binary", "control.tar.gz", datatar)
       end
@@ -485,6 +564,20 @@ class FPM::Package::Deb < FPM::Package
         File.unlink(changelog_path)
       end
     end
+
+    if origin == FPM::Package::Deb
+      changelog_path = staging_path("usr/share/doc/#{name}/changelog.gz")
+      if File.exists?(changelog_path)
+        logger.debug("Found an upstream changelog file, using it.", :path => changelog_path)
+        attributes[:deb_upstream_changelog] = build_path("deb_upstream_changelog")
+        File.open(attributes[:deb_upstream_changelog], "w") do |deb_upstream_changelog|
+          Zlib::GzipReader.open(changelog_path) do |gz|
+            IO::copy_stream(gz, deb_upstream_changelog)
+          end
+        end
+        File.unlink(changelog_path)
+      end
+    end
   end # def converted_from
 
   def debianize_op(op)
@@ -594,7 +687,7 @@ class FPM::Package::Deb < FPM::Package
     write_md5sums # write the md5sums file
 
     # Make the control.tar.gz
-    with(build_path("control.tar.gz")) do |controltar|
+    build_path("control.tar.gz").tap do |controltar|
       logger.info("Creating", :path => controltar, :from => control_path)
 
       args = [ tar_cmd, "-C", control_path, "-zcf", controltar,
@@ -627,7 +720,7 @@ class FPM::Package::Deb < FPM::Package
     end
 
     # Write the control file
-    with(control_path("control")) do |control|
+    control_path("control").tap do |control|
       if attributes[:deb_custom_control]
         logger.debug("Using '#{attributes[:deb_custom_control]}' template for the control file")
         control_data = File.read(attributes[:deb_custom_control])
@@ -651,7 +744,7 @@ class FPM::Package::Deb < FPM::Package
     SCRIPT_MAP.each do |scriptname, filename|
       next unless script?(scriptname)
 
-      with(control_path(filename)) do |controlscript|
+      control_path(filename).tap do |controlscript|
         logger.debug("Writing control script", :source => filename, :target => controlscript)
         File.write(controlscript, script(scriptname))
         # deb maintainer scripts are required to be executable
@@ -661,18 +754,38 @@ class FPM::Package::Deb < FPM::Package
   end # def write_scripts
 
   def write_conffiles
-    allconfigs = []
-
     # expand recursively a given path to be put in allconfigs
     def add_path(path, allconfigs)
       # Strip leading /
       path = path[1..-1] if path[0,1] == "/"
       cfg_path = File.expand_path(path, staging_path)
-      Find.find(cfg_path).select { |p| File.file?(p) }.each do |p|
-        allconfigs << p.gsub("#{staging_path}/", '')
+      Find.find(cfg_path) do |p|
+        if File.file?(p)
+          allconfigs << p.gsub("#{staging_path}/", '')
+        end
       end
     end
 
+    # check for any init scripts or default files
+    inits    = attributes.fetch(:deb_init_list, [])
+    defaults = attributes.fetch(:deb_default_list, [])
+    upstarts = attributes.fetch(:deb_upstart_list, [])
+    etcfiles = []
+    # Add everything in /etc
+    begin
+      if !attributes[:deb_no_default_config_files?]
+        logger.warn("Debian packaging tools generally labels all files in /etc as config files, " \
+                    "as mandated by policy, so fpm defaults to this behavior for deb packages. " \
+                    "You can disable this default behavior with --deb-no-default-config-files flag")
+        add_path("/etc", etcfiles)
+      end
+    rescue Errno::ENOENT
+    end
+
+    return unless (config_files.any? or inits.any? or defaults.any? or upstarts.any? or etcfiles.any?)
+
+    allconfigs = etcfiles
+
     # scan all conf file paths for files and add them
     config_files.each do |path|
       begin
@@ -683,21 +796,31 @@ class FPM::Package::Deb < FPM::Package
       end
     end
 
-    # Also add everything in /etc
-    begin
-      if !attributes[:deb_no_default_config_files?]
-        logger.warn("Debian packaging tools generally labels all files in /etc as config files, " \
-                    "as mandated by policy, so fpm defaults to this behavior for deb packages. " \
-                    "You can disable this default behavior with --deb-no-default-config-files flag")
-        add_path("/etc", allconfigs)
+    if attributes[:deb_auto_config_files?]
+      inits.each do |init|
+        name = File.basename(init, ".init")
+        initscript = "/etc/init.d/#{name}"
+        logger.debug("Add conf file declaration for init script", :script => initscript)
+        allconfigs << initscript[1..-1]
+      end
+      defaults.each do |default|
+        name = File.basename(default, ".default")
+        confdefaults = "/etc/default/#{name}"
+        logger.debug("Add conf file declaration for defaults", :default => confdefaults)
+        allconfigs << confdefaults[1..-1]
+      end
+      upstarts.each do |upstart|
+        name = File.basename(upstart, ".upstart")
+        upstartscript = "etc/init/#{name}.conf"
+        logger.debug("Add conf file declaration for upstart script", :script => upstartscript)
+        allconfigs << upstartscript[1..-1]
       end
-    rescue Errno::ENOENT
     end
 
     allconfigs.sort!.uniq!
     return unless allconfigs.any?
 
-    with(control_path("conffiles")) do |conffiles|
+    control_path("conffiles").tap do |conffiles|
       File.open(conffiles, "w") do |out|
         allconfigs.each do |cf|
           # We need to put the leading / back. Stops lintian relative-conffile error.
@@ -730,7 +853,7 @@ class FPM::Package::Deb < FPM::Package
   end # def write_debconf
 
   def write_meta_files
-    files = attributes[:deb_meta_files]
+    files = attributes[:deb_meta_file]
     return unless files
     files.each do |fn|
       dest = control_path(File.basename(fn))
@@ -747,6 +870,7 @@ class FPM::Package::Deb < FPM::Package
 
     if lines.size > 0
       File.open(control_path("triggers"), 'a') do |f|
+        f.chmod 0644
         f.write "\n" if f.size > 0
         f.write lines
       end
@@ -774,6 +898,10 @@ class FPM::Package::Deb < FPM::Package
     end
   end # def write_md5sums
 
+  def mkdir_p(dir)
+    FileUtils.mkdir_p(dir, :mode => 0755)
+  end
+
   def to_s(format=nil)
     # Default format if nil
     # git_1.7.9.3-1_amd64.deb