summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2010-12-30 01:50:14 +0900
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2010-12-30 01:50:14 +0900
commitb176a4395f0f7596fe2430551bc2b4bc9baa1f6c (patch)
tree63c54764dfb12026ce12fe5b8cd194828764227a
parentecabb8754542fa993a6812ff33f4b29e804da136 (diff)
downloadglade-b176a4395f0f7596fe2430551bc2b4bc9baa1f6c.tar.gz
* Fixing distcheck, bumping version to 3.9.0
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac5
-rw-r--r--doc/gladeui.types1
-rw-r--r--gladeui/glade-previewer.rc.in29
-rw-r--r--po/POTFILES.in7
-rw-r--r--po/POTFILES.skip2
-rw-r--r--src/glade.rc.in2
7 files changed, 40 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 89e2ff8c..2e7e75b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
* Whole tree updated to remove all notion of project conversions and dual project formats,
no more libglade.
+ * Fixing distcheck, bumping version to 3.9.0
+
2010-12-28 Tristan Van Berkom <tristanvb@openismus.com>
* gladeui/Makefile.am, gladeui/glade.h, gladeui/glade-clipboard.c, gladeui/glade-app.[ch],
diff --git a/configure.ac b/configure.ac
index aae375f2..88ce38f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
m4_define(glade_major_version, 3)
-m4_define(glade_minor_version, 7)
-m4_define(glade_micro_version, 1)
+m4_define(glade_minor_version, 9)
+m4_define(glade_micro_version, 0)
m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
AC_INIT([glade], [glade_version],
@@ -263,6 +263,7 @@ data/icons/hicolor/scalable/Makefile
data/icons/hicolor/scalable/apps/Makefile
gladeui/Makefile
gladeui/gladeui.rc
+gladeui/glade-previewer.rc
src/Makefile
src/glade.rc
plugins/Makefile
diff --git a/doc/gladeui.types b/doc/gladeui.types
index 7a694e5e..8a2e72b6 100644
--- a/doc/gladeui.types
+++ b/doc/gladeui.types
@@ -2,7 +2,6 @@
glade_app_get_type
glade_clipboard_get_type
-glade_clipboard_view_get_type
glade_command_get_type
glade_editor_get_type
glade_editor_property_get_type
diff --git a/gladeui/glade-previewer.rc.in b/gladeui/glade-previewer.rc.in
new file mode 100644
index 00000000..ba6faba6
--- /dev/null
+++ b/gladeui/glade-previewer.rc.in
@@ -0,0 +1,29 @@
+#include <winver.h>
+
+GLADE_ICON ICON "../data/icons/glade-3.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0
+ PRODUCTVERSION @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "CompanyName", "The GNOME Foundation"
+ VALUE "FileDescription", "Glade Interface Designer @GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
+ VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
+ VALUE "LegalCopyright", "Copyright © 2007 The GNOME Foundation"
+ VALUE "OriginalFilename", "glade-previewer.exe"
+ VALUE "ProductName", "Glade Interface Designer"
+ VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+ END
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9458df0f..6465e0f8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
# Main application
-data/glade-3.desktop.in.in
+data/glade.desktop.in.in
src/main.c
src/glade-close-button.c
src/glade-window.c
@@ -11,9 +11,11 @@ src/glade-window.c
# libgladeui shared core library
gladeui/glade-app.c
gladeui/glade-builtins.c
+gladeui/glade-design-layout.c
+gladeui/glade-design-view.c
+gladeui/glade-previewer.c
gladeui/glade-base-editor.c
gladeui/glade-catalog.c
-gladeui/glade-clipboard-view.c
gladeui/glade-clipboard.c
gladeui/glade-command.c
gladeui/glade-cursor.c
@@ -41,7 +43,6 @@ gladeui/glade-named-icon-chooser-dialog.c
gladeui/icon-naming-spec.c
# gtk plugin backend
-plugins/gtk+/glade-convert.c
plugins/gtk+/glade-attributes.c
plugins/gtk+/glade-gtk.c
plugins/gtk+/glade-accels.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 7946cb24..29964b99 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1 @@
-data/glade-3.desktop.in
+data/glade.desktop.in
diff --git a/src/glade.rc.in b/src/glade.rc.in
index d45c864f..c115c478 100644
--- a/src/glade.rc.in
+++ b/src/glade.rc.in
@@ -16,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO
VALUE "FileDescription", "Glade Interface Designer @GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
VALUE "LegalCopyright", "Copyright © 2007 The GNOME Foundation"
- VALUE "OriginalFilename", "glade-3.exe"
+ VALUE "OriginalFilename", "glade.exe"
VALUE "ProductName", "Glade Interface Designer"
VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
END