From 79acdcde24a0141ab9abc62430d25a8071d1b688 Mon Sep 17 00:00:00 2001
From: Dinko Korunic <kreator@carnet.hr>
Date: Sun, 24 Apr 2011 16:14:17 +0200
Subject: [PATCH] - lintian fixevi - update za Squeeze - brisanje
changelog.carnet, dodavanje copyrighta..
---
README.CARNet | 2 +-
changelog.CARNet | 1 -
debian/changelog | 15 +++++++++++
debian/compat | 2 +-
debian/control | 6 ++---
debian/copyright | 7 ++++++
debian/docs | 1 -
debian/postinst | 2 +-
debian/rules | 74 ++----------------------------------------------------
9 files changed, 30 insertions(+), 80 deletions(-)
delete mode 120000 changelog.CARNet
create mode 100644 debian/copyright
diff --git a/README.CARNet b/README.CARNet
index 98b6273..21f111b 100644
--- a/README.CARNet
+++ b/README.CARNet
@@ -5,4 +5,4 @@ Zabranjen je anonimni FTP pristup. Proftp-cn generira SSL certifikat ftpd,
ukoliko certifikat vec ne postoji; a tipicno se omogucava i FTP-TLS
pristup.
- -- Dinko Korunic <kreator@CARNet.hr> Mon, 13 Apr 2009 17:49:05 +0200
+ -- Dinko Korunic <kreator@CARNet.hr> Sun, 24 Apr 2011 16:13:36 +0200
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/changelog b/debian/changelog
index 659804d..e9e1b4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+proftpd-cn (2:1.3.3) stable; urgency=low
+
+ * lintian fixevi
+ * copyright
+
+ -- Dinko Korunic <kreator@carnet.hr> Sun, 24 Apr 2011 16:13:17 +0200
+
+proftpd-cn (2:1.3.2) stable; urgency=low
+
+ * prelazak na native verziju
+ * lintian fixevi
+ * update za Squeeze
+
+ -- Dinko Korunic <kreator@carnet.hr> Sun, 23 Apr 2011 16:12:41 +0200
+
proftpd-cn (2:1.3.1-2) stable; urgency=low
* minorni depend fix
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 2edfcce..ff4139d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: proftpd-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: proftpd-cn
Architecture: all
-Depends: proftpd (>= 1.3.1-17lenny2), openssl (>= 0.9.8g-15), carnet-tools-cn (>= 2.8.1), debconf (>= 0.5) | debconf-2.0
+Depends: proftpd-basic (>= 1.3.3a-6squeeze1), openssl (>= 0.9.8o-4squeeze1), carnet-tools-cn (>= 2.8.1), debconf (>= 1.5.36.1) | debconf-2.0, ${misc:Depends}
Description: Versatile, virtual-hosting FTP daemon
A powerful replacement for wu-ftpd, this File Transfer Protocol
daemon supports hidden directories, virtual hosts, and per-directory
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 ef5ce6c..8f6e250 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-changelog.CARNet
README.CARNet
diff --git a/debian/postinst b/debian/postinst
index d1222fe..88acdbe 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -29,7 +29,7 @@ esac
# created: 2002-11-15 Bozo Juretic <bjuretic@srce.hr>
# last update: 2007-05-14 Zoran Dzelajlija <zoran.dzelajlija@carnet.hr>
-# last update: 2007-10-27 Dinko Korunic <kreator@carnet.hr>
+# last update: 2011-04-24 Dinko Korunic <kreator@carnet.hr>
# Source debconf library.
. /usr/share/debconf/confmodule
diff --git a/debian/rules b/debian/rules
index 4e3c6e9..cbe925d 100755
--- 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 $@
--
1.7.10.4