Reorganized files for packaging.
authorValentin Vidic <vvidic@carnet.hr>
Wed, 9 Jan 2008 14:02:41 +0000 (15:02 +0100)
committerValentin Vidic <vvidic@carnet.hr>
Wed, 9 Jan 2008 14:02:41 +0000 (15:02 +0100)
52 files changed:
debian/changelog [moved from usr/share/doc/carnet-upgrade/changelog.CARNet with 95% similarity]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/dirs [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/install [new file with mode: 0644]
debian/links [new file with mode: 0644]
debian/postinst [new file with mode: 0644]
debian/postrm [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/templates [new file with mode: 0644]
doc/NEWS.CARNet [moved from usr/share/doc/carnet-upgrade/NEWS.CARNet with 100% similarity]
doc/README.CARNet [moved from usr/share/doc/carnet-upgrade/README.CARNet with 100% similarity]
doc/carnet-upgrade.pdf [moved from usr/share/doc/carnet-upgrade/carnet-upgrade.pdf with 100% similarity]
src/actions/apt.queue [moved from usr/share/carnet-upgrade/actions/apt.queue with 100% similarity]
src/actions/main.queue [moved from usr/share/carnet-upgrade/actions/main.queue with 100% similarity]
src/actions/new.queue [moved from usr/share/carnet-upgrade/actions/new.queue with 100% similarity]
src/actions/post_upgrade.queue [moved from usr/share/carnet-upgrade/actions/post_upgrade.queue with 100% similarity]
src/actions/upgrade.queue [moved from usr/share/carnet-upgrade/actions/upgrade.queue with 100% similarity]
src/cn-upgrade [moved from usr/share/carnet-upgrade/cn-upgrade with 100% similarity]
src/data.sh [moved from usr/share/carnet-upgrade/data.sh with 100% similarity]
src/files/etc/apt/sources.list [moved from usr/share/carnet-upgrade/files/etc/apt/sources.list with 100% similarity]
src/files/etc/bind/named.conf.options [moved from usr/share/carnet-upgrade/files/etc/bind/named.conf.options with 100% similarity]
src/files/etc/default/ntpdate [moved from usr/share/carnet-upgrade/files/etc/default/ntpdate with 100% similarity]
src/files/etc/default/oidentd [moved from usr/share/carnet-upgrade/files/etc/default/oidentd with 100% similarity]
src/files/etc/default/postgrey [moved from usr/share/carnet-upgrade/files/etc/default/postgrey with 100% similarity]
src/files/etc/default/saslauthd [moved from usr/share/carnet-upgrade/files/etc/default/saslauthd with 100% similarity]
src/files/etc/default/slapd [moved from usr/share/carnet-upgrade/files/etc/default/slapd with 100% similarity]
src/files/etc/dovecot/dovecot.conf [moved from usr/share/carnet-upgrade/files/etc/dovecot/dovecot.conf with 100% similarity]
src/files/etc/init.d/mysql [moved from usr/share/carnet-upgrade/files/etc/init.d/mysql with 100% similarity]
src/files/etc/init.d/slapd [moved from usr/share/carnet-upgrade/files/etc/init.d/slapd with 100% similarity]
src/files/etc/issue [moved from usr/share/carnet-upgrade/files/etc/issue with 100% similarity]
src/files/etc/issue.net [moved from usr/share/carnet-upgrade/files/etc/issue.net with 100% similarity]
src/files/etc/logrotate.d/mysql-server [moved from usr/share/carnet-upgrade/files/etc/logrotate.d/mysql-server with 100% similarity]
src/files/etc/mysql/my.cnf [moved from usr/share/carnet-upgrade/files/etc/mysql/my.cnf with 100% similarity]
src/files/etc/ntp.conf [moved from usr/share/carnet-upgrade/files/etc/ntp.conf with 100% similarity]
src/files/etc/pam.d/login [moved from usr/share/carnet-upgrade/files/etc/pam.d/login with 100% similarity]
src/files/etc/php4/apache/php.ini [moved from usr/share/carnet-upgrade/files/etc/php4/apache/php.ini with 100% similarity]
src/files/etc/php4/cgi/php.ini [moved from usr/share/carnet-upgrade/files/etc/php4/cgi/php.ini with 100% similarity]
src/files/etc/php4/cli/php.ini [moved from usr/share/carnet-upgrade/files/etc/php4/cli/php.ini with 100% similarity]
src/files/etc/postgrey/whitelist_clients [moved from usr/share/carnet-upgrade/files/etc/postgrey/whitelist_clients with 100% similarity]
src/files/etc/security/limits.conf [moved from usr/share/carnet-upgrade/files/etc/security/limits.conf with 100% similarity]
src/files/etc/squirrelmail/apache.conf [moved from usr/share/carnet-upgrade/files/etc/squirrelmail/apache.conf with 100% similarity]
src/files/etc/sysctl.conf [moved from usr/share/carnet-upgrade/files/etc/sysctl.conf with 100% similarity]
src/files/etc/vsftpd.conf [moved from usr/share/carnet-upgrade/files/etc/vsftpd.conf with 100% similarity]
src/files/etc/xinetd.conf [moved from usr/share/carnet-upgrade/files/etc/xinetd.conf with 100% similarity]
src/functions.sh [moved from usr/share/carnet-upgrade/functions.sh with 99% similarity]
src/messages.sh [moved from usr/share/carnet-upgrade/messages.sh with 100% similarity]
src/scripts/check_services [moved from usr/share/carnet-upgrade/scripts/check_services with 100% similarity]
src/scripts/debconf_priority [moved from usr/share/carnet-upgrade/scripts/debconf_priority with 100% similarity]
usr/sbin/carnet-upgrade [deleted symlink]
usr/sbin/cn-upgrade [deleted symlink]

similarity index 95%
rename from usr/share/doc/carnet-upgrade/changelog.CARNet
rename to debian/changelog
index 0fd1a96..4d41606 100644 (file)
@@ -1,3 +1,9 @@
+carnet-upgrade (4.0.0) etch; urgency=low
+
+  * Sarge->Etch verzija upgrade skripti.
+
+ -- Valentin Vidic <vvidic@carnet.hr>  Tue, 08 Jan 2008 17:53:39 +0100
+
 carnet-upgrade (2.1.8) woody sarge; urgency=low
 
   * Promjenjena verzija freeradiusa u 1.0.5-0
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..4671f9c
--- /dev/null
@@ -0,0 +1,16 @@
+Source: carnet-upgrade
+Section: carnet
+Priority: extra
+Maintainer: Valentin Vidic <vvidic@carnet.hr>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
+
+Package: carnet-upgrade
+Architecture: all
+Depends: ${misc:Depends}
+Description: CARNet distribution upgrade script
+ This package provides cn-upgrade, a helper script
+ to facilitate upgrades between different versions
+ of CARNet Debian Linux distributions, by resolving
+ various issues that keep apt-get dist-upgrade from
+ working correctly and fixing local configuration.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..0489df1
--- /dev/null
@@ -0,0 +1,2 @@
+usr/sbin
+var/lib/carnet-upgrade
diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..30d29de
--- /dev/null
@@ -0,0 +1 @@
+doc/*
diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..46e30ae
--- /dev/null
@@ -0,0 +1 @@
+src/* usr/share/carnet-upgrade/
diff --git a/debian/links b/debian/links
new file mode 100644 (file)
index 0000000..0b4576d
--- /dev/null
@@ -0,0 +1,2 @@
+usr/share/carnet-upgrade/cn-upgrade usr/sbin/cn-upgrade
+usr/sbin/cn-upgrade usr/sbin/carnet-upgrade
diff --git a/debian/postinst b/debian/postinst
new file mode 100644 (file)
index 0000000..b182185
--- /dev/null
@@ -0,0 +1,41 @@
+#!/bin/sh
+# postinst script for carnet-upgrade
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/postrm b/debian/postrm
new file mode 100644 (file)
index 0000000..eaf2e65
--- /dev/null
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postrm script for carnet-upgrade
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..19795a6
--- /dev/null
@@ -0,0 +1,79 @@
+#!/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
+
+build: build-stamp
+
+build-stamp:
+       dh_testdir
+
+       # Add here commands to compile the package.
+       #$(MAKE)
+       #docbook-to-man debian/carnet-upgrade.sgml > carnet-upgrade.1
+
+       touch $@
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-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/carnet-upgrade.
+       #$(MAKE) DESTDIR=$(CURDIR)/debian/carnet-upgrade install
+
+
+# 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 
+       dh_installdocs
+       dh_installexamples
+       dh_install
+#      dh_installmenu
+       dh_installdebconf       
+#      dh_installlogrotate
+#      dh_installemacsen
+#      dh_installpam
+#      dh_installmime
+#      dh_python
+#      dh_installinit
+#      dh_installcron
+#      dh_installinfo
+       dh_installman
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+#      dh_perl
+#      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
diff --git a/debian/templates b/debian/templates
new file mode 100644 (file)
index 0000000..b48f309
--- /dev/null
@@ -0,0 +1,9 @@
+Template: cn-upgrade/debconf-priority
+Type: string
+Description: Backup of debconf/priority
+ Backup of debconf/priority
+
+Template: cn-upgrade/check-services
+Type: string
+Description: Check services
+ Check services
similarity index 100%
rename from usr/share/carnet-upgrade/data.sh
rename to src/data.sh
similarity index 99%
rename from usr/share/carnet-upgrade/functions.sh
rename to src/functions.sh
index 5de5d43..63557fe 100644 (file)
@@ -476,10 +476,7 @@ upgrade_apache () {
      /var/cache/apt/archives/apache2-cn_* \
      /var/cache/apt/archives/php4-cn_*
 
-  export CARNET_SCRIPT_DEBUG=1
   pkgadd aosi-aai aosi-www-aai # squirrelmail-cn
-  unset  CARNET_SCRIPT_DEBUG
-  
 }
 
 upgrade_amavis () {
diff --git a/usr/sbin/carnet-upgrade b/usr/sbin/carnet-upgrade
deleted file mode 120000 (symlink)
index ba02462..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../share/carnet-upgrade/cn-upgrade
\ No newline at end of file
diff --git a/usr/sbin/cn-upgrade b/usr/sbin/cn-upgrade
deleted file mode 120000 (symlink)
index 15495f9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-carnet-upgrade
\ No newline at end of file