Merge branch 'master' of /srv/buildd.debian.org/git/wanna-build

diff --git a/bin/wb-graph b/bin/wb-graph
index 743c1af29a76a7885fe3d9e065f91bdd2a021b0b..78d3c29964781e1db8f5bc713eff8d59d3b52b59 100755 (executable)
--- a/bin/wb-graph
+++ b/bin/wb-graph
@@ -35,7 +35,7 @@ my $date=`date -u "+%m/%d/%Y %T"`;
 chop($date);
 print "$date";
 
-my @archs = qw(alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 amd64 sparc armel kfreebsd-amd64 kfreebsd-i386);
+my @archs = qw(alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 amd64 sparc armel kfreebsd-amd64 kfreebsd-i386 armhf s390x);
 my $arch;
 
 foreach $arch (@archs) {

diff --git a/etc/graph.R b/etc/graph.R
index 792478681ad8fecb8d1eb184cb35e7efde5245b9..f03fa9b82340ff97b2efdb77eb52e42e33fe7af6 100644 (file)
--- a/etc/graph.R
+++ b/etc/graph.R
@@ -1,5 +1,6 @@
-arch <- c("amd64", "armel", "hurd-i386", "i386", "ia64", "kfreebsd-amd64",
-       "kfreebsd-i386", "mips", "mipsel", "powerpc", "s390", "sparc")
+arch <- c("amd64", "armel", "armhf", "hurd-i386", "i386", "ia64",
+       "kfreebsd-amd64", "kfreebsd-i386", "mips", "mipsel", "powerpc",
+       "s390", "s390x", "sparc")
 palette(c("black", "turquoise", "red", "OrangeRed", "green3", "cyan", 
        "blue", "yellow", "magenta",
        "violetred2","thistle4", "steelblue2", "springgreen4",
@@ -10,7 +11,8 @@ readdata <- function (file,start) {
        sep=",",col.names=c("date","alpha","at","arm","art","hppa","ht","hurd-i386",
        "hit","i386","it","ia64","i6t","m68k","mt","mips","mit","mipsel","mipt",
        "powerpc","pt","s390","st","amd64","amdt","sparc","spt","armel","aret",
-       "kfreebsd-amd64", "kfreebsd-amd64-t", "kfreebsd-i386", "kfreebsd-i386-t"))
+       "kfreebsd-amd64", "kfreebsd-amd64-t", "kfreebsd-i386", "kfreebsd-i386-t",
+       "armhf", "armhf-t", "s390x", "s390x-t"))
        ts(as.matrix(data.frame(
        t[23]/t[24]*100, #amd64
        t[27]/t[28]*100, #armel
@@ -24,22 +26,24 @@ readdata <- function (file,start) {
        t[19]/t[20]*100, #powerpc
        t[21]/t[22]*100, #s390
        t[25]/t[26]*100 #sparc
+       t[33]/t[34]*100, #armhf
+       t[35]/t[36]*100, #s390x
        )),c(2001,start),frequency=365.25)
 }
 
-plotwb <- function (file,title,p,linept=85,height=7.5,width=10,pch=1:16) {
+plotwb <- function (file,title,p,linept=85,height=7.5,width=10,pch=1:18) {
        bitmap(file=file,type="png16m",width=width,height=height,res=64)
        layout(matrix(c(1,1,2,2),2,2),widths=c(0.85,0.15))
        par(mar=c(5,4,4,2)+0.1) 
        par(lab=c(10,10,7))
-       plot(p,type="o",plot.type="single",col=1:16,pch=pch,xlab="date",
+       plot(p,type="o",plot.type="single",col=1:18,pch=pch,xlab="date",
                ylab="percentage of packages",main=title,cex=2)
        abline(h=90,lty=2,col=3)
        abline(h=linept,lty=2,col=3)
        axis(4)
        plot.new()
        par(plt=c(0,1,0,1))        
-       legend(-1.2,1, arch, col=1:16, pch=pch, lwd=2, bg='gray90', cex=1.5)  
+       legend(-1.2,1, arch, col=1:18, pch=pch, lwd=2, bg='gray90', cex=1.5)  
 }
 v <- readdata("/org/wanna-build/etc/graph-data",164)
 plotwb("/org/buildd.debian.org/web/stats/graph.png","What percent is built for each architecture",v,85,7.5,10,".")

diff --git a/schema/roles.sql b/schema/roles.sql
index 943373db66785e0d2642585e8735ce66de9fd5b9..8f0ac68ab47b8b9d944f5677d77d2ca6b5586e6c 100644 (file)
--- a/schema/roles.sql
+++ b/schema/roles.sql
@@ -96,6 +96,8 @@ CREATE ROLE lamont;
 ALTER ROLE lamont WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN;
 CREATE ROLE luk;
 ALTER ROLE luk WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN;
+CREATE ROLE markos;
+ALTER ROLE markos WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN;
 CREATE ROLE mbanck;
 ALTER ROLE mbanck WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN;
 CREATE ROLE mehdi;
@@ -136,6 +138,8 @@ CREATE ROLE vorlon;
 ALTER ROLE vorlon WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN;
 CREATE ROLE waldi;
 ALTER ROLE waldi WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN;
+CREATE ROLE "wb-buildd";
+ALTER ROLE "wb-buildd" WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN;
 CREATE ROLE wb_all;
 ALTER ROLE wb_all WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB NOLOGIN;
 CREATE ROLE wb_security;
@@ -197,6 +201,7 @@ GRANT wb_all TO kitterman GRANTED BY wbadm;
 GRANT wb_all TO kroeckx GRANTED BY wbadm;
 GRANT wb_all TO lamont GRANTED BY wbadm;
 GRANT wb_all TO luk GRANTED BY wbadm;
+GRANT wb_all TO markos GRANTED BY wbadm;
 GRANT wb_all TO mbanck GRANTED BY wbadm;
 GRANT wb_all TO mehdi GRANTED BY wbadm;
 GRANT wb_all TO nomeata GRANTED BY wbadm;
@@ -205,6 +210,7 @@ GRANT wb_all TO riku GRANTED BY wbadm;
 GRANT wb_all TO sthibault GRANTED BY wbadm;
 GRANT wb_all TO vorlon GRANTED BY wbadm;
 GRANT wb_all TO waldi GRANTED BY wbadm;
+GRANT wb_all TO "wb-buildd" GRANTED BY wbadm;
 GRANT wb_all TO wbadm GRANTED BY wbadm;
 GRANT wb_all TO wookey GRANTED BY wbadm;
 GRANT wb_all TO wouter GRANTED BY wbadm;

diff --git a/schema/wanna-build.sql b/schema/wanna-build.sql
index 3124b90c8f47ee2b6bc0ae5d61a4fb6401ec0a27..4630a9cee40c725c9ab09adc81982453a776b835 100644 (file)
--- a/schema/wanna-build.sql
+++ b/schema/wanna-build.sql
@@ -81,6 +81,24 @@ CREATE SCHEMA armel_public;
 
 ALTER SCHEMA armel_public OWNER TO wbadm;
 
+--
+-- Name: armhf; Type: SCHEMA; Schema: -; Owner: wbadm
+--
+
+CREATE SCHEMA armhf;
+
+
+ALTER SCHEMA armhf OWNER TO wbadm;
+
+--
+-- Name: armhf_public; Type: SCHEMA; Schema: -; Owner: wbadm
+--
+
+CREATE SCHEMA armhf_public;
+
+
+ALTER SCHEMA armhf_public OWNER TO wbadm;
+
 --
 -- Name: hppa; Type: SCHEMA; Schema: -; Owner: wbadm
 --
@@ -261,6 +279,24 @@ CREATE SCHEMA s390_public;
 
 ALTER SCHEMA s390_public OWNER TO wbadm;
 
+--
+-- Name: s390x; Type: SCHEMA; Schema: -; Owner: wbadm
+--
+
+CREATE SCHEMA s390x;
+
+
+ALTER SCHEMA s390x OWNER TO wbadm;
+
+--
+-- Name: s390x_public; Type: SCHEMA; Schema: -; Owner: wbadm
+--
+
+CREATE SCHEMA s390x_public;
+
+
+ALTER SCHEMA s390x_public OWNER TO wbadm;
+
 --
 -- Name: sparc; Type: SCHEMA; Schema: -; Owner: wbadm
 --
@@ -1306,6 +1342,90 @@ CREATE VIEW users AS
 
 ALTER TABLE armel_public.users OWNER TO wbadm;
 
+SET search_path = armhf, pg_catalog;
+
+--
+-- Name: packages; Type: VIEW; Schema: armhf; Owner: wbadm
+--
+
+CREATE VIEW packages AS
+    SELECT packages.package, packages.distribution, packages.version, packages.state, packages.section, packages.priority, packages.installed_version, packages.previous_state, packages.state_change, packages.notes, packages.builder, packages.failed, packages.old_failed, packages.binary_nmu_version, packages.binary_nmu_changelog, packages.failed_category, packages.permbuildpri, packages.buildpri, packages.depends, packages.rel, packages.bd_problem, packages.extra_depends, packages.extra_conflicts, packages.build_arch_all FROM public.packages packages WHERE ((packages.architecture)::text = 'armhf'::text);
+
+
+ALTER TABLE armhf.packages OWNER TO wbadm;
+
+--
+-- Name: pkg_history; Type: VIEW; Schema: armhf; Owner: wbadm
+--
+
+CREATE VIEW pkg_history AS
+    SELECT pkg_history.package, pkg_history.distribution, pkg_history.version, pkg_history."timestamp", pkg_history.result, pkg_history.build_time, pkg_history.disk_space, pkg_history.builder FROM public.pkg_history WHERE ((pkg_history.architecture)::text = 'armhf'::text);
+
+
+ALTER TABLE armhf.pkg_history OWNER TO wbadm;
+
+--
+-- Name: transactions; Type: VIEW; Schema: armhf; Owner: wbadm
+--
+
+CREATE VIEW transactions AS
+    SELECT transactions.package, transactions.distribution, transactions.version, transactions.action, transactions.prevstate, transactions.state, transactions.real_user, transactions.set_user, transactions."time" FROM public.transactions WHERE ((transactions.architecture)::text = 'armhf'::text);
+
+
+ALTER TABLE armhf.transactions OWNER TO wbadm;
+
+--
+-- Name: users; Type: VIEW; Schema: armhf; Owner: wbadm
+--
+
+CREATE VIEW users AS
+    SELECT users.username, users.distribution, users.last_seen FROM public.users WHERE ((users.architecture)::text = 'armhf'::text);
+
+
+ALTER TABLE armhf.users OWNER TO wbadm;
+
+SET search_path = armhf_public, pg_catalog;
+
+--
+-- Name: packages; Type: VIEW; Schema: armhf_public; Owner: wbadm
+--
+
+CREATE VIEW packages AS
+    SELECT packages.package, packages.distribution, packages.version, packages.state, packages.section, packages.priority, packages.installed_version, packages.previous_state, packages.state_change, packages.notes, packages.builder, packages.failed, packages.old_failed, packages.binary_nmu_version, packages.binary_nmu_changelog, packages.failed_category, packages.permbuildpri, packages.buildpri, packages.depends, packages.rel, packages.bd_problem, packages.extra_depends, packages.extra_conflicts, packages.build_arch_all FROM (public.packages NATURAL JOIN public.distributions) WHERE ((distributions.public = true) AND ((packages.architecture)::text = 'armhf'::text));
+
+
+ALTER TABLE armhf_public.packages OWNER TO wbadm;
+
+--
+-- Name: pkg_history; Type: VIEW; Schema: armhf_public; Owner: wbadm
+--
+
+CREATE VIEW pkg_history AS
+    SELECT pkg_history.package, pkg_history.distribution, pkg_history.version, pkg_history."timestamp", pkg_history.result, pkg_history.build_time, pkg_history.disk_space, pkg_history.builder FROM (public.pkg_history NATURAL JOIN public.distributions) WHERE ((distributions.public = true) AND ((pkg_history.architecture)::text = 'armhf'::text));
+
+
+ALTER TABLE armhf_public.pkg_history OWNER TO wbadm;
+
+--
+-- Name: transactions; Type: VIEW; Schema: armhf_public; Owner: wbadm
+--
+
+CREATE VIEW transactions AS
+    SELECT transactions.package, transactions.distribution, transactions.version, transactions.action, transactions.prevstate, transactions.state, transactions.real_user, transactions.set_user, transactions."time" FROM (public.transactions NATURAL JOIN public.distributions) WHERE ((distributions.public = true) AND ((transactions.architecture)::text = 'armhf'::text));
+
+
+ALTER TABLE armhf_public.transactions OWNER TO wbadm;
+
+--
+-- Name: users; Type: VIEW; Schema: armhf_public; Owner: wbadm
+--
+
+CREATE VIEW users AS
+    SELECT users.username, users.distribution, users.last_seen FROM (public.users NATURAL JOIN public.distributions) WHERE ((distributions.public = true) AND ((users.architecture)::text = 'armhf'::text));
+
+
+ALTER TABLE armhf_public.users OWNER TO wbadm;
+
 SET search_path = hppa, pg_catalog;
 
 --
@@ -2119,6 +2239,18 @@ CREATE VIEW lastlog AS
 
 ALTER TABLE public.lastlog OWNER TO wbadm;
 
+--
+-- Name: locks; Type: TABLE; Schema: public; Owner: wbadm; Tablespace: 
+--
+
+CREATE TABLE locks (
+    distribution character varying,
+    architecture character varying
+);
+
+
+ALTER TABLE public.locks OWNER TO wbadm;
+
 --
 -- Name: log; Type: VIEW; Schema: public; Owner: wbadm
 --
@@ -2233,6 +2365,90 @@ CREATE VIEW users AS
 
 ALTER TABLE s390_public.users OWNER TO wbadm;
 
+SET search_path = s390x, pg_catalog;
+
+--
+-- Name: packages; Type: VIEW; Schema: s390x; Owner: wbadm
+--
+
+CREATE VIEW packages AS
+    SELECT packages.package, packages.distribution, packages.version, packages.state, packages.section, packages.priority, packages.installed_version, packages.previous_state, packages.state_change, packages.notes, packages.builder, packages.failed, packages.old_failed, packages.binary_nmu_version, packages.binary_nmu_changelog, packages.failed_category, packages.permbuildpri, packages.buildpri, packages.depends, packages.rel, packages.bd_problem, packages.extra_depends, packages.extra_conflicts, packages.build_arch_all FROM public.packages packages WHERE ((packages.architecture)::text = 's390x'::text);
+
+
+ALTER TABLE s390x.packages OWNER TO wbadm;
+
+--
+-- Name: pkg_history; Type: VIEW; Schema: s390x; Owner: wbadm
+--
+
+CREATE VIEW pkg_history AS
+    SELECT pkg_history.package, pkg_history.distribution, pkg_history.version, pkg_history."timestamp", pkg_history.result, pkg_history.build_time, pkg_history.disk_space, pkg_history.builder FROM public.pkg_history WHERE ((pkg_history.architecture)::text = 's390x'::text);
+
+
+ALTER TABLE s390x.pkg_history OWNER TO wbadm;
+
+--
+-- Name: transactions; Type: VIEW; Schema: s390x; Owner: wbadm
+--
+
+CREATE VIEW transactions AS
+    SELECT transactions.package, transactions.distribution, transactions.version, transactions.action, transactions.prevstate, transactions.state, transactions.real_user, transactions.set_user, transactions."time" FROM public.transactions WHERE ((transactions.architecture)::text = 's390x'::text);
+
+
+ALTER TABLE s390x.transactions OWNER TO wbadm;
+
+--
+-- Name: users; Type: VIEW; Schema: s390x; Owner: wbadm
+--
+
+CREATE VIEW users AS
+    SELECT users.username, users.distribution, users.last_seen FROM public.users WHERE ((users.architecture)::text = 's390x'::text);
+
+
+ALTER TABLE s390x.users OWNER TO wbadm;
+
+SET search_path = s390x_public, pg_catalog;
+
+--
+-- Name: packages; Type: VIEW; Schema: s390x_public; Owner: wbadm
+--
+
+CREATE VIEW packages AS
+    SELECT packages.package, packages.distribution, packages.version, packages.state, packages.section, packages.priority, packages.installed_version, packages.previous_state, packages.state_change, packages.notes, packages.builder, packages.failed, packages.old_failed, packages.binary_nmu_version, packages.binary_nmu_changelog, packages.failed_category, packages.permbuildpri, packages.buildpri, packages.depends, packages.rel, packages.bd_problem, packages.extra_depends, packages.extra_conflicts, packages.build_arch_all FROM (public.packages NATURAL JOIN public.distributions) WHERE ((distributions.public = true) AND ((packages.architecture)::text = 's390x'::text));
+
+
+ALTER TABLE s390x_public.packages OWNER TO wbadm;
+
+--
+-- Name: pkg_history; Type: VIEW; Schema: s390x_public; Owner: wbadm
+--
+
+CREATE VIEW pkg_history AS
+    SELECT pkg_history.package, pkg_history.distribution, pkg_history.version, pkg_history."timestamp", pkg_history.result, pkg_history.build_time, pkg_history.disk_space, pkg_history.builder FROM (public.pkg_history NATURAL JOIN public.distributions) WHERE ((distributions.public = true) AND ((pkg_history.architecture)::text = 's390x'::text));
+
+
+ALTER TABLE s390x_public.pkg_history OWNER TO wbadm;
+
+--
+-- Name: transactions; Type: VIEW; Schema: s390x_public; Owner: wbadm
+--
+
+CREATE VIEW transactions AS
+    SELECT transactions.package, transactions.distribution, transactions.version, transactions.action, transactions.prevstate, transactions.state, transactions.real_user, transactions.set_user, transactions."time" FROM (public.transactions NATURAL JOIN public.distributions) WHERE ((distributions.public = true) AND ((transactions.architecture)::text = 's390x'::text));
+
+
+ALTER TABLE s390x_public.transactions OWNER TO wbadm;
+
+--
+-- Name: users; Type: VIEW; Schema: s390x_public; Owner: wbadm
+--
+
+CREATE VIEW users AS
+    SELECT users.username, users.distribution, users.last_seen FROM (public.users NATURAL JOIN public.distributions) WHERE ((distributions.public = true) AND ((users.architecture)::text = 's390x'::text));
+
+
+ALTER TABLE s390x_public.users OWNER TO wbadm;
+
 SET search_path = sparc, pg_catalog;
 
 --
@@ -2388,13 +2604,6 @@ CREATE INDEX distributions_distribution ON distributions USING hash (distributio
 CREATE INDEX packages_arch_dist_state ON packages USING btree (architecture, distribution, upper((state)::text));
 
 
---
--- Name: packages_distribution_package; Type: INDEX; Schema: public; Owner: wbadm; Tablespace: 
---
-
-CREATE INDEX packages_distribution_package ON packages USING btree (distribution, package);
-
-
 --
 -- Name: pkg_history_timestamp; Type: INDEX; Schema: public; Owner: wbadm; Tablespace: 
 --
@@ -2690,6 +2899,78 @@ CREATE RULE users_insert AS ON INSERT TO users DO INSTEAD INSERT INTO public.use
 CREATE RULE users_update AS ON UPDATE TO users DO INSTEAD UPDATE public.users u SET last_seen = new.last_seen WHERE ((((u.architecture)::text = 'armel'::text) AND ((u.distribution)::text = (old.distribution)::text)) AND ((u.username)::text = (old.username)::text));
 
 
+SET search_path = armhf, pg_catalog;
+
+--
+-- Name: packages_delete; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE packages_delete AS ON DELETE TO packages DO INSTEAD DELETE FROM public.packages p WHERE ((((p.architecture)::text = 'armhf'::text) AND ((p.package)::text = (old.package)::text)) AND ((p.distribution)::text = (old.distribution)::text));
+
+
+--
+-- Name: packages_insert; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE packages_insert AS ON INSERT TO packages DO INSTEAD INSERT INTO public.packages (architecture, package, distribution, version, state, section, priority, installed_version, previous_state, state_change, notes, builder, failed, old_failed, binary_nmu_version, binary_nmu_changelog, failed_category, permbuildpri, buildpri, depends, rel, bd_problem, extra_depends, extra_conflicts, build_arch_all) VALUES ('armhf'::character varying, new.package, new.distribution, new.version, new.state, new.section, new.priority, new.installed_version, new.previous_state, new.state_change, new.notes, new.builder, new.failed, new.old_failed, new.binary_nmu_version, new.binary_nmu_changelog, new.failed_category, new.permbuildpri, new.buildpri, new.depends, new.rel, new.bd_problem, new.extra_depends, new.extra_conflicts, new.build_arch_all);
+
+
+--
+-- Name: packages_update; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE packages_update AS ON UPDATE TO packages DO INSTEAD UPDATE public.packages p SET version = new.version, state = new.state, section = new.section, priority = new.priority, installed_version = new.installed_version, previous_state = new.previous_state, state_change = new.state_change, notes = new.notes, builder = new.builder, failed = new.failed, old_failed = new.old_failed, binary_nmu_version = new.binary_nmu_version, binary_nmu_changelog = new.binary_nmu_changelog, failed_category = new.failed_category, permbuildpri = new.permbuildpri, buildpri = new.buildpri, depends = new.depends, rel = new.rel, bd_problem = new.bd_problem, extra_depends = new.extra_depends, extra_conflicts = new.extra_conflicts, build_arch_all = new.build_arch_all WHERE ((((p.architecture)::text = 'armhf'::text) AND ((p.package)::text = (old.package)::text)) AND ((p.distribution)::text = (old.distribution)::text));
+
+
+--
+-- Name: pkg_history_delete; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE pkg_history_delete AS ON DELETE TO pkg_history DO INSTEAD DELETE FROM public.pkg_history p WHERE ((((((p.architecture)::text = 'armhf'::text) AND ((p.package)::text = (old.package)::text)) AND ((p.distribution)::text = (old.distribution)::text)) AND (p.version OPERATOR(public.=) old.version)) AND (p."timestamp" = old."timestamp"));
+
+
+--
+-- Name: pkg_history_insert; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE pkg_history_insert AS ON INSERT TO pkg_history DO INSTEAD INSERT INTO public.pkg_history (architecture, package, distribution, version, "timestamp", result, build_time, disk_space) VALUES ('armhf'::character varying, new.package, new.distribution, new.version, new."timestamp", new.result, new.build_time, new.disk_space);
+
+
+--
+-- Name: pkg_history_update; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE pkg_history_update AS ON UPDATE TO pkg_history DO INSTEAD UPDATE public.pkg_history p SET result = new.result, build_time = new.build_time, disk_space = new.disk_space WHERE ((((((p.architecture)::text = 'armhf'::text) AND ((p.package)::text = (old.package)::text)) AND ((p.distribution)::text = (old.distribution)::text)) AND (p.version OPERATOR(public.=) old.version)) AND (p."timestamp" = old."timestamp"));
+
+
+--
+-- Name: transactions_insert; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE transactions_insert AS ON INSERT TO transactions DO INSTEAD INSERT INTO public.transactions (architecture, package, distribution, version, action, prevstate, state, real_user, set_user, "time") VALUES ('armhf'::character varying, new.package, new.distribution, new.version, new.action, new.prevstate, new.state, new.real_user, new.set_user, new."time");
+
+
+--
+-- Name: users_delete; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE users_delete AS ON DELETE TO users DO INSTEAD DELETE FROM public.users u WHERE ((((u.architecture)::text = 'armhf'::text) AND ((u.distribution)::text = (old.distribution)::text)) AND ((u.username)::text = (old.username)::text));
+
+
+--
+-- Name: users_insert; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE users_insert AS ON INSERT TO users DO INSTEAD INSERT INTO public.users (architecture, username, distribution, last_seen) VALUES ('armhf'::character varying, new.username, new.distribution, new.last_seen);
+
+
+--
+-- Name: users_update; Type: RULE; Schema: armhf; Owner: wbadm
+--
+
+CREATE RULE users_update AS ON UPDATE TO users DO INSTEAD UPDATE public.users u SET last_seen = new.last_seen WHERE ((((u.architecture)::text = 'armhf'::text) AND ((u.distribution)::text = (old.distribution)::text)) AND ((u.username)::text = (old.username)::text));
+
+
 SET search_path = hppa, pg_catalog;
 
 --
@@ -3410,6 +3691,78 @@ CREATE RULE users_insert AS ON INSERT TO users DO INSTEAD INSERT INTO public.use
 CREATE RULE users_update AS ON UPDATE TO users DO INSTEAD UPDATE public.users u SET last_seen = new.last_seen WHERE ((((u.architecture)::text = 's390'::text) AND ((u.distribution)::text = (old.distribution)::text)) AND ((u.username)::text = (old.username)::text));
 
 
+SET search_path = s390x, pg_catalog;
+
+--
+-- Name: packages_delete; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE packages_delete AS ON DELETE TO packages DO INSTEAD DELETE FROM public.packages p WHERE ((((p.architecture)::text = 's390x'::text) AND ((p.package)::text = (old.package)::text)) AND ((p.distribution)::text = (old.distribution)::text));
+
+
+--
+-- Name: packages_insert; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE packages_insert AS ON INSERT TO packages DO INSTEAD INSERT INTO public.packages (architecture, package, distribution, version, state, section, priority, installed_version, previous_state, state_change, notes, builder, failed, old_failed, binary_nmu_version, binary_nmu_changelog, failed_category, permbuildpri, buildpri, depends, rel, bd_problem, extra_depends, extra_conflicts, build_arch_all) VALUES ('s390x'::character varying, new.package, new.distribution, new.version, new.state, new.section, new.priority, new.installed_version, new.previous_state, new.state_change, new.notes, new.builder, new.failed, new.old_failed, new.binary_nmu_version, new.binary_nmu_changelog, new.failed_category, new.permbuildpri, new.buildpri, new.depends, new.rel, new.bd_problem, new.extra_depends, new.extra_conflicts, new.build_arch_all);
+
+
+--
+-- Name: packages_update; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE packages_update AS ON UPDATE TO packages DO INSTEAD UPDATE public.packages p SET version = new.version, state = new.state, section = new.section, priority = new.priority, installed_version = new.installed_version, previous_state = new.previous_state, state_change = new.state_change, notes = new.notes, builder = new.builder, failed = new.failed, old_failed = new.old_failed, binary_nmu_version = new.binary_nmu_version, binary_nmu_changelog = new.binary_nmu_changelog, failed_category = new.failed_category, permbuildpri = new.permbuildpri, buildpri = new.buildpri, depends = new.depends, rel = new.rel, bd_problem = new.bd_problem, extra_depends = new.extra_depends, extra_conflicts = new.extra_conflicts, build_arch_all = new.build_arch_all WHERE ((((p.architecture)::text = 's390x'::text) AND ((p.package)::text = (old.package)::text)) AND ((p.distribution)::text = (old.distribution)::text));
+
+
+--
+-- Name: pkg_history_delete; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE pkg_history_delete AS ON DELETE TO pkg_history DO INSTEAD DELETE FROM public.pkg_history p WHERE ((((((p.architecture)::text = 's390x'::text) AND ((p.package)::text = (old.package)::text)) AND ((p.distribution)::text = (old.distribution)::text)) AND (p.version OPERATOR(public.=) old.version)) AND (p."timestamp" = old."timestamp"));
+
+
+--
+-- Name: pkg_history_insert; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE pkg_history_insert AS ON INSERT TO pkg_history DO INSTEAD INSERT INTO public.pkg_history (architecture, package, distribution, version, "timestamp", result, build_time, disk_space) VALUES ('s390x'::character varying, new.package, new.distribution, new.version, new."timestamp", new.result, new.build_time, new.disk_space);
+
+
+--
+-- Name: pkg_history_update; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE pkg_history_update AS ON UPDATE TO pkg_history DO INSTEAD UPDATE public.pkg_history p SET result = new.result, build_time = new.build_time, disk_space = new.disk_space WHERE ((((((p.architecture)::text = 's390x'::text) AND ((p.package)::text = (old.package)::text)) AND ((p.distribution)::text = (old.distribution)::text)) AND (p.version OPERATOR(public.=) old.version)) AND (p."timestamp" = old."timestamp"));
+
+
+--
+-- Name: transactions_insert; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE transactions_insert AS ON INSERT TO transactions DO INSTEAD INSERT INTO public.transactions (architecture, package, distribution, version, action, prevstate, state, real_user, set_user, "time") VALUES ('s390x'::character varying, new.package, new.distribution, new.version, new.action, new.prevstate, new.state, new.real_user, new.set_user, new."time");
+
+
+--
+-- Name: users_delete; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE users_delete AS ON DELETE TO users DO INSTEAD DELETE FROM public.users u WHERE ((((u.architecture)::text = 's390x'::text) AND ((u.distribution)::text = (old.distribution)::text)) AND ((u.username)::text = (old.username)::text));
+
+
+--
+-- Name: users_insert; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE users_insert AS ON INSERT TO users DO INSTEAD INSERT INTO public.users (architecture, username, distribution, last_seen) VALUES ('s390x'::character varying, new.username, new.distribution, new.last_seen);
+
+
+--
+-- Name: users_update; Type: RULE; Schema: s390x; Owner: wbadm
+--
+
+CREATE RULE users_update AS ON UPDATE TO users DO INSTEAD UPDATE public.users u SET last_seen = new.last_seen WHERE ((((u.architecture)::text = 's390x'::text) AND ((u.distribution)::text = (old.distribution)::text)) AND ((u.username)::text = (old.username)::text));
+
+
 SET search_path = sparc, pg_catalog;
 
 --
@@ -3616,6 +3969,27 @@ GRANT USAGE ON SCHEMA armel_public TO armel;
 GRANT USAGE ON SCHEMA armel_public TO PUBLIC;
 
 
+--
+-- Name: armhf; Type: ACL; Schema: -; Owner: wbadm
+--
+
+REVOKE ALL ON SCHEMA armhf FROM PUBLIC;
+REVOKE ALL ON SCHEMA armhf FROM wbadm;
+GRANT ALL ON SCHEMA armhf TO wbadm;
+GRANT USAGE ON SCHEMA armhf TO wb_all;
+GRANT USAGE ON SCHEMA armhf TO wb_security;
+
+
+--
+-- Name: armhf_public; Type: ACL; Schema: -; Owner: wbadm
+--
+
+REVOKE ALL ON SCHEMA armhf_public FROM PUBLIC;
+REVOKE ALL ON SCHEMA armhf_public FROM wbadm;
+GRANT ALL ON SCHEMA armhf_public TO wbadm;
+GRANT USAGE ON SCHEMA armhf_public TO PUBLIC;
+
+
 --
 -- Name: hppa; Type: ACL; Schema: -; Owner: wbadm
 --
@@ -3856,6 +4230,27 @@ GRANT USAGE ON SCHEMA s390_public TO s390;
 GRANT USAGE ON SCHEMA s390_public TO PUBLIC;
 
 
+--
+-- Name: s390x; Type: ACL; Schema: -; Owner: wbadm
+--
+
+REVOKE ALL ON SCHEMA s390x FROM PUBLIC;
+REVOKE ALL ON SCHEMA s390x FROM wbadm;
+GRANT ALL ON SCHEMA s390x TO wbadm;
+GRANT USAGE ON SCHEMA s390x TO wb_all;
+GRANT USAGE ON SCHEMA s390x TO wb_security;
+
+
+--
+-- Name: s390x_public; Type: ACL; Schema: -; Owner: wbadm
+--
+
+REVOKE ALL ON SCHEMA s390x_public FROM PUBLIC;
+REVOKE ALL ON SCHEMA s390x_public FROM wbadm;
+GRANT ALL ON SCHEMA s390x_public TO wbadm;
+GRANT USAGE ON SCHEMA s390x_public TO PUBLIC;
+
+
 --
 -- Name: sparc; Type: ACL; Schema: -; Owner: wbadm
 --
@@ -4291,6 +4686,94 @@ GRANT ALL ON TABLE users TO wbadm;
 GRANT SELECT ON TABLE users TO PUBLIC;
 
 
+SET search_path = armhf, pg_catalog;
+
+--
+-- Name: packages; Type: ACL; Schema: armhf; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE packages FROM PUBLIC;
+REVOKE ALL ON TABLE packages FROM wbadm;
+GRANT ALL ON TABLE packages TO wbadm;
+GRANT SELECT ON TABLE packages TO wb_security;
+GRANT SELECT,INSERT,UPDATE ON TABLE packages TO wb_all;
+
+
+--
+-- Name: pkg_history; Type: ACL; Schema: armhf; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE pkg_history FROM PUBLIC;
+REVOKE ALL ON TABLE pkg_history FROM wbadm;
+GRANT ALL ON TABLE pkg_history TO wbadm;
+GRANT SELECT ON TABLE pkg_history TO wb_security;
+GRANT SELECT,INSERT,UPDATE ON TABLE pkg_history TO wb_all;
+
+
+--
+-- Name: transactions; Type: ACL; Schema: armhf; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE transactions FROM PUBLIC;
+REVOKE ALL ON TABLE transactions FROM wbadm;
+GRANT ALL ON TABLE transactions TO wbadm;
+GRANT SELECT ON TABLE transactions TO wb_security;
+GRANT SELECT,INSERT,UPDATE ON TABLE transactions TO wb_all;
+
+
+--
+-- Name: users; Type: ACL; Schema: armhf; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE users FROM PUBLIC;
+REVOKE ALL ON TABLE users FROM wbadm;
+GRANT ALL ON TABLE users TO wbadm;
+GRANT SELECT ON TABLE users TO wb_security;
+GRANT SELECT,INSERT,UPDATE ON TABLE users TO wb_all;
+
+
+SET search_path = armhf_public, pg_catalog;
+
+--
+-- Name: packages; Type: ACL; Schema: armhf_public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE packages FROM PUBLIC;
+REVOKE ALL ON TABLE packages FROM wbadm;
+GRANT ALL ON TABLE packages TO wbadm;
+GRANT SELECT ON TABLE packages TO PUBLIC;
+
+
+--
+-- Name: pkg_history; Type: ACL; Schema: armhf_public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE pkg_history FROM PUBLIC;
+REVOKE ALL ON TABLE pkg_history FROM wbadm;
+GRANT ALL ON TABLE pkg_history TO wbadm;
+GRANT SELECT ON TABLE pkg_history TO PUBLIC;
+
+
+--
+-- Name: transactions; Type: ACL; Schema: armhf_public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE transactions FROM PUBLIC;
+REVOKE ALL ON TABLE transactions FROM wbadm;
+GRANT ALL ON TABLE transactions TO wbadm;
+GRANT SELECT ON TABLE transactions TO PUBLIC;
+
+
+--
+-- Name: users; Type: ACL; Schema: armhf_public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE users FROM PUBLIC;
+REVOKE ALL ON TABLE users FROM wbadm;
+GRANT ALL ON TABLE users TO wbadm;
+GRANT SELECT ON TABLE users TO PUBLIC;
+
+
 SET search_path = hppa, pg_catalog;
 
 --
@@ -5135,6 +5618,17 @@ GRANT ALL ON TABLE lastlog TO wbadm;
 GRANT SELECT ON TABLE lastlog TO PUBLIC;
 
 
+--
+-- Name: locks; Type: ACL; Schema: public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE locks FROM PUBLIC;
+REVOKE ALL ON TABLE locks FROM wbadm;
+GRANT ALL ON TABLE locks TO wbadm;
+GRANT SELECT ON TABLE locks TO PUBLIC;
+GRANT UPDATE ON TABLE locks TO wb_all;
+
+
 --
 -- Name: log; Type: ACL; Schema: public; Owner: wbadm
 --
@@ -5253,6 +5747,94 @@ GRANT ALL ON TABLE users TO wbadm;
 GRANT SELECT ON TABLE users TO PUBLIC;
 
 
+SET search_path = s390x, pg_catalog;
+
+--
+-- Name: packages; Type: ACL; Schema: s390x; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE packages FROM PUBLIC;
+REVOKE ALL ON TABLE packages FROM wbadm;
+GRANT ALL ON TABLE packages TO wbadm;
+GRANT SELECT ON TABLE packages TO wb_security;
+GRANT SELECT,INSERT,UPDATE ON TABLE packages TO wb_all;
+
+
+--
+-- Name: pkg_history; Type: ACL; Schema: s390x; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE pkg_history FROM PUBLIC;
+REVOKE ALL ON TABLE pkg_history FROM wbadm;
+GRANT ALL ON TABLE pkg_history TO wbadm;
+GRANT SELECT ON TABLE pkg_history TO wb_security;
+GRANT SELECT,INSERT,UPDATE ON TABLE pkg_history TO wb_all;
+
+
+--
+-- Name: transactions; Type: ACL; Schema: s390x; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE transactions FROM PUBLIC;
+REVOKE ALL ON TABLE transactions FROM wbadm;
+GRANT ALL ON TABLE transactions TO wbadm;
+GRANT SELECT ON TABLE transactions TO wb_security;
+GRANT SELECT,INSERT,UPDATE ON TABLE transactions TO wb_all;
+
+
+--
+-- Name: users; Type: ACL; Schema: s390x; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE users FROM PUBLIC;
+REVOKE ALL ON TABLE users FROM wbadm;
+GRANT ALL ON TABLE users TO wbadm;
+GRANT SELECT ON TABLE users TO wb_security;
+GRANT SELECT,INSERT,UPDATE ON TABLE users TO wb_all;
+
+
+SET search_path = s390x_public, pg_catalog;
+
+--
+-- Name: packages; Type: ACL; Schema: s390x_public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE packages FROM PUBLIC;
+REVOKE ALL ON TABLE packages FROM wbadm;
+GRANT ALL ON TABLE packages TO wbadm;
+GRANT SELECT ON TABLE packages TO PUBLIC;
+
+
+--
+-- Name: pkg_history; Type: ACL; Schema: s390x_public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE pkg_history FROM PUBLIC;
+REVOKE ALL ON TABLE pkg_history FROM wbadm;
+GRANT ALL ON TABLE pkg_history TO wbadm;
+GRANT SELECT ON TABLE pkg_history TO PUBLIC;
+
+
+--
+-- Name: transactions; Type: ACL; Schema: s390x_public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE transactions FROM PUBLIC;
+REVOKE ALL ON TABLE transactions FROM wbadm;
+GRANT ALL ON TABLE transactions TO wbadm;
+GRANT SELECT ON TABLE transactions TO PUBLIC;
+
+
+--
+-- Name: users; Type: ACL; Schema: s390x_public; Owner: wbadm
+--
+
+REVOKE ALL ON TABLE users FROM PUBLIC;
+REVOKE ALL ON TABLE users FROM wbadm;
+GRANT ALL ON TABLE users TO wbadm;
+GRANT SELECT ON TABLE users TO PUBLIC;
+
+
 SET search_path = sparc, pg_catalog;
 
 --