--- a/Makefile Thu Sep 15 09:16:31 2011 +0200
+++ b/Makefile Thu Sep 15 09:47:12 2011 +0200
@@ -14,7 +14,7 @@
tools/chkconfig $(DESTDIR)/$(sysconfigdir)/config.pm \
&& install -m 644 config.pm $(DESTDIR)/$(sysconfdir)/config.pm
tools/signconfig $(DESTDIR)/$(sysconfdir)/config.pm
- install -d -m 0755 $(bindir)
+ install -d -m 0755 $(DESTDIR)/$(bindir)
install -m 0755 $(bin_SCRIPTS) $(DESTDIR)/$(bindir)/
install -d -m 0755 $(DESTDIR)/usr/share/perl5/Logbuch
@@ -27,9 +27,8 @@
check:
@-rm -f .e
- @cat modules | while read; do \
- perl -M$$REPLY -e 'print " $$'"$$REPLY"'::VERSION\n"' &>/dev/null \
- && continue; \
+ @cat modules | while read REPLY; do \
+ perl -M$$REPLY -e '' && continue; \
echo "MISSING perl library: \"$$REPLY\""; \
touch .e; \
done
--- a/debian/changelog Thu Sep 15 09:16:31 2011 +0200
+++ b/debian/changelog Thu Sep 15 09:47:12 2011 +0200
@@ -1,3 +1,9 @@
+logbuch (0.33) stable; urgency=low
+
+ * moved to new dh_make
+
+ -- Heiko Schlittermann <hs@schlittermann.de> Thu, 15 Sep 2011 09:27:02 +0200
+
logbuch (0.32) stable; urgency=low
* removed recommends: perl-doc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/compat Thu Sep 15 09:47:12 2011 +0200
@@ -0,0 +1,1 @@
+7
--- a/debian/conffiles Thu Sep 15 09:16:31 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/etc/logbuch/config.pm
--- a/debian/control Thu Sep 15 09:16:31 2011 +0200
+++ b/debian/control Thu Sep 15 09:47:12 2011 +0200
@@ -2,14 +2,15 @@
Section: utils
Priority: optional
Maintainer: Heiko Schlittermann <hs@schlittermann.de>
-Build-Depends: debhelper (>> 3.0.0), libmailtools-perl, libdbi-perl, libdbd-mysql-perl, libfile-which-perl
-Standards-Version: 3.5.2
+Build-Depends: debhelper (>= 7.0.50), libmailtools-perl, libdbi-perl, libdbd-mysql-perl, libfile-which-perl
+Standards-Version: 3.8.4
+Homepage: http://schlittermann.de/
Package: logbuch
Architecture: all
Suggests: mercurial, perl-doc
Recommends: vim
-Depends: ${perl:Depends}, libdbi-perl, libdbd-mysql-perl, libmailtools-perl,
+Depends: ${misc:Depends}, ${perl:Depends}, libdbi-perl, libdbd-mysql-perl, libmailtools-perl,
libfile-which-perl, libclass-accessor-perl
Description: Logbuch for server maintainance
A simple script for tracking server changes in a logfile
--- a/debian/rules Thu Sep 15 09:16:31 2011 +0200
+++ b/debian/rules Thu Sep 15 09:47:12 2011 +0200
@@ -5,90 +5,94 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
+%:
+ dh $@
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
+override_dh_auto_build:
$(MAKE) prefix=/usr
- #/usr/bin/docbook-to-man debian/logbuch.sgml > logbuch.1
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
-
- dh_clean
+override_dh_auto_install:
+ $(MAKE) prefix=/usr DESTDIR=debian/logbuch install
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/logbuch.
- $(MAKE) install DESTDIR=debian/logbuch prefix=/usr
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
-# dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installman
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs
-# dh_link
-# dh_strip
-# dh_compress
-# dh_fixperms
-# dh_makeshlibs
- dh_installdeb
- dh_perl
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+#-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+#- CFLAGS += -g
+#-endif
+#-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+#- INSTALL_PROGRAM += -s
+#-endif
+#-
+#-configure: configure-stamp
+#-configure-stamp:
+#- dh_testdir
+#- # Add here commands to configure the package.
+#-
+#- touch configure-stamp
+#-
+#-
+#-build: build-stamp
+#-
+#-build-stamp: configure-stamp
+#- dh_testdir
+#-
+#- # Add here commands to compile the package.
+#- $(MAKE) prefix=/usr
+#- #/usr/bin/docbook-to-man debian/logbuch.sgml > logbuch.1
+#-
+#- touch build-stamp
+#-
+#-clean:
+#- dh_testdir
+#- dh_testroot
+#- rm -f build-stamp configure-stamp
+#-
+#- # Add here commands to clean up after the build process.
+#- -$(MAKE) clean
+#-
+#- dh_clean
+#-
+#-install: build
+#- dh_testdir
+#- dh_testroot
+#- dh_clean -k
+#- dh_installdirs
+#-
+#- # Add here commands to install the package into debian/logbuch.
+#- $(MAKE) install DESTDIR=debian/logbuch prefix=/usr
+#-
+#-
+#-# Build architecture-independent files here.
+#-binary-indep: build install
+#-# We have nothing to do by default.
+#-
+#-# Build architecture-dependent files here.
+#-binary-arch: build install
+#- dh_testdir
+#- dh_testroot
+#-# dh_installdebconf
+#- dh_installdocs
+#-# dh_installexamples
+#-# dh_installmenu
+#-# dh_installlogrotate
+#-# dh_installemacsen
+#-# dh_installpam
+#-# dh_installmime
+#-# dh_installinit
+#-# dh_installcron
+#-# dh_installman
+#-# dh_installinfo
+#-# dh_undocumented
+#- dh_installchangelogs
+#-# dh_link
+#-# dh_strip
+#-# dh_compress
+#-# dh_fixperms
+#-# dh_makeshlibs
+#- dh_installdeb
+#- dh_perl
+#-# dh_shlibdeps
+#- dh_gencontrol
+#- dh_md5sums
+#- dh_builddeb
+#-
+#-binary: binary-indep binary-arch
+#-.PHONY: build clean binary-indep binary-arch binary install configure