From: Dragan Dosen <ddosen@ffzg.hr>
Date: Sun, 17 Feb 2008 12:13:11 +0000 (+0000)
Subject: r4:
X-Git-Tag: v2%1.4.21+2~12
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=squirrelmail-cn.git;a=commitdiff_plain;h=b7fe69afa6e818bca5ff957fe212b5e3c6f2b075

r4:
  * Novi logo za CARNet Squirrelmail - sm_carnet_logo.png.
---

diff --git a/debian/changelog b/debian/changelog
index acc3bc8..9d2ce08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+squirrelmail-cn (2:1.4.9a-3) stable; urgency=low
+
+  * Novi logo za CARNet Squirrelmail - sm_carnet_logo.png.
+
+ -- Dragan Dosen <ddosen@ffzg.hr>  Sun, 17 Feb 2008 13:09:09 +0100
+
 squirrelmail-cn (2:1.4.9a-2) stable; urgency=low
 
   * Izmjene unutar debian/control datoteke:  ovisnost o php5-cn 
diff --git a/debian/postinst b/debian/postinst
index 454a6bb..d387dab 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -134,8 +134,9 @@ fi
 # We use sed to replace old defaults with ours.
 # Must escape \$ because of shell expansion.
 #
-seddef="/^[ 	]*\\\$org_logo[ 	]*=/s/sm_logo\.jpg/sm_carnet_logo.jpg/;
-	/^[ 	]*\\\$org_logo[ 	]*=/s/sm_logo\.png/sm_carnet_logo.jpg/;
+seddef="/^[ 	]*\\\$org_logo[ 	]*=/s/sm_logo\.jpg/sm_carnet_logo.png/;
+	/^[ 	]*\\\$org_logo[ 	]*=/s/sm_logo\.png/sm_carnet_logo.png/;
+	/^[ 	]*\\\$org_logo[ 	]*=/s/sm_carnet_logo\.jpg/sm_carnet_logo.png/;
 	/^[ 	]*\\\$domain[ 	]*=/s/mydomain\.com/$domainname/;
 	/^[ 	]*\\\$default_charset[ 	]*=/s/iso-8859-1/iso-8859-2/;
 	/^[ 	]*\\\$org_logo_width[ 	]*=/s/308/0/;
diff --git a/squirrelmail/images/sm_carnet_logo.jpg b/squirrelmail/images/sm_carnet_logo.jpg
deleted file mode 100644
index 513f633..0000000
Binary files a/squirrelmail/images/sm_carnet_logo.jpg and /dev/null differ
diff --git a/squirrelmail/images/sm_carnet_logo.png b/squirrelmail/images/sm_carnet_logo.png
new file mode 100644
index 0000000..6b625f5
Binary files /dev/null and b/squirrelmail/images/sm_carnet_logo.png differ