From 9cbac56d380e7470d5a6755e0574c18e89c92b38 Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Fri, 22 Apr 2011 13:17:02 +0200 Subject: [PATCH] novi debian/rules i debian/copyright --- changelog.CARNet | 1 - debian/copyright | 6 ++-- debian/prerm | 8 +++-- debian/rules | 87 ++---------------------------------------------------- 4 files changed, 10 insertions(+), 92 deletions(-) delete mode 120000 changelog.CARNet diff --git a/changelog.CARNet b/changelog.CARNet deleted file mode 120000 index 194579e..0000000 --- a/changelog.CARNet +++ /dev/null @@ -1 +0,0 @@ -changelog.Debian \ No newline at end of file diff --git a/debian/copyright b/debian/copyright index e3933e7..28add9f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ -This package is copyright (c) by CARNet . +Copyright 2006 CARNet -You are free to distribute this software under the terms of -the GNU General Public License. +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/prerm b/debian/prerm index b9fd834..755acfd 100755 --- a/debian/prerm +++ b/debian/prerm @@ -4,7 +4,9 @@ set -e [ "$1" = "remove" ] || exit 0 -# restartat apache -if [ -x /etc/init.d/apache2 ]; then - /etc/init.d/apache2 reload || true +# reload apache2 +if [ -x /usr/sbin/invoke-rc.d ]; then + [ -x /etc/init.d/apache2 ] && invoke-rc.d apache2 reload +else + [ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 reload fi diff --git a/debian/rules b/debian/rules index 11a4d30..cbe925d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,86 +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. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -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) - - 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/mailman-cn. - # $(MAKE) install DESTDIR=$(CURDIR)/debian/mailman-cn - - -# 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_installchangelogs -k - dh_installdocs -# 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 - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ -- 1.7.10.4