From 1e70ff3fe998033fd93c8cd177082b8cd566d2ce Mon Sep 17 00:00:00 2001
From: Valentin Vidic <vvidic@carnet.hr>
Date: Wed, 9 Jan 2008 15:02:41 +0100
Subject: [PATCH] Reorganized files for packaging.
---
.../changelog.CARNet => debian/changelog | 6 ++
debian/compat | 1 +
debian/control | 16 ++++
debian/dirs | 2 +
debian/docs | 1 +
debian/install | 1 +
debian/links | 2 +
debian/postinst | 41 ++++++++++
debian/postrm | 39 ++++++++++
debian/rules | 79 ++++++++++++++++++++
debian/templates | 9 +++
{usr/share/doc/carnet-upgrade => doc}/NEWS.CARNet | 0
.../share/doc/carnet-upgrade => doc}/README.CARNet | 0
.../doc/carnet-upgrade => doc}/carnet-upgrade.pdf | Bin 558796 -> 558796 bytes
.../share/carnet-upgrade => src}/actions/apt.queue | 0
.../carnet-upgrade => src}/actions/main.queue | 0
.../share/carnet-upgrade => src}/actions/new.queue | 0
.../actions/post_upgrade.queue | 0
.../carnet-upgrade => src}/actions/upgrade.queue | 0
{usr/share/carnet-upgrade => src}/cn-upgrade | 0
{usr/share/carnet-upgrade => src}/data.sh | 0
.../files/etc/apt/sources.list | 0
.../files/etc/bind/named.conf.options | 0
.../files/etc/default/ntpdate | 0
.../files/etc/default/oidentd | 0
.../files/etc/default/postgrey | 0
.../files/etc/default/saslauthd | 0
.../carnet-upgrade => src}/files/etc/default/slapd | 0
.../files/etc/dovecot/dovecot.conf | 0
.../carnet-upgrade => src}/files/etc/init.d/mysql | 0
.../carnet-upgrade => src}/files/etc/init.d/slapd | 0
{usr/share/carnet-upgrade => src}/files/etc/issue | 0
.../carnet-upgrade => src}/files/etc/issue.net | 0
.../files/etc/logrotate.d/mysql-server | 0
.../carnet-upgrade => src}/files/etc/mysql/my.cnf | 0
.../carnet-upgrade => src}/files/etc/ntp.conf | 0
.../carnet-upgrade => src}/files/etc/pam.d/login | 0
.../files/etc/php4/apache/php.ini | 0
.../files/etc/php4/cgi/php.ini | 0
.../files/etc/php4/cli/php.ini | 0
.../files/etc/postgrey/whitelist_clients | 0
.../files/etc/security/limits.conf | 0
.../files/etc/squirrelmail/apache.conf | 0
.../carnet-upgrade => src}/files/etc/sysctl.conf | 0
.../carnet-upgrade => src}/files/etc/vsftpd.conf | 0
.../carnet-upgrade => src}/files/etc/xinetd.conf | 0
{usr/share/carnet-upgrade => src}/functions.sh | 3 -
{usr/share/carnet-upgrade => src}/messages.sh | 0
.../carnet-upgrade => src}/scripts/check_services | 0
.../scripts/debconf_priority | 0
usr/sbin/carnet-upgrade | 1 -
usr/sbin/cn-upgrade | 1 -
52 files changed, 197 insertions(+), 5 deletions(-)
rename usr/share/doc/carnet-upgrade/changelog.CARNet => debian/changelog (95%)
create mode 100644 debian/compat
create mode 100644 debian/control
create mode 100644 debian/dirs
create mode 100644 debian/docs
create mode 100644 debian/install
create mode 100644 debian/links
create mode 100644 debian/postinst
create mode 100644 debian/postrm
create mode 100755 debian/rules
create mode 100644 debian/templates
rename {usr/share/doc/carnet-upgrade => doc}/NEWS.CARNet (100%)
rename {usr/share/doc/carnet-upgrade => doc}/README.CARNet (100%)
rename {usr/share/doc/carnet-upgrade => doc}/carnet-upgrade.pdf (100%)
rename {usr/share/carnet-upgrade => src}/actions/apt.queue (100%)
rename {usr/share/carnet-upgrade => src}/actions/main.queue (100%)
rename {usr/share/carnet-upgrade => src}/actions/new.queue (100%)
rename {usr/share/carnet-upgrade => src}/actions/post_upgrade.queue (100%)
rename {usr/share/carnet-upgrade => src}/actions/upgrade.queue (100%)
rename {usr/share/carnet-upgrade => src}/cn-upgrade (100%)
rename {usr/share/carnet-upgrade => src}/data.sh (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/apt/sources.list (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/bind/named.conf.options (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/default/ntpdate (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/default/oidentd (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/default/postgrey (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/default/saslauthd (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/default/slapd (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/dovecot/dovecot.conf (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/init.d/mysql (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/init.d/slapd (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/issue (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/issue.net (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/logrotate.d/mysql-server (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/mysql/my.cnf (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/ntp.conf (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/pam.d/login (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/php4/apache/php.ini (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/php4/cgi/php.ini (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/php4/cli/php.ini (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/postgrey/whitelist_clients (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/security/limits.conf (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/squirrelmail/apache.conf (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/sysctl.conf (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/vsftpd.conf (100%)
rename {usr/share/carnet-upgrade => src}/files/etc/xinetd.conf (100%)
rename {usr/share/carnet-upgrade => src}/functions.sh (99%)
rename {usr/share/carnet-upgrade => src}/messages.sh (100%)
rename {usr/share/carnet-upgrade => src}/scripts/check_services (100%)
rename {usr/share/carnet-upgrade => src}/scripts/debconf_priority (100%)
delete mode 120000 usr/sbin/carnet-upgrade
delete mode 120000 usr/sbin/cn-upgrade
diff --git a/usr/share/doc/carnet-upgrade/changelog.CARNet b/debian/changelog
similarity index 95%
rename from usr/share/doc/carnet-upgrade/changelog.CARNet
rename to debian/changelog
index 0fd1a96..4d41606 100644
--- a/usr/share/doc/carnet-upgrade/changelog.CARNet
+++ b/debian/changelog
@@ -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
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..4671f9c
--- /dev/null
+++ b/debian/control
@@ -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
index 0000000..0489df1
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+usr/sbin
+var/lib/carnet-upgrade
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..30d29de
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+doc/*
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..46e30ae
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+src/* usr/share/carnet-upgrade/
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..0b4576d
--- /dev/null
+++ b/debian/links
@@ -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
index 0000000..b182185
--- /dev/null
+++ b/debian/postinst
@@ -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
index 0000000..eaf2e65
--- /dev/null
+++ b/debian/postrm
@@ -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
index 0000000..19795a6
--- /dev/null
+++ b/debian/rules
@@ -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
index 0000000..b48f309
--- /dev/null
+++ b/debian/templates
@@ -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
diff --git a/usr/share/doc/carnet-upgrade/NEWS.CARNet b/doc/NEWS.CARNet
similarity index 100%
rename from usr/share/doc/carnet-upgrade/NEWS.CARNet
rename to doc/NEWS.CARNet
diff --git a/usr/share/doc/carnet-upgrade/README.CARNet b/doc/README.CARNet
similarity index 100%
rename from usr/share/doc/carnet-upgrade/README.CARNet
rename to doc/README.CARNet
diff --git a/usr/share/doc/carnet-upgrade/carnet-upgrade.pdf b/doc/carnet-upgrade.pdf
similarity index 100%
rename from usr/share/doc/carnet-upgrade/carnet-upgrade.pdf
rename to doc/carnet-upgrade.pdf
diff --git a/usr/share/carnet-upgrade/actions/apt.queue b/src/actions/apt.queue
similarity index 100%
rename from usr/share/carnet-upgrade/actions/apt.queue
rename to src/actions/apt.queue
diff --git a/usr/share/carnet-upgrade/actions/main.queue b/src/actions/main.queue
similarity index 100%
rename from usr/share/carnet-upgrade/actions/main.queue
rename to src/actions/main.queue
diff --git a/usr/share/carnet-upgrade/actions/new.queue b/src/actions/new.queue
similarity index 100%
rename from usr/share/carnet-upgrade/actions/new.queue
rename to src/actions/new.queue
diff --git a/usr/share/carnet-upgrade/actions/post_upgrade.queue b/src/actions/post_upgrade.queue
similarity index 100%
rename from usr/share/carnet-upgrade/actions/post_upgrade.queue
rename to src/actions/post_upgrade.queue
diff --git a/usr/share/carnet-upgrade/actions/upgrade.queue b/src/actions/upgrade.queue
similarity index 100%
rename from usr/share/carnet-upgrade/actions/upgrade.queue
rename to src/actions/upgrade.queue
diff --git a/usr/share/carnet-upgrade/cn-upgrade b/src/cn-upgrade
similarity index 100%
rename from usr/share/carnet-upgrade/cn-upgrade
rename to src/cn-upgrade
diff --git a/usr/share/carnet-upgrade/data.sh b/src/data.sh
similarity index 100%
rename from usr/share/carnet-upgrade/data.sh
rename to src/data.sh
diff --git a/usr/share/carnet-upgrade/files/etc/apt/sources.list b/src/files/etc/apt/sources.list
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/apt/sources.list
rename to src/files/etc/apt/sources.list
diff --git a/usr/share/carnet-upgrade/files/etc/bind/named.conf.options b/src/files/etc/bind/named.conf.options
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/bind/named.conf.options
rename to src/files/etc/bind/named.conf.options
diff --git a/usr/share/carnet-upgrade/files/etc/default/ntpdate b/src/files/etc/default/ntpdate
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/default/ntpdate
rename to src/files/etc/default/ntpdate
diff --git a/usr/share/carnet-upgrade/files/etc/default/oidentd b/src/files/etc/default/oidentd
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/default/oidentd
rename to src/files/etc/default/oidentd
diff --git a/usr/share/carnet-upgrade/files/etc/default/postgrey b/src/files/etc/default/postgrey
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/default/postgrey
rename to src/files/etc/default/postgrey
diff --git a/usr/share/carnet-upgrade/files/etc/default/saslauthd b/src/files/etc/default/saslauthd
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/default/saslauthd
rename to src/files/etc/default/saslauthd
diff --git a/usr/share/carnet-upgrade/files/etc/default/slapd b/src/files/etc/default/slapd
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/default/slapd
rename to src/files/etc/default/slapd
diff --git a/usr/share/carnet-upgrade/files/etc/dovecot/dovecot.conf b/src/files/etc/dovecot/dovecot.conf
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/dovecot/dovecot.conf
rename to src/files/etc/dovecot/dovecot.conf
diff --git a/usr/share/carnet-upgrade/files/etc/init.d/mysql b/src/files/etc/init.d/mysql
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/init.d/mysql
rename to src/files/etc/init.d/mysql
diff --git a/usr/share/carnet-upgrade/files/etc/init.d/slapd b/src/files/etc/init.d/slapd
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/init.d/slapd
rename to src/files/etc/init.d/slapd
diff --git a/usr/share/carnet-upgrade/files/etc/issue b/src/files/etc/issue
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/issue
rename to src/files/etc/issue
diff --git a/usr/share/carnet-upgrade/files/etc/issue.net b/src/files/etc/issue.net
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/issue.net
rename to src/files/etc/issue.net
diff --git a/usr/share/carnet-upgrade/files/etc/logrotate.d/mysql-server b/src/files/etc/logrotate.d/mysql-server
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/logrotate.d/mysql-server
rename to src/files/etc/logrotate.d/mysql-server
diff --git a/usr/share/carnet-upgrade/files/etc/mysql/my.cnf b/src/files/etc/mysql/my.cnf
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/mysql/my.cnf
rename to src/files/etc/mysql/my.cnf
diff --git a/usr/share/carnet-upgrade/files/etc/ntp.conf b/src/files/etc/ntp.conf
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/ntp.conf
rename to src/files/etc/ntp.conf
diff --git a/usr/share/carnet-upgrade/files/etc/pam.d/login b/src/files/etc/pam.d/login
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/pam.d/login
rename to src/files/etc/pam.d/login
diff --git a/usr/share/carnet-upgrade/files/etc/php4/apache/php.ini b/src/files/etc/php4/apache/php.ini
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/php4/apache/php.ini
rename to src/files/etc/php4/apache/php.ini
diff --git a/usr/share/carnet-upgrade/files/etc/php4/cgi/php.ini b/src/files/etc/php4/cgi/php.ini
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/php4/cgi/php.ini
rename to src/files/etc/php4/cgi/php.ini
diff --git a/usr/share/carnet-upgrade/files/etc/php4/cli/php.ini b/src/files/etc/php4/cli/php.ini
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/php4/cli/php.ini
rename to src/files/etc/php4/cli/php.ini
diff --git a/usr/share/carnet-upgrade/files/etc/postgrey/whitelist_clients b/src/files/etc/postgrey/whitelist_clients
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/postgrey/whitelist_clients
rename to src/files/etc/postgrey/whitelist_clients
diff --git a/usr/share/carnet-upgrade/files/etc/security/limits.conf b/src/files/etc/security/limits.conf
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/security/limits.conf
rename to src/files/etc/security/limits.conf
diff --git a/usr/share/carnet-upgrade/files/etc/squirrelmail/apache.conf b/src/files/etc/squirrelmail/apache.conf
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/squirrelmail/apache.conf
rename to src/files/etc/squirrelmail/apache.conf
diff --git a/usr/share/carnet-upgrade/files/etc/sysctl.conf b/src/files/etc/sysctl.conf
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/sysctl.conf
rename to src/files/etc/sysctl.conf
diff --git a/usr/share/carnet-upgrade/files/etc/vsftpd.conf b/src/files/etc/vsftpd.conf
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/vsftpd.conf
rename to src/files/etc/vsftpd.conf
diff --git a/usr/share/carnet-upgrade/files/etc/xinetd.conf b/src/files/etc/xinetd.conf
similarity index 100%
rename from usr/share/carnet-upgrade/files/etc/xinetd.conf
rename to src/files/etc/xinetd.conf
diff --git a/usr/share/carnet-upgrade/functions.sh b/src/functions.sh
similarity index 99%
rename from usr/share/carnet-upgrade/functions.sh
rename to src/functions.sh
index 5de5d43..63557fe 100644
--- a/usr/share/carnet-upgrade/functions.sh
+++ b/src/functions.sh
@@ -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/share/carnet-upgrade/messages.sh b/src/messages.sh
similarity index 100%
rename from usr/share/carnet-upgrade/messages.sh
rename to src/messages.sh
diff --git a/usr/share/carnet-upgrade/scripts/check_services b/src/scripts/check_services
similarity index 100%
rename from usr/share/carnet-upgrade/scripts/check_services
rename to src/scripts/check_services
diff --git a/usr/share/carnet-upgrade/scripts/debconf_priority b/src/scripts/debconf_priority
similarity index 100%
rename from usr/share/carnet-upgrade/scripts/debconf_priority
rename to src/scripts/debconf_priority
diff --git a/usr/sbin/carnet-upgrade b/usr/sbin/carnet-upgrade
deleted file mode 120000
index ba02462..0000000
--- a/usr/sbin/carnet-upgrade
+++ /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
index 15495f9..0000000
--- a/usr/sbin/cn-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-carnet-upgrade
\ No newline at end of file
--
1.7.10.4