- update za Squeeze

- misc Lintian fixevi

diff --git a/README.CARNet b/README.CARNet
index ee33758..9e6ae46 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -4,4 +4,4 @@ munin--cn
 Paket donosi neke (minimalne) rekonfiguracije za uskladjivanje sa ostalim
 CARNet paketima i distribucijom.
 
- -- Dinko Korunic <kreator@CARNet.hr>  Mon, 13 Apr 2009 10:56:15 +0200
+ -- Dinko Korunic <kreator@CARNet.hr>  Sun, 24 Apr 2011 17:31:29 +0200

diff --git a/changelog.CARNet b/changelog.CARNet
deleted file mode 120000 (symlink)
index 194579e..0000000
--- a/changelog.CARNet
+++ /dev/null
@@ -1 +0,0 @@
-changelog.Debian
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index caa862c..f462bd6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+munin-cn (1.4.5) stable; urgency=low
+
+  * misc lintian fixevi
+
+ -- Dinko Korunic <kreator@carnet.hr>  Sun, 24 Apr 2011 17:33:26 +0200
+
+munin-cn (1.4.4) stable; urgency=low
+
+  * update paketa za Squeeze
+
+ -- Dinko Korunic <kreator@carnet.hr>  Sun, 22 Apr 2011 17:33:26 +0200
+
 munin-cn (1.2.6-1) stable; urgency=low
 
   * Update paketa za Lenny

diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 5c2a5c1..c2b10d3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: munin-cn
 Section: net
 Priority: optional
 Maintainer: Dinko Korunic <kreator@CARNet.hr>
-Build-Depends: debhelper (>= 4)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.9.1
 
 Package: munin-cn
 Architecture: all
-Depends: munin (>= 1.2.6-10~lenny1), munin-node (>= 1.2.6-10~lenny1)
+Depends: munin (>= 1.4.5-3), munin-node (>= 1.4.5-3), ${misc:Depends}
 Description: network-wide graphing framework (grapher/gatherer)
  Munin is a highly flexible and powerful solution used to create graphs of
  virtually everything imaginable throughout your network, while still

diff --git a/debian/copyright b/debian/copyright
index 46d11ef..5350ae7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,7 @@
-Copyright:
+Copyright 2011 CARNet 
 
-   Copyright (C) 2009  Dinko Korunic, CARNet, Grupa za izradu paketa
+You are free to distribute this software package under the terms of the
+GNU General Public License.
 
-   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, version 2.
-
-   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, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-
-On Debian GNU systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL-2'.
+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 ef5ce6c..8f6e250 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-changelog.CARNet
 README.CARNet

diff --git a/debian/rules b/debian/rules
index ec73f03..cbe925d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,73 +1,3 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# This file is public domain software, originally written by Joey Hess.
-#
-# This version is for packages that are architecture independent.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-
-       # Add here commands to compile the package.
-       #$(MAKE)
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       # Add here commands to clean up after the build process.
-       #-$(MAKE) clean
-       #-$(MAKE) distclean
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       # Add here commands to install the package into debian/<packagename>.
-       #$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
-
-# Build architecture-independent files here.
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-#      dh_installexamples
-#      dh_installmenu
-#      dh_installdebconf
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installcatalogs
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-#      dh_undocumented
-       dh_installman
-       dh_link
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_python
-       dh_installdeb
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+       dh $@