gnokii ChangeLog smsd/sms.tables.mysql.sql smsd...

[Helge Deller]

CVSROOT:        /sources/gnokii
Module name:    gnokii
Changes by:     Helge Deller <deller>   06/06/11 14:08:42

Modified files:
        .              : ChangeLog 
        smsd           : sms.tables.mysql.sql sms.tables.pq.sql Makefile 

Log message:
        o apply some patches by SUSE, RedHat and Debian which makes packager's 
life easier 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnokii/ChangeLog?cvsroot=gnokii&r1=1.1191&r2=1.1192
http://cvs.savannah.gnu.org/viewcvs/gnokii/smsd/sms.tables.mysql.sql?cvsroot=gnokii&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnokii/smsd/sms.tables.pq.sql?cvsroot=gnokii&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnokii/smsd/Makefile?cvsroot=gnokii&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnokii/gnokii/ChangeLog,v
retrieving revision 1.1191
retrieving revision 1.1192
diff -u -b -r1.1191 -r1.1192
--- ChangeLog   22 May 2006 20:06:16 -0000      1.1191
+++ ChangeLog   11 Jun 2006 14:08:41 -0000      1.1192
@@ -98,6 +98,8 @@
       easier to translate                           (Daniele Forsi)
     * update Italian translation and fix charset    (Daniele Forsi)
  * smsd updates
+    o apply some patches by SUSE, RedHat and Debian which
+      makes packager's life easier                   (Helge Deller)
     o switch smsd to new libgnokii functions         (Helge Deller,
                                                          Pawel Kot)
  * gnokii updates

Index: smsd/sms.tables.mysql.sql
===================================================================
RCS file: /sources/gnokii/gnokii/smsd/sms.tables.mysql.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- smsd/sms.tables.mysql.sql   9 Apr 2005 17:19:14 -0000       1.4
+++ smsd/sms.tables.mysql.sql   11 Jun 2006 14:08:42 -0000      1.5
@@ -1,12 +1,6 @@
-# MySQL dump 8.13
-#
-# Host: localhost    Database: sms
-#--------------------------------------------------------
-# Server version       3.23.36
+-- CREATE DATABASE smsd;
 
-#
-# Table structure for table 'inbox'
-#
+-- USE smsd;
 
 CREATE TABLE inbox (
   id int(10) unsigned NOT NULL auto_increment,
@@ -17,16 +11,7 @@
   phone tinyint(4),
   processed tinyint(4) NOT NULL default '0',
   PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
-#
-# Dumping data for table 'inbox'
-#
-
-
-#
-# Table structure for table 'outbox'
-#
+);
 
 CREATE TABLE outbox (
   id int(10) unsigned NOT NULL auto_increment,
@@ -41,10 +26,8 @@
   not_before time NOT NULL default '00:00:00',
   not_after time  NOT NULL default '23:59:59',
   PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
-#
-# Dumping data for table 'outbox'
-#
+);
 
+-- CREATE INDEX outbox_processed_ix ON outbox (processed);
 
+-- GRANT SELECT, INSERT, UPDATE, DELETE ON smsd.* TO address@hidden;

Index: smsd/sms.tables.pq.sql
===================================================================
RCS file: /sources/gnokii/gnokii/smsd/sms.tables.pq.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- smsd/sms.tables.pq.sql      9 Apr 2005 17:19:14 -0000       1.8
+++ smsd/sms.tables.pq.sql      11 Jun 2006 14:08:42 -0000      1.9
@@ -1,3 +1,14 @@
+-- \set ON_ERROR_STOP 1;
+-- CREATE USER "smsd" WITH NOCREATEDB NOCREATEUSER;
+-- CREATE DATABASE "smsd" WITH OWNER = "smsd";
+-- \connect "smsd" "smsd"
+-- COMMENT ON DATABASE "smsd" IS 'Gnokii SMSD Database';
+-- \set ON_ERROR_STOP 1;
+-- CREATE USER "smsd" WITH NOCREATEDB NOCREATEUSER;
+-- CREATE DATABASE "smsd" WITH OWNER = "smsd";
+-- \connect "smsd" "smsd"
+-- COMMENT ON DATABASE "smsd" IS 'Gnokii SMSD Database';
+
 CREATE TABLE "inbox" (
        "id" serial,
        "number" character varying(20) NOT NULL,
@@ -23,3 +34,5 @@
         "not_after" time without time zone DEFAULT '23:59:59' NOT NULL,
        PRIMARY KEY ("id")
 );
