merged heads

diff --combined debian/changelog
index c5dc990,32ec35a..4401bff
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,10 @@@
- iserv-mod-room-reservation (9.02.25-0) unstable; urgency=low
 -iserv-mod-room-reservation (9.10.22-0) unstable; urgency=low
++iserv-mod-room-reservation (9.10.23-1) unstable; urgency=low
  
-   * configuration: list boxes without additional border, to match the
-     appearance of the other (standard) list boxes in IServ
-   * administration: link to the computer administration page for management of
-     rooms
-   * prevent chklocale in 9.02.22 from nagging
 -  * FIX: since postgresql-8.3, sequences are not allowed to have INSERT and DELETE 
 -    rights, results in warning
++  * FIX: since postgresql-8.3, sequences are not allowed to have INSERT and 
++    DELETE rights, results in warning
+   * debian/control: added fields for IServ "app store"
  
-  -- Roland Hieber <roland.hieber@wilhelm-gym.net>  Wed, 25 Feb 2009 03:45:49 +0100
+  -- Roland Hieber (Package Signing Key) <roland.hieber@wilhelm-gym.net>  Thu, 22 Oct 2009 21:41:40 +0200
  
  iserv-mod-room-reservation (9.02.07-0) unstable; urgency=low
  

diff --combined sql/mod_room-reservation.sql
index 3f0375e,796a6f7..b585798
--- 1/sql/mod_room-reservation.sql
--- 2/sql/mod_room-reservation.sql
+++ b/sql/mod_room-reservation.sql
@@@ -11,55 -11,29 +11,33 @@@ CREATE TABLE mod_roomreservation_roomsw
  -- Table with bookings
  --
  CREATE TABLE mod_roomreservation_bookings (
-     rrb_uid        SERIAL    NOT NULL         -- Unique ID
-                              PRIMARY KEY, 
-     rrb_room       TEXT      NOT NULL         -- Name of the room
+     rrb_uid        SERIAL    NOT NULL PRIMARY KEY, -- Unique ID 
 -    rrb_room       TEXT      NOT NULL              -- Name of the room
++    rrb_room       TEXT      NOT NULL       -- Name of the room
                               REFERENCES rooms(name)
                               ON DELETE CASCADE
                               ON UPDATE CASCADE,
-     rrb_date       DATE      NOT NULL,        -- Date of the booking
-     rrb_tsfirst    SMALLINT  NOT NULL,        -- Number of the first timeslice
-     rrb_tslast     SMALLINT  NOT NULL         -- Number of the last timeslice
 -    rrb_date       DATE      NOT NULL,             -- Date of the booking
 -    rrb_tsfirst    SMALLINT  NOT NULL,             -- Number of the first timeslice
 -    rrb_tslast     SMALLINT  NOT NULL              -- Number of the last timeslice
++    rrb_date       DATE      NOT NULL,      -- Date of the booking
++    rrb_tsfirst    SMALLINT  NOT NULL,      -- Number of the first timeslice
++    rrb_tslast     SMALLINT  NOT NULL       -- Number of the last timeslice
                               CHECK(rrb_tsfirst <= rrb_tslast),
-     rrb_act        TEXT      NOT NULL         -- Owner of the booking
 -    rrb_act        TEXT      NOT NULL              -- Owner of the booking
++    rrb_act        TEXT      NOT NULL       -- Owner of the booking
                               REFERENCES users(Act)
                               ON DELETE CASCADE
                               ON UPDATE CASCADE,
-     rrb_reason     TEXT      NOT NULL,        -- Reason
-     rrb_interval   SMALLINT  NOT NULL         -- Interval in weeks for 
-                              DEFAULT 0        --   recurring bookings
- );
- 
- 
- --
- -- Table with booking interruptions
- --
- CREATE TABLE mod_roomreservation_intermissions (
-     rri_uid        SERIAL    NOT NULL         -- Unique ID of intermissions
-                              PRIMARY KEY, 
-     rri_rrb_uid    INT       NOT NULL         -- The boooking to intermit
-                              REFERENCES mod_roomreservation_bookings(rrb_uid)
-                              ON UPDATE CASCADE ON DELETE CASCADE,
-     -- Note: start and end date form an closed interval, i.e. the start and 
-     -- end date are part of the interval.
-     rri_start      DATE      NOT NULL,        -- Start date
-     rri_end        DATE      NOT NULL         -- End date
-                              CHECK(rri_start <= rri_end)
 -    rrb_reason     TEXT      NOT NULL,             -- Reason
 -    rrb_interval   SMALLINT  NOT NULL              -- Interval in weeks for recurring bookings
++    rrb_reason     TEXT      NOT NULL,      -- Reason
++    rrb_interval   SMALLINT  NOT NULL       -- Interval in weeks for recurring
++                                            -- bookings
+                              DEFAULT 0
  );
  
  --
  -- Permissions
  --
- GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_bookings,
-   mod_roomreservation_bookings_rrb_uid_seq TO webusr;
- GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_bookings,
-   mod_roomreservation_bookings_rrb_uid_seq TO webadm;
 -GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_bookings TO webusr, webadm;
 -GRANT SELECT, UPDATE ON mod_roomreservation_bookings_rrb_uid_seq TO webusr, webadm;
++GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_bookings TO webusr, 
++  webadm;
++GRANT SELECT, UPDATE ON mod_roomreservation_bookings_rrb_uid_seq TO webusr, 
++  webadm;
  GRANT SELECT ON mod_roomreservation_roomswhitelist TO webusr;
- GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_roomswhitelist 
-   TO webadm;
 -GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_roomswhitelist TO webadm;
++GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_roomswhitelist TO
++  webadm;
  
- GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_intermissions 
-   TO webusr;
- GRANT SELECT, INSERT, UPDATE, DELETE ON mod_roomreservation_intermissions 
-   TO webadm;
-