[Pkg-awstats-commits] [awstats] 08/11: Transition to dh build system, drop CDBS dependence

Thu Oct 17 22:28:36 UTC 2013

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

sk-guest pushed a commit to branch master
in repository awstats.

commit 3be63f38e2324b413c613919ac81c5ac59940284
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Mon Oct 7 15:46:14 2013 +0400

    Transition to dh build system, drop CDBS dependence
---
 debian/awstats.docs                 |    1 +
 debian/compat                       |    2 +-
 debian/control                      |   14 ++----
 debian/patches/2004_build.xml.patch |    4 +-
 debian/rules                        |   89 +++++++++++++----------------------
 5 files changed, 40 insertions(+), 70 deletions(-)

diff --git a/debian/awstats.docs b/debian/awstats.docs
new file mode 100644
index 0000000..217e0a8
--- /dev/null
+++ b/debian/awstats.docs
@@ -0,0 +1 @@
+README.TXT
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index 7d1372b..7ef526e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,7 @@ Source: awstats
 Section: web
 Priority: optional
 Maintainer: Sergey B Kirpichev <skirpichev at gmail.com>
-Build-Depends: cdbs (>= 0.4.70~),
- devscripts (>= 2.10.7~),
- debhelper (>= 6),
- dh-buildinfo,
- ant,
- default-jdk,
- sharutils
+Build-Depends: debhelper (>= 9), ant, default-jdk, sharutils
 Vcs-Git: git://git.debian.org/git/collab-maint/awstats.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/awstats.git;a=summary
 Standards-Version: 3.9.4
@@ -16,9 +10,9 @@ Homepage: http://awstats.sourceforge.net/
 
 Package: awstats
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, ${cdbs:Depends}
-Recommends: ${cdbs:Recommends}
-Suggests: ${cdbs:Suggests}
+Depends: ${perl:Depends}, ${misc:Depends}
+Recommends: libnet-xwhois-perl, coreutils (>= 7.4)
+Suggests: apache2 | httpd, libnet-dns-perl, libnet-ip-perl, libgeo-ipfree-perl, liburi-perl
 Description: powerful and featureful web server log analyzer
  Advanced Web Statistics (AWStats) is a powerful web server logfile
  analyzer written in perl that shows you all your web statistics including
diff --git a/debian/patches/2004_build.xml.patch b/debian/patches/2004_build.xml.patch
index b73e485..aaaf52f 100644
--- a/debian/patches/2004_build.xml.patch
+++ b/debian/patches/2004_build.xml.patch
@@ -10,7 +10,7 @@ Author: Jonas Smedegaard <dr at jones.dk>
 @@ -0,0 +1,35 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +
-+<project name="awgraphapplet" basedir="../wwwroot/classes" default="build">
++<project name="awgraphapplet" basedir="." default="build">
 +
 +  <target name="init">
 +    <property name="name" value="awgraphapplet"/>
@@ -37,7 +37,7 @@ Author: Jonas Smedegaard <dr at jones.dk>
 +  </target>
 +
 +  <target name="bin-jar" depends="init,build" description="package binaries">
-+    <jar jarfile="${target.dir}/${name}${version}.jar">
++    <jar jarfile="${target.dir}/${name}-${version}.jar">
 +      <fileset dir="src" includes="*.class"/>
 +    </jar>
 +  </target>
diff --git a/debian/rules b/debian/rules
index 48907c8..a98227e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,59 +1,34 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003-2010 Jonas Smedegaard <dr at jones.dk>
-# Description: Main Debian packaging script for AWStats
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include /usr/share/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-DEB_UPSTREAM_URL = http://prdownloads.sourceforge.net/awstats
-DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/(-7\.1)\.(\d)/$$1$$2/
-DEB_UPSTREAM_TARBALL_MD5 = 9ee8cb9c89295a519638ae1cf6a4e1e2
-
-DEB_UPSTREAM_REPACKAGE_EXCLUDE = wwwroot/icon/browser/firefox.png
-
-DEB_INSTALL_CHANGELOGS_ALL = docs/awstats_changelog.txt
-DEB_INSTALL_DOCS_ALL = README.TXT
-
-JAVA_HOME = /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE = debian/build.xml
-DEB_ANT_BUILD_TARGET = bin-jar
-DEB_ANT_ARGS = -Dpackage=awgraphapplet -Dversion=$(DEB_NOEPOCH_VERSION)
-
-common-configure-indep::
-	cp wwwroot/cgi-bin/awstats.model.conf debian/awstats.conf
-clean::
-	rm -f debian/awstats.conf
-
-# Install (and cleanup) java applet
-# TODO: use DEB_DH_INSTALL_ARGS_awstats when some day implemented in CDBS
-DEB_DH_LINK_awstats = usr/share/java/awstats/awgraphapplet$(DEB_NOEPOCH_VERSION).jar usr/share/java/awstats/awgraphapplet.jar
-binary-install/awstats:: DEB_DH_INSTALL_ARGS = wwwroot/classes/awgraphapplet$(DEB_NOEPOCH_VERSION).jar usr/share/java/awstats/
-clean::
-	rm -f wwwroot/classes/awgraphapplet?*.jar
-
-# Needed (often/sometimes) at runtime
-# * Recent coreutils needed for cron scripts (doing mktemp --tmpdir)
-CDBS_RECOMMENDS := libnet-xwhois-perl, coreutils (>= 7.4)
-CDBS_SUGGESTS := apache2 | httpd, libnet-dns-perl, libnet-ip-perl, libgeo-ipfree-perl, liburi-perl
-
-# Needed by upstream build process
-CDBS_BUILD_DEPENDS += , ant, default-jdk
-
-# Needed for our packaging
-CDBS_BUILD_DEPENDS += , sharutils
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+
+%:
+	dh $@
+
+override_dh_installchangelogs:
+	dh_installchangelogs docs/awstats_changelog.txt
+
+override_dh_auto_install:
+	dh_auto_install
+	dh_install \
+		wwwroot/classes/awgraphapplet-$(DEB_VERSION).jar \
+		usr/share/java/awstats/
+	cp wwwroot/cgi-bin/awstats.model.conf debian/awstats/etc/awstats/awstats.conf
+
+override_dh_link:
+	dh_link
+	dh_link \
+		usr/share/java/awstats/awgraphapplet-$(DEB_VERSION).jar \
+		usr/share/java/awstats/awgraphapplet.jar
+
+override_dh_auto_build:
+	dh_auto_build \
+		--buildsystem=ant \
+		--sourcedirectory=wwwroot/classes -- \
+		-Dversion=$(DEB_VERSION) bin-jar
+
+override_dh_auto_clean:
+	-dh_auto_clean \
+		--buildsystem=ant \
+		--sourcedirectory=wwwroot/classes -- \
+		-Dversion=$(DEB_VERSION)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/awstats.git

