Changeset d05ea7208ff75842bc3c2c4af52a2bdba13e103e

Timestamp:

06/09/09 11:24:50 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

7426d5e4dbbc7360eb762fb28416bd7b122174d5

Parents:

3934ce0e5b4bcce1d38ddb9556b4665e9ec95505

git-committer:

Neutron Soutmun <neo.neutron@…> (06/09/09 11:24:50)

Message:

New upstream release

• With IFB for IMQ replacement.
• Tool scripts and daemon executable installed in appropriate place.
• The example config files (rahunas.conf, 01_rahunas-vserver.conf) installing by ucf.

Location:

debian

Files:

• changelog (modified) (1 diff)
• control (modified) (2 diffs)
• patches/series (deleted)
• rahunas.docs (modified) (1 diff)
• rahunas.init (modified) (5 diffs)
• rahunas.postinst (modified) (1 diff)
• rahunas.postrm (modified) (1 diff)
• rules (modified) (4 diffs)

debian/changelog

@@ +1 @@
+rahunas (0.1.4-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/rahunas.init: Update to follow the new changes in new release.
+  * debian/control: 
+    - Add sqlite3 as depends, it needed by the rahunas-weblogin-config-update.
+    - Now freeradius only suggests not depends for rahunas-weblogin.
+    - Remove quilt.
+  * debian/rules: 
+    - Remove unnecessary quilt patch system.
+    - Remove tool scripts install, upstream added.
+
+ -- Neutron Soutmun <neo.neutron@gmail.com>  Tue, 09 Jun 2009 10:34:20 +0700
+
 rahunas (0.1.3.b3-1) unstable; urgency=low
 

debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Neutron Soutmun <neo.neutron@gmail.com>
-Build-Depends: quilt, debhelper (>= 7), autotools-dev, autoconf, automake,
+Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake,
  libgnet-dev (>= 2.0.8), libgda3-dev (>= 3.0.2)
 Standards-Version: 3.8.1
-Homepage: http://neutron.debianclub.com/rahunas
+Homepage: http://www.rahunas.org
 
 Package: rahunas
 Architecture: any
 Depends: libgnet2.0-0 (>= 2.0.8), libgda3-sqlite (>= 3.0.2), iptables, ipset, 
- iproute, bridge-utils, ucf (>= 0.28), ${shlibs:Depends}, ${misc:Depends}
+ iproute, bridge-utils, ucf (>= 0.28), sqlite3 (>= 3.5.9), 
+ ${shlibs:Depends}, ${misc:Depends}
 Suggests: rahunas-config
 Description: Network Access Server based on IP Sets
@@ -34 +35 @@
 Package: rahunas-weblogin
 Architecture: all
-Depends: rahunas, freeradius, php5, php5-radius, 
- php5-xmlrpc, php5-curl, php-pear, ucf (>= 0.28), ${misc:Depends}
+Depends: rahunas, php5, php5-radius, php5-xmlrpc, php5-curl, php-pear, 
+ ucf (>= 0.28), ${misc:Depends}
+Suggests: freeradius (>= 2.0.4)
 Description: Web base login for RahuNAS
  The web base login writen in PHP with the multilingual (English and Thai)

debian/rahunas.docs

@@ -2 +2 @@
 README
 TODO
+example/rahunas.conf
+example/rahunas-vserver.conf

debian/rahunas.init

@@ -17 +17 @@
 exec_prefix=${prefix}
 
-DAEMON=${exec_prefix}/bin/rahunasd
+DAEMON=${exec_prefix}/sbin/rahunasd
 INIT=/etc/default/rahunas
-FIREWALL=/etc/rahunas/firewall.sh
-WEBLOGIN_CONFIG=/etc/rahunas/weblogin-config-update.sh
+FIREWALL=${exec_prefix}/sbin/rahunas-firewall
+WEBLOGIN_CONFIG=${exec_prefix}/sbin/rahunas-weblogin-config-update
 NAME=rahunasd
-DESC="RahuNAS - Rahu Network Access Server"
+DESC="Rahu Network Access Server"
 
 
@@ -91 +91 @@
 case "$1" in
   start)
-    log_daemon_msg "Starting $DESC" "$NAME"
-  
     if [ "$RUN_DAEMON" = "yes" ]; then
+      log_daemon_msg "Starting $DESC" "$NAME"
       if start ; then
         log_end_msg $?
@@ -100 +99 @@
       fi
     else
-      log_end_msg "disabled, to enable see $INIT"
+      log_action_msg "Not starting $DESC, as specified in $INIT"
     fi
     ;;
@@ -113 +112 @@
     ;;
   restart)
-    log_daemon_msg "Restarting $DESC" "$NAME"
-    stop || true
-
     if [ "$RUN_DAEMON" = "yes" ]; then
+      log_daemon_msg "Restarting $DESC" "$NAME"
+      stop || true
       if start ; then
         log_end_msg $?
@@ -123 +121 @@
       fi
     else
-      log_end_msg "disabled, to enable see $INIT"
+      log_action_msg "Not restarting $DESC, as specified in $INIT"
     fi
     ;;

debian/rahunas.postinst

@@ -14 +14 @@
 
 ucf /usr/share/doc/rahunas/rahunas.conf /etc/rahunas/rahunas.conf
+ucf /usr/share/doc/rahunas/rahunas-vserver.conf \
+  /etc/rahunas/rahunas.d/01_rahunas-vserver.conf
 
 #DEBHELPER#

debian/rahunas.postrm

@@ -18 +18 @@
     if which ucf >/dev/null 2>&1; then
       ucf --purge /etc/rahunas/rahunas.conf
+      ucf --purge /etc/rahunas/rahunas.d/01_rahunas-vserver.conf
     fi
 
     rm -f /etc/rahunas/rahunas.conf
+    rm -f /etc/rahunas/rahunas.d/01_rahunas-vserver.conf
     ;;
   remove)

debian/rules

@@ -16 +16 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
-
-include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
@@ -45 +43 @@
         ./configure $(CROSS) --prefix=/usr --sysconfdir=/etc --localstatedir=/var --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
-build: patch build-arch build-indep
+build: build-arch build-indep
 
 build-arch: build-arch-stamp
@@ -58 +56 @@
         touch $@
 
-clean: unpatch
+clean:
         dh_testdir
         dh_testroot
@@ -103 +101 @@
         dh_install -s
 
-        install -D -m 0750 -o root -g root example/rahunas.conf debian/rahunas/usr/share/doc/rahunas/rahunas.conf
-        install -D -m 0750 -o root -g root tools/firewall.sh debian/rahunas/etc/rahunas/firewall.sh
-        install -D -m 0750 -o root -g root tools/bandwidth.sh debian/rahunas/etc/rahunas/bandwidth.sh
-        install -D -m 0750 -o root -g root tools/weblogin-config-update.sh debian/rahunas/etc/rahunas/weblogin-config-update.sh
-
 binary-common:
         dh_testdir