+
+-- CREATE INDEX "outbox_processed_ix" ON "outbox" (processed);

Index: smsd/Makefile
===================================================================
RCS file: /sources/gnokii/gnokii/smsd/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- smsd/Makefile       27 Feb 2006 20:55:59 -0000      1.34
+++ smsd/Makefile       11 Jun 2006 14:08:42 -0000      1.35
@@ -4,7 +4,7 @@
 # Copyright (C) 1999 Hugh Blemings & Pavel Janík ml.
 #               1999-2005 Jan Derfinak
 #               2000 Karel Zak
-# $Id: Makefile,v 1.34 2006/02/27 20:55:59 pkot Exp $
+# $Id: Makefile,v 1.35 2006/06/11 14:08:42 deller Exp $
 #
 
 #GLIBCFLAGS = glib-config --cflags
@@ -19,9 +19,11 @@
 TOPDIR=..
 include $(TOPDIR)/Makefile.global
 
+pkglibdir = ${libdir}/smsd
+
 SMSD_MAN=man/smsd.8
 
-CFLAGS += -DMODULES_DIR=\"${libdir}/smsd\" $(PTHREAD_CFLAGS) \
+CFLAGS += -DMODULES_DIR=\"${pkglibdir}\" $(PTHREAD_CFLAGS) \
          $(shell $(GLIBCFLAGS))
 
 LDLIBS += $(PTHREAD_LIBS) \
@@ -57,7 +59,7 @@
 libpq.la: pq.lo
        $(LIBTOOL) --mode=link $(CC) -o libpq.la pq.lo \
        $(shell $(GLIBLDLIBS)) -L$(shell pg_config --libdir) -lpq \
-       -export-dynamic -avoid-version -rpath ${libdir}/smsd
+       -export-dynamic -avoid-version -rpath ${pkglibdir}
 
 # MySQL support
 mysql.lo: smsd.h mysql.c
@@ -67,7 +69,7 @@
 libmysql.la: mysql.lo
        $(LIBTOOL) --mode=link $(CC) -o libmysql.la mysql.lo \
        $(shell $(GLIBLDLIBS)) $(shell mysql_config --libs) \
-       -export-dynamic -avoid-version -rpath ${libdir}/smsd
+       -export-dynamic -avoid-version -rpath ${pkglibdir}
 
 # File support
 file.lo: smsd.h file.c
@@ -77,7 +79,7 @@
 libfile.la: file.lo
        $(LIBTOOL) --mode=link $(CC) -o libfile.la file.lo \
        $(shell $(GLIBLDLIBS)) \
-       -export-dynamic -avoid-version -rpath ${libdir}/smsd
+       -export-dynamic -avoid-version -rpath ${pkglibdir}
 
 ### End of DB Modules
 
@@ -91,11 +93,11 @@
 install: all
        $(INSTALL) -d $(DESTDIR)$(sbindir)
        $(LIBTOOL) --mode=install $(INSTALL) -m 755 smsd $(DESTDIR)$(sbindir)
-       $(INSTALL) -d $(DESTDIR)${libdir}/smsd
+       $(INSTALL) -d $(DESTDIR)${pkglibdir}
        for f in $(DB_LIBS) ; do \
-       $(LIBTOOL) --mode=install $(INSTALL) $$f $(DESTDIR)${libdir}/smsd ; \
+       $(LIBTOOL) --mode=install $(INSTALL) $$f $(DESTDIR)${pkglibdir} ; \
        done
-       $(LIBTOOL) --mode=finish ${libdir}/smsd
+       $(LIBTOOL) --mode=finish ${pkglibdir}
        $(INSTALL) -d $(DESTDIR)$(man8dir)
        $(INSTALL_DATA) $(SMSD_MAN) $(DESTDIR)$(man8dir)