From 1b2bd59b9fb3ddc7ce19b3eff34213e6ca3cd51a Mon Sep 17 00:00:00 2001 From: Dragan Dosen Date: Thu, 28 Apr 2011 21:07:08 +0200 Subject: [PATCH] Prva inacica paketa za Debian squeeze distribuciju. --- debian/README.CARNet => README.CARNet | 4 +- debian/changelog | 10 +++ debian/changelog.CARNet | 1 - debian/compat | 2 +- debian/control | 11 ++-- debian/copyright | 7 +++ debian/docs | 3 +- debian/lintian-overrides | 1 + debian/postinst | 111 ++++++++++++++++----------------- debian/prerm | 21 ------- debian/rules | 69 +------------------- 11 files changed, 82 insertions(+), 158 deletions(-) rename debian/README.CARNet => README.CARNet (85%) delete mode 120000 debian/changelog.CARNet create mode 100644 debian/copyright create mode 100644 debian/lintian-overrides delete mode 100755 debian/prerm diff --git a/debian/README.CARNet b/README.CARNet similarity index 85% rename from debian/README.CARNet rename to README.CARNet index 07e0ee2..3e8bb1b 100644 --- a/debian/README.CARNet +++ b/README.CARNet @@ -1,5 +1,5 @@ webalizer-cn ------------- +~~~~~~~~~~~~ Webalizer stranicama mozete pristupiti na web adresi @@ -17,4 +17,4 @@ Pocetna zaporka za pristup je poslana root korisniku prilikom instalacije paketa. - -- Dragan Dosen Thu, 25 Oct 2007 17:21:17 +0200 + -- Dragan Dosen Wed, 27 Apr 2011 20:50:34 +0200 diff --git a/debian/changelog b/debian/changelog index 660501f..3527d6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +webalizer-cn (2.01.10+1) stable; urgency=low + + * Prva inacica paketa za Debian squeeze distribuciju. + * Nova debian/rules datoteka. + * Azurirane ovisnosti unutar debian/control. + * Razni Lintian popravci, dodan copyright, promjena inacice + paketa u Debian native. + + -- Dragan Dosen Fri, 22 Apr 2011 18:17:42 +0200 + webalizer-cn (2.01.10-32.4lenny1) stable; urgency=low * Upgrade paketa za Debian lenny. diff --git a/debian/changelog.CARNet b/debian/changelog.CARNet deleted file mode 120000 index 194579e..0000000 --- a/debian/changelog.CARNet +++ /dev/null @@ -1 +0,0 @@ -changelog.Debian \ No newline at end of file diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index 690fff7..7f70a04 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: webalizer-cn Section: web Priority: optional Maintainer: Dragan Dosen -Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7) +Standards-Version: 3.9.1 Package: webalizer-cn Architecture: all Pre-Depends: apache2-cn (>= 2.2) -Depends: webalizer (>= 2.01.10-32.4), makepasswd, carnet-tools-cn (>= 2.8.1), ${misc:Depends} -Description: web server log analysis program (CARNet configuration) +Depends: webalizer (>= 2.01.10-32.7), makepasswd, carnet-tools-cn (>= 3.0.0), ${misc:Depends} +Description: web server log analysis program The Webalizer was designed to scan web server log files in various formats and produce usage statistics in HTML format for viewing through a browser. The Webalizer produces yearly, monthly, daily and hourly statistics. In the @@ -19,6 +19,5 @@ Description: web server log analysis program (CARNet configuration) use of either command line options or a configuration file, allowing the program to be tailored to individual needs easily. . - Homepage: http://www.mrunix.net/webalizer/ - . This package provides CARNet configuration for Webalizer. +Homepage: http://www.mrunix.net/webalizer/ diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5350ae7 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,7 @@ +Copyright 2011 CARNet + +You are free to distribute this software package under the terms of the +GNU General Public License. + +On Debian systems, the complete text of the GNU General Public +License can be found in the file /usr/share/common-licenses/GPL. diff --git a/debian/docs b/debian/docs index 9f08072..8f6e250 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1 @@ -debian/README.CARNet -debian/changelog.CARNet \ No newline at end of file +README.CARNet diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..9826d46 --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1 @@ +webalizer-cn: latest-debian-changelog-entry-changed-to-native diff --git a/debian/postinst b/debian/postinst index c4fca82..6d76d60 100755 --- a/debian/postinst +++ b/debian/postinst @@ -5,23 +5,24 @@ set -e [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx case "$1" in - configure) - # continue below - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - exit 0 - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; + configure) + # continue below + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + exit 0 + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; esac # Load debconf . /usr/share/debconf/confmodule +db_version 2.0 # Include CARNet functions . /usr/share/carnet-tools/functions.sh @@ -37,30 +38,29 @@ reporttitle="Statistika pristupa za" if [ -f "$WCONF" ]; then - # Backup first. - if cp_check_and_backup "$WCONF"; then - cp_echo "CN: Old $WCONF saved as \"/var/backups/$WCONFBAK.bak\"." - fi - - # Check for OutputDir - temp=`awk 'tolower($1) == "outputdir" { print $2; }' $WCONF | tail -n 1` - if [ "$temp" != "$WDIR" ]; then - db_set webalizer/directory "$temp" || true - fi - - # Check for ReportTitle - temp=`awk 'tolower($1) == "reporttitle" { for(i=2; i/dev/null; then - - # Reload Apache2 web server. - if [ -x "/etc/init.d/apache2" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d apache2 reload || true - else - /etc/init.d/apache2 reload || true - fi - fi +if apache2ctl configtest 2>/dev/null; then + invoke-rc.d apache2 force-reload || true else - - # Something is broken. - cp_echo "CN: Your Apache2 configuration is broken." - cp_echo "CN: Please, check the service after the installation finishes!" + # Something is broken. + cp_echo "CN: Your Apache2 configuration is broken." + cp_echo "CN: Please, check the service after the installation finishes!" fi # Generate e-mail message with informations (username and password). # if [ ! -f "$WHTPASSWD" ]; then - passwd=`makepasswd --chars 8` - htpasswd -bcm $WHTPASSWD admin $passwd 2> /dev/null - cp_echo "" - cp_echo "CN: Webalizer URL is http://`hostname -f`/stats/" - cp_echo "CN: User: admin" - cp_echo "CN: Password: $passwd" - cp_echo "" - cp_echo "CN: Use \"htpasswd -m $WHTPASSWD admin\" to change it." + passwd="$(makepasswd --chars 8)" + htpasswd -bcm $WHTPASSWD admin $passwd 2> /dev/null + cp_echo "" + cp_echo "CN: Webalizer URL is http://`hostname -f`/stats/" + cp_echo "CN: User: admin" + cp_echo "CN: Password: $passwd" + cp_echo "" + cp_echo "CN: Use \"htpasswd -m $WHTPASSWD admin\" to change it." fi - # Mail root. # cp_mail "$PKG" +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + exit 0 diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index 7b80a4d..0000000 --- a/debian/prerm +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - remove|deconfigure) - ;; - - upgrade) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \$1'" >&2 - exit 0 - ;; -esac - -exit 0 diff --git a/debian/rules b/debian/rules index 6b308f3..cbe925d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,68 +1,3 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -#export DH_VERBOSE=1 - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_install -X.svn -# dh_installexamples -# dh_install -# dh_installmenu - dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link -# dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums -x - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ -- 1.7.10.4