[vala/staging: 1/2] vapi: Follow GTK upstream rename to gtk4 and gtk4-unix-print

[Rico Tzschichholz <ricotz src gnome org>]

commit ba47fa6cfe33e46d6ab548a0cce34593644de198
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Feb 6 09:12:17 2019 +0100

    vapi: Follow GTK upstream rename to gtk4 and gtk4-unix-print

 vapi/Makefile.am                                     | 20 ++++++++++----------
 vapi/gtk+-unix-print-4.0.deps                        |  2 --
 vapi/gtk4-unix-print.deps                            |  2 ++
 ...gtk+-unix-print-4.0.vapi => gtk4-unix-print.vapi} |  2 +-
 vapi/{gtk+-4.0.deps => gtk4.deps}                    |  0
 vapi/{gtk+-4.0.vapi => gtk4.vapi}                    |  2 +-
 .../gtk+-unix-print-4.0/gtk+-unix-print-4.0.deps     |  2 --
 .../gtk4-unix-print-custom.vala}                     |  0
 .../gtk4-unix-print.defines}                         |  0
 vapi/packages/gtk4-unix-print/gtk4-unix-print.deps   |  2 ++
 .../gtk4-unix-print.excludes}                        |  0
 .../gtk4-unix-print.files}                           |  0
 .../gtk4-unix-print.gi}                              |  0
 .../gtk4-unix-print.metadata}                        |  0
 .../gtk4-unix-print.namespace}                       |  0
 15 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index a04cada15..414944dcc 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -128,14 +128,14 @@ dist_vapi_DATA = \
        gtk+-2.0.vapi \
        gtk+-3.0.deps \
        gtk+-3.0.vapi \
-       gtk+-4.0.deps \
-       gtk+-4.0.vapi \
        gtk+-unix-print-2.0.deps \
        gtk+-unix-print-2.0.vapi \
        gtk+-unix-print-3.0.deps \
        gtk+-unix-print-3.0.vapi \
-       gtk+-unix-print-4.0.deps \
-       gtk+-unix-print-4.0.vapi \
+       gtk4.deps \
+       gtk4.vapi \
+       gtk4-unix-print.deps \
+       gtk4-unix-print.vapi \
        gtkmozembed.deps \
        gtkmozembed.vapi \
        gtksourceview-2.0.deps \
@@ -291,7 +291,7 @@ GIDL_BINDINGS = \
        gtk+-2.0 \
        gtk+-unix-print-2.0 \
        gtk+-unix-print-3.0 \
-       gtk+-unix-print-4.0 \
+       gtk4-unix-print \
        gtksourceview-2.0 \
        hildon-1 \
        hildon-fm-2 \
@@ -356,7 +356,7 @@ GIR_BINDINGS = \
        goocanvas-2.0 \
        graphene-1.0 \
        gtk+-3.0 \
-       gtk+-4.0 \
+       gtk4 \
        gudev-1.0 \
        javascriptcoregtk-4.0 \
        json-glib-1.0 \
@@ -565,8 +565,8 @@ gtk+-2.0:
 gtk+-3.0:
        $(GENVAPI) --library $(srcdir)/gtk+-3.0 --pkg atk --pkg gdk-3.0 --pkg gdk-pixbuf-2.0 --pkg gio-2.0 
--pkg pango --pkg cairo --metadatadir $(METADATADIR) $(METADATADIR)/Gtk-3.0-custom.vala $(GIRDIR)/Gtk-3.0.gir
 
-gtk+-4.0:
-       $(GENVAPI) --library $(srcdir)/gtk+-4.0 --pkg atk --pkg cairo --pkg gdk-pixbuf-2.0 --pkg gio-2.0 
--pkg graphene-1.0 --pkg pango --pkg x11 \
+gtk4:
+       $(GENVAPI) --library $(srcdir)/gtk4 --pkg atk --pkg cairo --pkg gdk-pixbuf-2.0 --pkg gio-2.0 --pkg 
graphene-1.0 --pkg pango --pkg x11 \
                --metadatadir $(METADATADIR) \
                $(METADATADIR)/GdkX11-4.0-custom.vala $(GIRDIR)/GdkX11-4.0.gir \
                $(METADATADIR)/Gdk-4.0-custom.vala $(GIRDIR)/Gdk-4.0.gir \
@@ -579,8 +579,8 @@ gtk+-unix-print-2.0:
 gtk+-unix-print-3.0:
        $(GENVAPI) --library $(srcdir)/gtk+-unix-print-3.0 
$(PACKAGESDIR)/gtk+-unix-print-3.0/gtk+-unix-print-3.0-custom.vala 
$(PACKAGESDIR)/gtk+-unix-print-3.0/gtk+-unix-print-3.0.gi
 
