fpm 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 94e2acc2a51dca9658374538128343b060301a57
-  data.tar.gz: ae3771e347496bd609cfa118c602d59a9277daf5
-SHA512: 
-  metadata.gz: 21ce60f7679ae634fdf4a55214b93476bc0d14d41fe1806b4f25133dfa6b4035dc4acf1d4c9d3eaa420a3960a2daedf11e6dd16499dcd04be09d13718432d4ef
-  data.tar.gz: dab536c4438a4db9f1920a8be8903b62060ac0b7a9c1b075eeedda225364bb79ea7f55d942163167262995b0d749c9f8859caf8997656fe6378046d761894535
+---
+SHA1:
+  metadata.gz: 3a77a3aacf9169d0736145ed029fd2ab6680aedb
+  data.tar.gz: d1aa6823e333933f41f7e8acb26bcdac30882931
+SHA512:
+  metadata.gz: 52bc56b7772cd9503da659c7c9eab7f3a52ed2f5e9288cb91699cbb5fb9ee27bcfcfd12c1602f600f707aac032624354a227bf2fcc987ef575fa68672b8d3d72
+  data.tar.gz: 7e7119f5906c4cc6cfa849ca0b4abd00a21c8dcdeac1cec6f1dbf58cc01fdc577f7fd7f6144dc88747048c3d5d1c5916c471930dbc2acad8e80675f3741a3acd

data/CHANGELIST

