[Forensics-changes] [unhide.rb] 01/01: Imported Debian patch 22-2

Giovani Augusto Ferreira giovani-guest at moszumanska.debian.org
Wed Nov 11 01:08:15 UTC 2015 

This is an automated email from the git hooks/post-receive script.

giovani-guest pushed a commit to branch debian
in repository unhide.rb.

commit 8865aa35ce71f728f7783868972e382e3e9ade3a
Author: Giovani Augusto Ferreira <giovani at riseup.net>
Date:   Wed Oct 21 22:40:46 2015 -0200

    Imported Debian patch 22-2
---
 debian/changelog                | 25 +++++++++++++++++++++++++
 debian/control                  |  8 ++++----
 debian/copyright                |  6 +++---
 debian/dirs                     |  2 +-
 debian/lintian-overrides        |  2 +-
 debian/patches/fix-install      | 14 ++++++++++++++
 debian/patches/fix-source       | 38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  2 ++
 debian/rules                    |  2 +-
 debian/source.lintian-overrides |  2 --
 debian/watch                    |  2 ++
 11 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e186674..050d44f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+unhide.rb (22-2) unstable; urgency=medium
+
+  * Team upload.
+  * debian/control:
+     - Bumped Standards-Version to 3.9.6.
+     - Fixed VCS fields.
+     - Updated Priority field.
+  * debian/copyright:
+     - Reviewed and updated some information.
+  * debian/dirs
+     - Updated to correct directory.
+  * debian/lintian.overrides:
+     - Updated description.
+  * debian/patches:
+     - New patch to fix older parameter in the ruby code.
+       (Closes: #758524, LP: #1420897, #1171067)
+     - New patch to fix the correct installation directory.
+  * debian/rules:
+     - Updated to install correctly the files and manpage.
+  * debian/source.lintian-overrides:
+     - Useless override,removed.
+  * debian/watch: created.
+
+ -- Giovani Augusto Ferreira <giovani at riseup.net>  Wed, 21 Oct 2015 22:40:46 -0200
+
 unhide.rb (22-1) unstable; urgency=low
 
   * New upstream snapshot (Closes: #698046):
diff --git a/debian/control b/debian/control
index 96f2450..47cf99f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: unhide.rb
 Section: admin
-Priority: extra
+Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Julien Valroff <julien at debian.org>
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: http://launchpad.net/unhide.rb
-Vcs-Browser: http://git.debian.org/?p=forensics/unhide.rb.git;a=summary
-Vcs-Git: git://git.debian.org/forensics/unhide.rb.git
+Vcs-Browser: https://anonscm.debian.org/cgit/forensics/unhide.rb.git
+Vcs-Git: git://anonscm.debian.org/forensics/unhide.rb.git
 
 Package: unhide.rb
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 8473279..904be57 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,12 @@ Upstream-Name: Unhide.rb
 Source: http://code.launchpad.net/unhide.rb
 
 Files: *
-Copyright: 2009, Johan Walles <johan.walles at gmail.com>
+Copyright: 2009 Johan Walles <johan.walles at gmail.com>
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2011, Julien Valroff <julien at debian.org>
+Copyright: 2011-2013 Julien Valroff <julien at debian.org>
+           2015      Giovani Augusto Ferreira <giovani at riseup.net>
 License: GPL-3+
 
 License: GPL-3+
@@ -24,4 +25,3 @@ License: GPL-3+
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
-
diff --git a/debian/dirs b/debian/dirs
index d433927..b174b44 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,2 @@
-usr/bin
+usr/sbin
 usr/share/man/man8
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index fc52a53..46f0059 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,2 +1,2 @@
 # The extension is part of the name of the application
-unhide.rb: script-with-language-extension usr/bin/unhide.rb
+unhide.rb: script-with-language-extension usr/sbin/unhide.rb
diff --git a/debian/patches/fix-install b/debian/patches/fix-install
new file mode 100644
index 0000000..c1320c4
--- /dev/null
+++ b/debian/patches/fix-install
@@ -0,0 +1,14 @@
+Description: change the installation directory.
+Author: Giovani Augusto Ferreira <giovani at riseup.net>
+Last-Updated: 2015-11-05
+Index: unhide.rb-22/Makefile
+===================================================================
+--- unhide.rb-22.orig/Makefile
++++ unhide.rb-22/Makefile
+@@ -4,5 +4,5 @@ all :
+ 	@echo Nothing to do for all, try \"make install\".
+ 
+ install :
+-	install unhide.rb ${PREFIX}/bin
++	install unhide.rb ${PREFIX}/sbin/unhide.rb
+ 	install --mode=644 unhide.rb.8 ${PREFIX}/share/man/man8
diff --git a/debian/patches/fix-source b/debian/patches/fix-source
new file mode 100644
index 0000000..9ef5b91
--- /dev/null
+++ b/debian/patches/fix-source
@@ -0,0 +1,38 @@
+Description: Fix and update older parameter in the ruby code.
+Author: Giovani Augusto Ferreira <giovani at riseup.net>
+Last-Update: 2015-10-30
+Index: unhide.rb-22/unhide.rb
+===================================================================
+--- unhide.rb-22.orig/unhide.rb
++++ unhide.rb-22/unhide.rb
+@@ -23,16 +23,17 @@
+ #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ require 'set'
+-require 'dl/import'
+-require 'dl/struct'
++require 'fiddle/import'
++require 'fiddle/struct'
++
+ 
+ # Support for libc functions not covered by the standard Ruby
+ # libraries
+ module LibC
+   if RUBY_VERSION =~ /^1\.8/
+-    extend DL::Importable
++    extend Fiddle::Importable
+   else
+-    extend DL::Importer
++    extend Fiddle::Importer
+   end
+   dlload "libc.so.6"
+ 
+@@ -151,7 +152,7 @@ end
+ 
+ # Return errno after last library call
+ def get_errno()
+-  return DL.respond_to?("last_error") ? DL::last_error : Fiddle::last_error
++  return Fiddle.respond_to?("last_error") ? Fiddle::last_error : Fiddle::last_error
+ end
+ 
+ # This array contains named PID detectors. Given a PID to examine they
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..33932e5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-install
+fix-source
diff --git a/debian/rules b/debian/rules
index 22492ee..4dd7e95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,4 @@
 	dh $@
 
 override_dh_auto_install:
-	$(MAKE) install PREFIX=debian/unhide.rb/usr
+	dh_auto_install -- PREFIX=$(CURDIR)/debian/unhide.rb/usr
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index c57a1db..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# No tarball is released, hence we cannot use any watch file
-unhide.rb source: debian-watch-file-is-missing
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a92497e
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://code.launchpad.net/~walles/unhide.rb/trunk .*/trunk/revision/(\d\S+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/unhide.rb.git

More information about the forensics-changes mailing list