-gtk+-unix-print-4.0:
-       $(GENVAPI) --library $(srcdir)/gtk+-unix-print-4.0 
$(PACKAGESDIR)/gtk+-unix-print-4.0/gtk+-unix-print-4.0-custom.vala 
$(PACKAGESDIR)/gtk+-unix-print-4.0/gtk+-unix-print-4.0.gi
+gtk4-unix-print:
+       $(GENVAPI) --library $(srcdir)/gtk4-unix-print 
$(PACKAGESDIR)/gtk4-unix-print/gtk4-unix-print-custom.vala $(PACKAGESDIR)/gtk4-unix-print/gtk4-unix-print.gi
 
 gtksourceview-2.0:
        $(GENVAPI) --library $(srcdir)/gtksourceview-2.0 $(PACKAGESDIR)/gtksourceview-2.0/gtksourceview-2.0.gi
diff --git a/vapi/gtk4-unix-print.deps b/vapi/gtk4-unix-print.deps
new file mode 100644
index 000000000..18af01f95
--- /dev/null
+++ b/vapi/gtk4-unix-print.deps
@@ -0,0 +1,2 @@
+cairo
+gtk4
diff --git a/vapi/gtk+-unix-print-4.0.vapi b/vapi/gtk4-unix-print.vapi
similarity index 98%
rename from vapi/gtk+-unix-print-4.0.vapi
rename to vapi/gtk4-unix-print.vapi
index 0fbe2fd93..777de188c 100644
--- a/vapi/gtk+-unix-print-4.0.vapi
+++ b/vapi/gtk4-unix-print.vapi
@@ -1,4 +1,4 @@
-/* gtk+-unix-print-4.0.vapi generated by vapigen, do not modify. */
+/* gtk4-unix-print.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gtk", gir_namespace = "Gtk", gir_version = "4.0", lower_case_cprefix = "gtk_")]
 namespace Gtk {
diff --git a/vapi/gtk+-4.0.deps b/vapi/gtk4.deps
similarity index 100%
rename from vapi/gtk+-4.0.deps
rename to vapi/gtk4.deps
diff --git a/vapi/gtk+-4.0.vapi b/vapi/gtk4.vapi
similarity index 99%
rename from vapi/gtk+-4.0.vapi
rename to vapi/gtk4.vapi
index 960b0791a..7a8dc292e 100644
--- a/vapi/gtk+-4.0.vapi
+++ b/vapi/gtk4.vapi
@@ -1,4 +1,4 @@
-/* gtk+-4.0.vapi generated by vapigen, do not modify. */
+/* gtk4.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gdk", gir_namespace = "Gdk", gir_version = "4.0", lower_case_cprefix = "gdk_")]
 namespace Gdk {
diff --git a/vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0-custom.vala 
b/vapi/packages/gtk4-unix-print/gtk4-unix-print-custom.vala
similarity index 100%
rename from vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0-custom.vala
rename to vapi/packages/gtk4-unix-print/gtk4-unix-print-custom.vala
diff --git a/vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.defines 
b/vapi/packages/gtk4-unix-print/gtk4-unix-print.defines
similarity index 100%
rename from vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.defines
rename to vapi/packages/gtk4-unix-print/gtk4-unix-print.defines
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print.deps 
b/vapi/packages/gtk4-unix-print/gtk4-unix-print.deps
new file mode 100644
index 000000000..18af01f95
--- /dev/null
+++ b/vapi/packages/gtk4-unix-print/gtk4-unix-print.deps
@@ -0,0 +1,2 @@
+cairo
+gtk4
diff --git a/vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.excludes 
b/vapi/packages/gtk4-unix-print/gtk4-unix-print.excludes
similarity index 100%
rename from vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.excludes
rename to vapi/packages/gtk4-unix-print/gtk4-unix-print.excludes
diff --git a/vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.files 
b/vapi/packages/gtk4-unix-print/gtk4-unix-print.files
similarity index 100%
rename from vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.files
rename to vapi/packages/gtk4-unix-print/gtk4-unix-print.files
diff --git a/vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.gi 
b/vapi/packages/gtk4-unix-print/gtk4-unix-print.gi
similarity index 100%
rename from vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.gi
rename to vapi/packages/gtk4-unix-print/gtk4-unix-print.gi
diff --git a/vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.metadata 
b/vapi/packages/gtk4-unix-print/gtk4-unix-print.metadata
similarity index 100%
rename from vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.metadata
rename to vapi/packages/gtk4-unix-print/gtk4-unix-print.metadata
diff --git a/vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.namespace 
b/vapi/packages/gtk4-unix-print/gtk4-unix-print.namespace
similarity index 100%
rename from vapi/packages/gtk+-unix-print-4.0/gtk+-unix-print-4.0.namespace
rename to vapi/packages/gtk4-unix-print/gtk4-unix-print.namespace