[Forensics-changes] [SCM] UNNAMED PROJECT branch, debian, updated. 81fe7bb4f1dc1c6804081908a8677b7a3fa43813

Daniel Baumann daniel at debian.org
Thu Jul 9 12:11:17 UTC 2009


The following commit has been merged in the debian branch:
commit 81fe7bb4f1dc1c6804081908a8677b7a3fa43813
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jul 9 13:58:12 2009 +0200

    Using debhelper install file rather than adding install target in upstream Makefile.

diff --git a/Makefile b/Makefile
index ea7a98e..7531f3d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,5 +9,3 @@ aeskeyfind: $(OBJS)
 clean:
 	@rm -f aeskeyfind *~ \#* $(OBJS)
 
-install:
-	install -m655 aeskeyfind $(DESTDIR)/usr/bin/aeskeyfind
diff --git a/debian/aeskeyfind.dirs b/debian/aeskeyfind.dirs
deleted file mode 100644
index 415f082..0000000
--- a/debian/aeskeyfind.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin
diff --git a/debian/aeskeyfind.install b/debian/aeskeyfind.install
new file mode 100644
index 0000000..e9af75f
--- /dev/null
+++ b/debian/aeskeyfind.install
@@ -0,0 +1 @@
+aeskeyfind	/usr/bin
diff --git a/debian/rules b/debian/rules
index c35bdfe..abfd0f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,21 +17,16 @@ build-stamp:
 
 	touch build-stamp
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) DESTDIR=$(CURDIR)/debian/aeskeyfind install
+install:
 
 binary: binary-arch
 
-binary-arch: install
+binary-arch: build
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
+	dh_install
 	dh_lintian
 	dh_strip
 	dh_compress

-- 
UNNAMED PROJECT



More information about the forensics-changes mailing list