Upgrade paketa za Debian lenny.

diff --git a/debian/README.CARNet b/debian/README.CARNet
index 12a0dbc..eefc613 100644 (file)
--- a/debian/README.CARNet
+++ b/debian/README.CARNet
@@ -2,7 +2,7 @@ php5-cn
 -------
 
 Ovaj paket sadrzi dodatne CARNetove postavke za php5 pakete iz 
-Debian etch distribucije.  Povlaci za sobom instalaciju MySQL
+Debian lenny distribucije.  Povlaci za sobom instalaciju MySQL
 dodatka (extension), PHP interpretera za komandnu liniju i 
 PHP modula za Apache2 web server.
 
@@ -52,4 +52,4 @@ Kako bi Vas Apache2 web server mogao normalno posluzivati
 stranice pisane u PHP-u, preporuca se da NE brisete i da ne 
 uredjujete navedene datoteke, osim ako znate sto cinite.
 
- -- Dragan Dosen <ddosen@ffzg.hr>  Sun, 30 Mar 2008 20:03:30 +0200
+ -- Dragan Dosen <ddosen@ffzg.hr>  Sat, 18 Apr 2009 19:42:19 +0200

diff --git a/debian/changelog b/debian/changelog
index 01de0ae..23f7d0b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php5-cn (5.2.6-1) stable; urgency=low
+
+  * Upgrade paketa za Debian lenny.
+
+ -- Dragan Dosen <ddosen@ffzg.hr>  Sat, 18 Apr 2009 19:42:19 +0200
+
 php5-cn (5.2.0-7) stable; urgency=low
 
   * Paket za buduci prelazak na Debian Lenny.

diff --git a/debian/control b/debian/control
index 4d1b010..815b710 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,24 +2,20 @@ Source: php5-cn
 Section: web
 Priority: optional
 Maintainer: Dragan Dosen <ddosen@ffzg.hr>
-Origin: carnet
 Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1
+Standards-Version: 3.7.2
 
 Package: php5-cn
 Architecture: all
 Pre-Depends: findutils
-Depends: libapache2-mod-php5, php5-cli, php5-mysql, debconf (>= 1.4.72), carnet-tools-cn (>= 2.4)
+Depends: libapache2-mod-php5 (>= 5.2.6.dfsg.1-1+lenny2), php5-cli (>= 5.2.6.dfsg.1-1+lenny2), php5-mysql (>= 5.2.6.dfsg.1-1+lenny2), carnet-tools-cn (>= 2.8.1), ${misc:Depends}
 Conflicts: php4-cn
 Description: server-side, HTML-embedded scripting language (CARNet configuration)
- This package is a meta-package that, when installed, guarantees that you
- have at least one of the four server-side versions of the PHP5 interpreter
- installed.  Removing this package won't remove PHP5 from your system, however
- it may remove other packages that depend on this one.
- .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
  in. The goal of the language is to allow web developers to write dynamically
  generated pages quickly.
  .
- This package contains additional CARNet configuration.
+ This package is a meta-package that contains additional CARNet configuration.
+ Removing this package won't remove PHP5 from your system, however it may
+ remove other packages that depend on this one.

diff --git a/debian/postinst b/debian/postinst
index 5554f5d..14b691b 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -308,9 +308,9 @@ if [ $need_restart -eq 1 ]; then
                # Restart Apache2 web server.
                if [ -x "/etc/init.d/apache2" ]; then
                    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                       invoke-rc.d apache2 force-reload || true
+                       invoke-rc.d apache2 restart || true
                    else
-                       /etc/init.d/apache2 force-reload || true
+                       /etc/init.d/apache2 restart || true
                    fi
                fi
        else

diff --git a/debian/postrm b/debian/postrm
index c5f4fc5..6da000b 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
         . /usr/share/debconf/confmodule
         db_purge
 fi