diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/epiphany-1.8.pc.in (renamed from data/epiphany-1.6.pc.in) | 6 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 2 | ||||
| -rw-r--r-- | embed/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/bookmarks/Makefile.am | 2 |
9 files changed, 29 insertions, 13 deletions
@@ -1,5 +1,19 @@ 2005-03-07 Christian Persch <chpe@cvs.gnome.org> + * configure.ac: + * data/Makefile.am: + * data/epiphany-1.6.pc.in: + * data/epiphany-1.8.pc.in: + * doc/reference/tmpl/ephy-embed.sgml: + * embed/Makefile.am: + * lib/Makefile.am: + * src/Makefile.am: + * src/bookmarks/Makefile.am: + + Version 1.7.0. + +2005-03-07 Christian Persch <chpe@cvs.gnome.org> + === Release 1.6.0 === * NEWS: diff --git a/configure.ac b/configure.ac index a315fca5b..b77a7761e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License along dnl with this program; if not, write to the Free Software Foundation, Inc., dnl 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -AC_INIT([GNOME Web Browser],[1.6.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) +AC_INIT([GNOME Web Browser],[1.7.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) GNOME_COMMON_INIT @@ -24,7 +24,7 @@ AC_PREREQ([2.59]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) -EPIPHANY_MAJOR=1.6 +EPIPHANY_MAJOR=1.7 AC_SUBST([EPIPHANY_MAJOR]) AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip check-news]) @@ -591,7 +591,7 @@ dnl ************ AC_CONFIG_FILES([ Makefile data/Makefile -data/epiphany-1.6.pc +data/epiphany-1.8.pc data/glade/Makefile data/art/Makefile data/ui/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 8aca13b4f..b31975a72 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -43,7 +43,7 @@ mimepermissiondir = $(pkgdatadir) mimepermission_DATA = mime-types-permissions.xml pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = epiphany-1.6.pc +pkgconfig_DATA = epiphany-1.8.pc xsldir = $(pkgdatadir) xsl_DATA = epiphany-bookmarks-html.xsl diff --git a/data/epiphany-1.6.pc.in b/data/epiphany-1.8.pc.in index 856c03079..c2d6ec43f 100644 --- a/data/epiphany-1.6.pc.in +++ b/data/epiphany-1.8.pc.in @@ -1,9 +1,9 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/epiphany-@EPIPHANY_MAJOR@ -extensionsdir=@libdir@/epiphany-@EPIPHANY_MAJOR@/extensions -loaderdir=@libdir@/epiphany-@EPIPHANY_MAJOR@/loaders +includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@ +extensionsdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/extensions +loaderdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/loaders Name: Epiphany Browser Description: GNOME Web Browser diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index d5fd81c8d..75abf2835 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -223,6 +223,8 @@ be done by casting). @: @: @: +@: +@: @: <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### --> diff --git a/embed/Makefile.am b/embed/Makefile.am index 13bf239f9..75314e7e9 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = mozilla noinst_LTLIBRARIES = libephyembed.la libephyembedfactory.la -headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany +headerdir = $(prefix)/include/epiphany/@EPIPHANY_MAJOR@/epiphany header_DATA = \ ephy-embed-type-builtins.h \ $(INST_H_FILES) diff --git a/lib/Makefile.am b/lib/Makefile.am index 1ff986ba5..6254b9aa0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = widgets egg noinst_LTLIBRARIES = libephymisc.la -headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany +headerdir = $(prefix)/include/epiphany/@EPIPHANY_MAJOR@/epiphany header_DATA = \ ephy-lib-type-builtins.h \ $(INST_H_FILES) diff --git a/src/Makefile.am b/src/Makefile.am index a9375ff11..19be85917 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ idl_flags = -I$(LIBBONOBO_IDL) -I$(BONOBO_ACTIVATION_IDL) $(CORBA_SOURCE): $(idls) $(ORBIT_IDL) $(ORBIT_IDL) $(idl_flags) $(idls) -headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany +headerdir = $(prefix)/include/epiphany/@EPIPHANY_MAJOR@/epiphany header_DATA = \ ephy-type-builtins.h \ $(INST_H_FILES) @@ -102,8 +102,8 @@ libephymain_la_CPPFLAGS = \ -I$(top_srcdir)/lib/egg \ -I$(top_srcdir)/lib/widgets \ -I$(top_srcdir)/src/bookmarks \ - -DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" \ - -DLOADER_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/loaders"\" \ + -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ + -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ -DDATADIR=\""$(datadir)"\" \ $(AM_CPPFLAGS) diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am index e5f286ea7..e222a9f98 100644 --- a/src/bookmarks/Makefile.am +++ b/src/bookmarks/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libephybookmarks.la -headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany +headerdir = $(prefix)/include/epiphany/@EPIPHANY_MAJOR@/epiphany header_DATA = \ ephy-bookmarks-type-builtins.h \ $(INST_H_FILES) |