[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 1.24.3-42-g91b1018



The following commit has been merged in the master branch:
commit b30b27995e3b9f29d2b536ce868127bf4c201654
Author: Frank Lichtenheld <djpig@debian.org>
Date:   Fri Aug 15 12:40:47 2008 -0300

    debian/rules: Clean-up the binary-indep code

diff --git a/debian/changelog b/debian/changelog
index 5c262c1..7e954ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ lintian (1.24.4) UNRELEASED; urgency=low
 
   * debian/rules:
     + [FL] Use $(PERL) instead of a hardcoded path.
+    + [FL] Clean-up the binary-indep code.
   
   * doc/README{,.in}:
     + [FL] Move README to README.in and add the listing of lintian
diff --git a/debian/lintian.install b/debian/lintian.install
new file mode 100644
index 0000000..4a17707
--- /dev/null
+++ b/debian/lintian.install
@@ -0,0 +1,7 @@
+frontend/lintian	usr/bin
+frontend/lintian-info	usr/bin
+checks			usr/share/lintian
+collection		usr/share/lintian
+data			usr/share/lintian
+lib			usr/share/lintian
+unpack			usr/share/lintian
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..ffb3534
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,2 @@
+man/lintian.1
+man/lintian-info.1
diff --git a/debian/rules b/debian/rules
index a440e6c..53ceb9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ PERL ?= /usr/bin/perl
 
 VER := $(shell head -1 debian/changelog | sed -e 's/^.*(//' -e 's/).*$$//')
 tmp := $(CURDIR)/debian/lintian
-usl := $(tmp)/usr/share/lintian
 neededfiles := debian/rules frontend/lintian
 allchecks := $(wildcard checks/*)
 allcollect := $(wildcard collection/*)
@@ -46,28 +45,13 @@ binary-indep: $(neededfiles) build
 	dh_clean -k -Xtestset/diffs/binary.c~
 	dh_installdirs
 
-# frontends
-	@echo .... install frontends ....
-	install -m 755 frontend/lintian $(tmp)/usr/bin/
+	dh_install
+# some manual work
 	sed -i 's/<VERSION>/$(VER)/' $(tmp)/usr/bin/lintian
-	install -m 755 frontend/lintian-info $(tmp)/usr/bin/
-# library files
-	@echo .... install library files ....
-	find checks collection data lib unpack \
-	    \( -path '*/CVS' -o -path '*/.svn' \) -prune -o -print \
-		| cpio -admp $(usl)
-# documentation
-	@echo .... install documentation ....
+	install -m 644 doc/lintianrc.example $(tmp)/etc/lintianrc
 	dh_installdocs
 	dh_installchangelogs
-# manual pages
-	@echo .... install manual pages ....
-	dh_installman man/*.1
-# config file
-	@echo .... install config file ....
-	install -m 644 doc/lintianrc.example $(tmp)/etc/lintianrc
-# control files
-	@echo .... fix things up and build packages ....
+	dh_installman
 	dh_compress
 	dh_fixperms
 	dh_installdeb

-- 
Debian package checker


Reply to: