Author: djpig
Date: 2005-06-17 03:08:17 +0200 (Fri, 17 Jun 2005)
New Revision: 417
Added:
trunk/debian/compat
trunk/debian/dirs
trunk/debian/docs
Removed:
trunk/debian/conffiles
trunk/debian/postinst
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/prerm
trunk/debian/rules
Log:
Convert build process to debhelper
- debian/rules - adapted
- debian/compat - new
- debian/dirs - new
- debian/docs - new
- debian/control - add build depends
- debian/postinst - remove (Closes: #292981)
- debian/conffiles- remove
- debian/prerm - adapted
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/changelog 2005-06-17 01:08:17 UTC (rev 417)
@@ -1,5 +1,17 @@
lintian (1.23.9) unstable; urgency=low
+ * The "Wow, so much time at hand" release
+
+ * [FL] Convert build process to debhelper
+ - debian/rules - adapted
+ - debian/compat - new
+ - debian/dirs - new
+ - debian/docs - new
+ - debian/control - add build depends
+ - debian/postinst - remove (Closes: #292981)
+ - debian/conffiles- remove
+ - debian/prerm - adapted
+
* checks/conffiles:
+ [JvW] Warn on /var files being a conffile too (Closes: #293443)
* checks/menus:
Added: trunk/debian/compat
===================================================================
--- trunk/debian/compat 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/compat 2005-06-17 01:08:17 UTC (rev 417)
@@ -0,0 +1 @@
+4
Deleted: trunk/debian/conffiles
===================================================================
--- trunk/debian/conffiles 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/conffiles 2005-06-17 01:08:17 UTC (rev 417)
@@ -1 +0,0 @@
-/etc/lintianrc
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/control 2005-06-17 01:08:17 UTC (rev 417)
@@ -3,6 +3,7 @@
Priority: optional
Maintainer: Debian Lintian Maintainers <[EMAIL PROTECTED]>
Uploaders: Josip Rodin <[EMAIL PROTECTED]>, Jeroen van Wolffelaar <[EMAIL
PROTECTED]>, Frank Lichtenheld <[EMAIL PROTECTED]>, Marc 'HE' Brockschmidt
<[EMAIL PROTECTED]>, Colin Watson <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 4)
Build-Depends-Indep: debiandoc-sgml, sed (>= 4.1-4)
Standards-Version: 3.6.1
Added: trunk/debian/dirs
===================================================================
--- trunk/debian/dirs 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/dirs 2005-06-17 01:08:17 UTC (rev 417)
@@ -0,0 +1,5 @@
+usr/bin
+etc
+var/spool/lintian
+usr/share/lintian/overrides
+usr/share/lintian/info
Added: trunk/debian/docs
===================================================================
--- trunk/debian/docs 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/docs 2005-06-17 01:08:17 UTC (rev 417)
@@ -0,0 +1,6 @@
+doc/lintian.html
+doc/CREDITS
+doc/README
+doc/desc-files
+doc/lintian.sgml
+doc/lintian.txt
Deleted: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/postinst 2005-06-17 01:08:17 UTC (rev 417)
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = configure ] && command -v install-docs >/dev/null 2>&1; then
- install-docs -i /usr/share/doc-base/lintian
-fi
Modified: trunk/debian/prerm
===================================================================
--- trunk/debian/prerm 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/prerm 2005-06-17 01:08:17 UTC (rev 417)
@@ -1,9 +1,7 @@
#!/bin/sh -e
-if [ "$1" = remove ] || [ "$1" = upgrade ] && command -v install-docs
>/dev/null 2>&1; then
- install-docs -r lintian
-fi
-
if [ "$1" = "purge" ]; then
lintian --remove-lab
fi
+
+#DEBHELPER#
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-06-17 00:19:29 UTC (rev 416)
+++ trunk/debian/rules 2005-06-17 01:08:17 UTC (rev 417)
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
VER := $(shell head -1 debian/changelog | sed -e 's/^.*(//' -e 's/).*$$//')
-tmp := $(CURDIR)/debian/tmp
+tmp := $(CURDIR)/debian/lintian
usl := $(tmp)/usr/share/lintian
-usdl := $(tmp)/usr/share/doc/lintian
neededfiles := debian/rules frontend/lintian
allchecks := $(wildcard checks/*)
allcollect := $(wildcard collection/*)
@@ -18,73 +17,58 @@
build: $(neededfiles)
@echo .... running build ....
+ dh_testdir
cd doc && LANG=C debiandoc2html lintian.sgml
cd doc && LANG=C debiandoc2text lintian.sgml
clean: $(neededfiles)
@echo .... cleaning ....
- rm -f runtests debian/files* debian/substvars
- rm -rf $(tmp)
+ dh_testdir
+ dh_testroot
+ rm -f runtests
rm -rf doc/lintian.html/ doc/lintian.txt
rm -rf debian/tests
- find -name "*~" -print0 -o -name core -o -name "*.py?" | xargs -0r rm
-# ??? find -name CVS -type d -print0 | xargs -0r rm -r
+ find -name "*.py?" -print0 | xargs -0r rm
+ dh_clean
binary-indep: $(neededfiles) build
- @test `id -u` -eq 0 || { echo "you need (fake)root."; exit 1; }
@echo .... binary-indep ....
- rm -rf $(tmp)
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
# frontends
@echo .... install frontends ....
- install -d $(tmp)/usr/bin
install -m 755 frontend/lintian $(tmp)/usr/bin/
sed -i 's/<VERSION>/$(VER)/' $(tmp)/usr/bin/lintian
install -m 755 frontend/lintian-info $(tmp)/usr/bin/
# library files
@echo .... install library files ....
- install -d $(usl) $(usl)/checks $(usl)/collection $(usl)/info
- install -d $(usl)/lib $(usl)/unpack $(usl)/overrides
for d in checks collection lib unpack; do \
+ install -d $(usl)/$$d; \
find $$d -type f ! -path '*/CVS/*' ! -path '*/.svn/*' \
| xargs -iFILE cp -p FILE $(usl)/$$d/; \
done
# documentation
@echo .... install documentation ....
- install -d $(usdl)
- find doc -maxdepth 1 -type f ! -path '*/CVS/*' ! -path '*/.svn/*' \
- ! -name lintianrc.example | xargs -iFILE cp -p FILE $(usdl)/
- cp -a doc/lintian.html $(usdl)/
- gzip -9 $(usdl)/lintian.sgml
- gzip -9 $(usdl)/lintian.txt
- install -m 644 debian/changelog $(usdl)/
- gzip -9 $(usdl)/changelog
- ln -s changelog.gz $(usdl)/changelog.Debian.gz
- install -m 644 debian/copyright $(usdl)/
- install -d $(tmp)/usr/share/doc-base
- install -m 644 debian/doc-base $(tmp)/usr/share/doc-base/lintian
+ dh_installdocs
+ dh_installchangelogs
# manual pages
@echo .... install manual pages ....
- install -d $(tmp)/usr/share/man/man1
- install -m 644 man/*.1 $(tmp)/usr/share/man/man1
- gzip -9 $(tmp)/usr/share/man/man1/*
+ dh_installman man/*.1
# config file
@echo .... install config file ....
- install -d $(tmp)/etc/
install -m 644 doc/lintianrc.example $(tmp)/etc/lintianrc
-# spool directory
- @echo .... install spool directory ....
- install -d $(tmp)/var/spool/lintian
# control files
- @echo .... install control files ....
- install -d $(tmp)/DEBIAN
- install -m 755 debian/postinst debian/prerm $(tmp)/DEBIAN/
- install -m 644 debian/conffiles $(tmp)/DEBIAN/
+ @echo .... fix things up and build packages ....
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
- dpkg-gencontrol -isp
- chown -R root.root $(tmp)
- chmod -R go=rX $(tmp)
- dpkg --build $(tmp) ..
-
binary-arch:
binary: binary-indep binary-arch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