@@ -1,4 +1,12 @@
-1.3.0 (????)
+1.3.2 (November 4, 2014)
+  - deb: conversion from another deb will automatically use any changelog found in 
+    the source deb (Jordan Sissel)
+
+1.3.1 (November 4, 2014)
+  - deb: fix md5sums generation such that `dpkg -V` now works (#799, Matteo Panella)
+  - rpm: Use maximum compression when choosing xz (#797, Ashish Kulkarni)
+  
+1.3.0 (October 25, 2014)
   - Fixed a bunch of Ruby 1.8.7-related bugs. (Jordan Sissel)
   - cpan: Fix bug in author handling (#744, Leon Weidauer)
   - cpan: Better removal of perllocal.pod (#763, #443, #510, Mathias Lafeldt)

data/lib/fpm/package/deb.rb

@@ -451,7 +451,20 @@ class FPM::Package::Deb < FPM::Package
     self.provides = self.provides.collect do |provides|
       fix_provides(provides)
     end.flatten
-      
+
+    if origin == FPM::Package::Deb
+      changelog_path = staging_path("usr/share/doc/#{name}/changelog.Debian.gz")
+      if File.exists?(changelog_path)
+        logger.debug("Found a deb changelog file, using it.", :path => changelog_path)
+        attributes[:deb_changelog] = build_path("deb_changelog")
+        File.open(attributes[:deb_changelog], "w") do |deb_changelog|
+          Zlib::GzipReader.open(changelog_path) do |gz|
+            IO::copy_stream(gz, deb_changelog)
+          end
+        end
+        File.unlink(changelog_path)
+      end
+    end
   end # def converted_from
 
   def debianize_op(op)
@@ -718,7 +731,7 @@ class FPM::Package::Deb < FPM::Package
     if not md5_sums.empty?
       File.open(control_path("md5sums"), "w") do |out|
         md5_sums.each do |path, md5|
-          out.puts "#{md5} #{path}"
+          out.puts "#{md5}  #{path}"
         end
       end
       File.chmod(0644, control_path("md5sums"))

data/lib/fpm/package/python.rb

@@ -52,7 +52,7 @@ class FPM::Package::Python < FPM::Package
     "should be installed to."
   option "--install-lib", "LIB_PATH", "The path to where python libs " \
     "should be installed to (default depends on your python installation). " \
-    "Want to what your target platform is using? Run this: " \
+    "Want to find out what your target platform is using? Run this: " \
     "python -c 'from distutils.sysconfig import get_python_lib; " \
     "print get_python_lib()'"
   option "--install-data", "DATA_PATH", "The path to where data should be " \

data/lib/fpm/package/rpm.rb

@@ -24,7 +24,7 @@ class FPM::Package::RPM < FPM::Package
 
   COMPRESSION_MAP = {
     "none" => "w0.gzdio",
-    "xz" => "w2.xzdio",
+    "xz" => "w9.xzdio",
     "gzip" => "w9.gzdio",
     "bzip2" => "w9.bzdio"
   } unless defined?(COMPRESSION_MAP)

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end

data/templates/deb/changelog.erb

@@ -2,4 +2,4 @@
 
   * Package created with FPM.
 
- -- <%= maintainer %>[two spaces]  <%= Time.now.strftime("%a, %d %b %Y %T %z") %>
+ -- <%= maintainer %>  <%= Time.now.strftime("%a, %d %b %Y %T %z") %>

metadata

@@ -1,198 +1,246 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fpm
-version: !ruby/object:Gem::Version 
-  version: 1.3.0
+version: !ruby/object:Gem::Version
+  version: 1.3.2
 platform: ruby
-authors: 
+authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-11-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cabin
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: cabin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: backports
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: arr-pm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
+- !ruby/object:Gem::Dependency
+  name: arr-pm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: clamp
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.6"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: childprocess
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id007 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: insist
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: insist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: stud
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stud
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs, solaris packages and more. Win at package management without wasting pointless hours debugging bad rpm specs!
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
+  solaris packages and more. Win at package management without wasting pointless hours
+  debugging bad rpm specs!
 email: jls@semicomplete.com
-executables: 
+executables:
 - fpm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- CHANGELIST
+- CONTRIBUTORS
+- LICENSE
+- bin/fpm
 - lib/fpm.rb
-- lib/fpm/version.rb
 - lib/fpm/command.rb
-- lib/fpm/package/pkgin.rb
-- lib/fpm/package/zip.rb
+- lib/fpm/errors.rb
+- lib/fpm/namespace.rb
+- lib/fpm/package.rb
+- lib/fpm/package/cpan.rb
+- lib/fpm/package/deb.rb
 - lib/fpm/package/dir.rb
+- lib/fpm/package/empty.rb
+- lib/fpm/package/gem.rb
 - lib/fpm/package/npm.rb
-- lib/fpm/package/sh.rb
-- lib/fpm/package/cpan.rb
-- lib/fpm/package/rpm.rb
+- lib/fpm/package/osxpkg.rb
 - lib/fpm/package/pear.rb
-- lib/fpm/package/pyfpm/get_metadata.pyc
+- lib/fpm/package/pkgin.rb
+- lib/fpm/package/puppet.rb
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/pyfpm/get_metadata.py
 - lib/fpm/package/pyfpm/__init__.pyc
-- lib/fpm/package/gem.rb
-- lib/fpm/package/deb.rb
-- lib/fpm/package/osxpkg.rb
+- lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/pyfpm/get_metadata.pyc
+- lib/fpm/package/python.rb
+- lib/fpm/package/rpm.rb
+- lib/fpm/package/sh.rb
 - lib/fpm/package/solaris.rb
 - lib/fpm/package/tar.rb
-- lib/fpm/package/puppet.rb
-- lib/fpm/package/empty.rb
-- lib/fpm/package/python.rb
+- lib/fpm/package/zip.rb
 - lib/fpm/util.rb
-- lib/fpm/errors.rb
-- lib/fpm/namespace.rb
-- lib/fpm/package.rb
-- bin/fpm
-- templates/rpm/filesystem_list
-- templates/sh.erb
-- templates/puppet/package/remove.pp.erb
-- templates/puppet/package.pp.erb
-- templates/osxpkg.erb
-- templates/rpm.erb
-- templates/solaris.erb
+- lib/fpm/version.rb
+- templates/deb.erb
 - templates/deb/changelog.erb
+- templates/deb/ldconfig.sh.erb
+- templates/deb/postinst_upgrade.sh.erb
 - templates/deb/postrm_upgrade.sh.erb
 - templates/deb/preinst_upgrade.sh.erb
 - templates/deb/prerm_upgrade.sh.erb
-- templates/deb/ldconfig.sh.erb
-- templates/deb/postinst_upgrade.sh.erb
-- templates/deb.erb
-- LICENSE
-- CONTRIBUTORS
-- CHANGELIST
+- templates/osxpkg.erb
+- templates/puppet/package.pp.erb
+- templates/puppet/package/remove.pp.erb
+- templates/rpm.erb
+- templates/rpm/filesystem_list
+- templates/sh.erb
+- templates/solaris.erb
 homepage: https://github.com/jordansissel/fpm
-licenses: 
+licenses:
 - MIT-like
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: fpm - package building and mangling
 test_files: []
-