[Forensics-changes] [crack] 15/40: Replace override_dh_auto_install with debian/crack*.{link, install}

Giovani Augusto Ferreira giovani-guest at moszumanska.debian.org
Wed Dec 28 02:47:53 UTC 2016


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

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

commit 1612431626cfe5756ec07d5f82434906b5b526d5
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Oct 10 00:31:33 2016 +0200

    Replace override_dh_auto_install with debian/crack*.{link,install}
---
 debian/changelog            |  4 ++--
 debian/crack-common.install |  2 ++
 debian/crack-common.links   |  1 +
 debian/crack-md5.install    |  2 ++
 debian/crack-md5.links      |  2 ++
 debian/crack.install        |  2 ++
 debian/crack.links          |  3 +++
 debian/rules                | 23 ++---------------------
 8 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dedeac9..b4f35f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,8 @@ crack (5.0a-10) UNRELEASED; urgency=medium
     + Switch to a minimal dh v7 style debian/rules file.
     + Use debian/clean instead of manual calls to rm in clean target.
     + Use dh_auto_clean instead of manual call to make.
-    + Replace override_dh_install{docs,examples,man} with
-      debian/crack-common.{docs,examples,manpages,link}
+    + Replace override_dh_{auto_install,install{docs,examples,man}} with
+      debian/crack*.{docs,examples,manpages,link,install}.
 
  -- Axel Beckert <abe at debian.org>  Sun, 09 Oct 2016 21:53:26 +0200
 
diff --git a/debian/crack-common.install b/debian/crack-common.install
new file mode 100644
index 0000000..d783969
--- /dev/null
+++ b/debian/crack-common.install
@@ -0,0 +1,2 @@
+Crack Reporter Makefile dict scripts usr/share/Crack/
+conf/* etc/Crack/
diff --git a/debian/crack-common.links b/debian/crack-common.links
index a3f2068..6c68011 100644
--- a/debian/crack-common.links
+++ b/debian/crack-common.links
@@ -1 +1,2 @@
 /usr/share/man/man8/Crack.8 /usr/share/man/man8/Crack-Reporter.8
+/etc/Crack /usr/share/Crack/conf
diff --git a/debian/crack-md5.install b/debian/crack-md5.install
new file mode 100644
index 0000000..fd99e5d
--- /dev/null
+++ b/debian/crack-md5.install
@@ -0,0 +1,2 @@
+lib/bin/debian-md5/* usr/lib/Crack/
+debian/Crack debian/Crack-Reporter usr/sbin/
diff --git a/debian/crack-md5.links b/debian/crack-md5.links
new file mode 100644
index 0000000..84c8559
--- /dev/null
+++ b/debian/crack-md5.links
@@ -0,0 +1,2 @@
+/var/lib/Crack /usr/share/Crack/run
+/usr/lib/Crack /var/lib/Crack/bin/debian
diff --git a/debian/crack.install b/debian/crack.install
new file mode 100644
index 0000000..7d735b6
--- /dev/null
+++ b/debian/crack.install
@@ -0,0 +1,2 @@
+lib/bin/debian-crypt/* usr/lib/Crack/
+debian/Crack debian/Crack-Reporter usr/sbin/
diff --git a/debian/crack.links b/debian/crack.links
new file mode 100644
index 0000000..0e0e797
--- /dev/null
+++ b/debian/crack.links
@@ -0,0 +1,3 @@
+/etc/Crack /usr/share/Crack/conf
+/var/lib/Crack /usr/share/Crack/run
+/usr/lib/Crack /var/lib/Crack/bin/debian
diff --git a/debian/rules b/debian/rules
index e98fc55..97c5537 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,25 +30,6 @@ override_dh_auto_clean:
 	fi
 	dh_auto_clean -- spotless
 
-override_dh_auto_install:
-	install -m755 Crack Reporter  debian/crack-common/usr/share/Crack/
-	install -m644 Makefile  debian/crack-common/usr/share/Crack/
-	install -m755 scripts/*  debian/crack-common/usr/share/Crack/scripts/
-	for i in dict ; do \
-	cp -a $$i debian/crack-common/usr/share/Crack/; \
-	done
-	cp -a conf/* debian/crack-common/etc/Crack/
-	cd  debian/crack-common/usr/share/Crack/ && ln -s /etc/Crack conf
+override_dh_install:
+	dh_install
 	chmod a+x  debian/crack-common/usr/share/Crack/Crack  debian/crack-common/usr/share/Crack/Reporter
-	# For the DES version
-	cp -a lib/bin/debian-crypt/* debian/crack/usr/lib/Crack
-	cd debian/crack/usr/share/Crack && ln -s /var/lib/Crack run
-
-	cd debian/crack/var/lib/Crack/bin/ && ln -s /usr/lib/Crack debian
-	install -m755 debian/Crack debian/Crack-Reporter debian/crack/usr/sbin/
-	# For the MD5 version
-	cp -a lib/bin/debian-md5/* debian/crack-md5/usr/lib/Crack
-	cd debian/crack-md5/usr/share/Crack && ln -s /var/lib/Crack run
-
-	cd debian/crack-md5/var/lib/Crack/bin/ && ln -s /usr/lib/Crack debian
-	install -m755 debian/Crack debian/Crack-Reporter debian/crack-md5/usr/sbin/

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



More information about the forensics-changes mailing list