r21526 - in /desktop/experimental/epiphany-webkit/debian: ./ patches/

kov at users.alioth.debian.org kov at users.alioth.debian.org
Thu Sep 24 21:02:11 UTC 2009 

Author: kov
Date: Thu Sep 24 21:02:11 2009
New Revision: 21526

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21526
Log:
Removing rebranding, taking over epiphany-browser

Added:
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.dirs
      - copied unchanged from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.dirs
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.docs
      - copied unchanged from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.docs
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.gconf-defaults
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.links
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.links
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-dbg.links
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dbg.links
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.dirs
      - copied unchanged from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dev.dirs
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.links
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dev.links
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.README.Debian
      - copied unchanged from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.README.Debian
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.install
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.install
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.links
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.links
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.menu
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.menu
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.postinst
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.postinst
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.prerm
      - copied, changed from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.prerm
Removed:
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.dirs
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.docs
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.links
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.postrm
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.preinst
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dbg.links
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dev.dirs
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dev.links
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.README.Debian
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.install
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.links
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.menu
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.postinst
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.postrm
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.preinst
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.prerm
    desktop/experimental/epiphany-webkit/debian/icons.tar.uu
    desktop/experimental/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch
    desktop/experimental/epiphany-webkit/debian/patches/15_webkit_temporary_gettext_domain_rename.patch
Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/control.in
    desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch
    desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch
    desktop/experimental/epiphany-webkit/debian/patches/series
    desktop/experimental/epiphany-webkit/debian/rules

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,4 +1,4 @@
-epiphany-webkit (2.28.0-1) UNRELEASED; urgency=low
+epiphany-browser (2.28.0-1) UNRELEASED; urgency=low
 
   * New upstream release
   * debian/patches/10_smart_bookmarks.patch:
@@ -14,7 +14,17 @@
   * debian/patches/99_autoreconf.patch:
   - refreshed
 
- -- Gustavo Noronha Silva <kov at debian.org>  Thu, 24 Sep 2009 16:17:39 -0300
+  == Changes related to the temporary WebKit branding ==
+
+  * debian/patches/00_browser_wrapper_path.patch,
+    debian/patches/02_ac_init.patch:
+  - rename epiphany-webkit -> epiphany-browser, now that we are taking
+    over
+  * debian/patches/14_webkit_temporary_gconf_rename.patch,
+    debian/patches/15_webkit_temporary_gettext_domain_rename.patch:
+  - dropping temporary -webkit namespace for gconf and gettext
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Thu, 24 Sep 2009 16:45:07 -0300
 
 epiphany-webkit (2.27.92-3) experimental; urgency=low
 

Modified: desktop/experimental/epiphany-webkit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/control.in?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/control.in [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,4 +1,4 @@
-Source: epiphany-webkit
+Source: epiphany-browser
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
@@ -42,21 +42,21 @@
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-webkit/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/epiphany-webkit/
 
-Package: epiphany-webkit
+Package: epiphany-browser
 Architecture: any
-Depends: epiphany-webkit-data (>= ${gnome:Version}),
-         epiphany-webkit-data (<< ${gnome:NextVersion}),
+Depends: epiphany-browser-data (>= ${gnome:Version}),
+         epiphany-browser-data (<< ${gnome:NextVersion}),
          ${shlibs:Depends},
          gnome-icon-theme (>= 2.9.90),
          dbus-x11,
          iso-codes,
          ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20),
+Conflicts: epiphany-webkit, epiphany-gecko
            epiphany-extensions (<< 2.22.1-3)
 Recommends: yelp
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser
-Description: Intuitive GNOME web browser - WebKitGTK+ version
+Description: Intuitive GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards
  compliance. Simplicity is achieved by a well designed user interface
@@ -66,15 +66,13 @@
  WebKitGTK+ rendering engine; and on the user interface side by
  closely following the GNOME Human Interface Guidelines (HIG) and by
  close integration with the GNOME desktop.
- .
- This version uses the WebKitGTK+ backend to render web pages.
 
-Package: epiphany-webkit-data
+Package: epiphany-browser-data
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: epiphany-webkit
-Conflicts: epiphany-browser (<< 2.20)
-Replaces: epiphany-browser (<< 2.20)
+Recommends: epiphany-browser
+Conflicts: epiphany-browser (<< 2.20), epiphany-webkit-data
+Replaces: epiphany-browser (<< 2.20), epiphany-webkit-data
 Description: Data files for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards
@@ -83,11 +81,11 @@
  This package contains the common files, artwork and translations for
  Epiphany.
 
-Package: epiphany-webkit-dev
+Package: epiphany-browser-dev
 Architecture: all
 Section: devel
-Depends: epiphany-webkit (>= ${binary:Version}),
-         epiphany-webkit-data (= ${source:Version}),
+Depends: epiphany-browser (>= ${binary:Version}),
+         epiphany-browser-data (= ${source:Version}),
          libgtk2.0-dev (>= 2.16.0),
          libwebkit-dev
 Conflicts: epiphany-browser-dev
@@ -98,11 +96,11 @@
  .
  This package is required to develop extensions for Epiphany/WebKitGTK+.
 
-Package: epiphany-webkit-dbg
+Package: epiphany-browser-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: epiphany-webkit (= ${binary:Version})
+Depends: epiphany-browser (= ${binary:Version})
 Recommends: libwebkit-1.0-2-dbg
 Description: Debugging symbols for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.gconf-defaults (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.gconf-defaults?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.gconf-defaults [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,3 +1,3 @@
-/apps/epiphany-webkit/general/homepage http://www.debian.org/
-/apps/epiphany-webkit/web/language [system]
-/apps/epiphany-webkit/web/autodetect_encoding universal_charset_detector
+/apps/epiphany/general/homepage http://www.debian.org/
+/apps/epiphany/web/language [system]
+/apps/epiphany/web/autodetect_encoding universal_charset_detector

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.links (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.links?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.links [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.links [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,1 +1,1 @@
-/etc/gnome/epiphany/webkit-mime-types-permissions.xml /usr/share/epiphany-webkit/mime-types-permissions.xml
+/etc/gnome/epiphany/mime-types-permissions.xml /usr/share/epiphany-browser/mime-types-permissions.xml

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser-dbg.links (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dbg.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser-dbg.links?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dbg.links [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser-dbg.links [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,1 +1,1 @@
-/usr/share/doc/epiphany-webkit-data/changelog.gz /usr/share/doc/epiphany-webkit-dbg/changelog.gz
+/usr/share/doc/epiphany-browser-data/changelog.gz /usr/share/doc/epiphany-browser-dbg/changelog.gz

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.links (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dev.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.links?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dev.links [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.links [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,1 +1,1 @@
-/usr/share/doc/epiphany-webkit/changelog.gz /usr/share/doc/epiphany-webkit-dev/changelog.gz
+/usr/share/doc/epiphany-browser/changelog.gz /usr/share/doc/epiphany-browser-dev/changelog.gz

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser.install (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser.install?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit.install [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser.install [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,2 +1,2 @@
 debian/epiphany.sh /usr/bin/
-debian/bug/control /usr/share/bug/epiphany-webkit/
+debian/bug/control /usr/share/bug/epiphany-browser/

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser.links (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser.links?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit.links [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser.links [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,2 +1,2 @@
-/usr/share/man/man1/epiphany-webkit.1.gz /usr/share/man/man1/epiphany.1.gz
-/usr/share/doc/epiphany-webkit-data/changelog.gz /usr/share/doc/epiphany-webkit/changelog.gz
+/usr/share/man/man1/epiphany-browser.1.gz /usr/share/man/man1/epiphany.1.gz
+/usr/share/doc/epiphany-browser-data/changelog.gz /usr/share/doc/epiphany-browser/changelog.gz

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser.menu (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.menu)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser.menu?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit.menu [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser.menu [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,6 +1,6 @@
-?package(epiphany-webkit):needs="x11" \
+?package(epiphany-browser):needs="x11" \
 	section="Applications/Network/Web Browsing" \
-	title="Epiphany web browser (WebKitGTK+)" \
-	longtitle="Epiphany web browser with WebKitGTK+ backend" \
-	command="/usr/bin/epiphany-webkit" \
+	title="Epiphany web browser" \
+	longtitle="Epiphany web browser" \
+	command="/usr/bin/epiphany-browser" \
 	hints="Web browsers"

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser.postinst (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.postinst)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser.postinst?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit.postinst [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser.postinst [utf-8] Thu Sep 24 21:02:11 2009
@@ -1,12 +1,11 @@
 #!/bin/sh
 set -e
 
-PRIO=80
+PRIO=85
 for alt in x-www-browser gnome-www-browser; do
     update-alternatives --install \
-        /usr/bin/$alt $alt /usr/bin/epiphany-webkit $PRIO \
-            --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-webkit.1.gz
+        /usr/bin/$alt $alt /usr/bin/epiphany-browser $PRIO \
+            --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-browser.1.gz
 done
-update-alternatives --install /usr/bin/epiphany-browser epiphany-browser /usr/bin/epiphany-webkit $PRIO
 
 #DEBHELPER#

Copied: desktop/experimental/epiphany-webkit/debian/epiphany-browser.prerm (from r21516, desktop/experimental/epiphany-webkit/debian/epiphany-webkit.prerm)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-browser.prerm?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit.prerm [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-browser.prerm [utf-8] Thu Sep 24 21:02:11 2009
@@ -2,7 +2,7 @@
 set -e
  
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
-    for alt in epiphany-browser x-www-browser gnome-www-browser; do
+    for alt in x-www-browser gnome-www-browser; do
 	update-alternatives --remove $alt /usr/bin/epiphany-webkit
     done
 fi

Modified: desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch [utf-8] Thu Sep 24 21:02:11 2009
@@ -7,7 +7,7 @@
  _GenericName=Web Bookmarks
  _Comment=Browse and organize your bookmarks
 -Exec=epiphany --bookmarks-editor
-+Exec=epiphany-webkit --bookmarks-editor
++Exec=epiphany-browser --bookmarks-editor
  StartupNotify=true
  Terminal=false
  Type=Application
@@ -20,28 +20,15 @@
  _Name=Epiphany
  _GenericName=Web Browser
 -_X-GNOME-FullName=Epiphany Web Browser
-+_X-GNOME-FullName=Epiphany Web Browser (WebKit)
++_X-GNOME-FullName=Epiphany Web Browser
  _Comment=Browse the web
 -Exec=epiphany %U
-+Exec=epiphany-webkit %U
++Exec=epiphany-browser %U
  StartupNotify=true
  Terminal=false
  Type=Application
 -Icon=gnome-web-browser
-+Icon=epiphany-webkit
++Icon=gnome-web-browser
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=epiphany
  X-GNOME-Bugzilla-Component=BugBuddyBugs
-Index: epiphany-webkit-2.27.92/lib/ephy-stock-icons.h
-===================================================================
---- epiphany-webkit-2.27.92.orig/lib/ephy-stock-icons.h	2009-08-26 10:26:28.000000000 -0300
-+++ epiphany-webkit-2.27.92/lib/ephy-stock-icons.h	2009-09-09 18:56:59.222409973 -0300
-@@ -26,7 +26,7 @@
- 
- G_BEGIN_DECLS
- 
--#define EPHY_STOCK_EPHY            "gnome-web-browser"
-+#define EPHY_STOCK_EPHY            "epiphany-webkit"
- 
- /* Custom Epiphany named icons */
- #define EPHY_STOCK_POPUPS          "popup-hidden"

Modified: desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch [utf-8] Thu Sep 24 21:02:11 2009
@@ -7,7 +7,7 @@
  m4_define([epiphany_branch],["branches/gnome-2-24"])
  
 -AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
-+AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-webkit])
++AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
  
  AC_PREREQ([2.59])
  

Modified: desktop/experimental/epiphany-webkit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/series?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/series [utf-8] Thu Sep 24 21:02:11 2009
@@ -6,7 +6,5 @@
 07_bookmarks.patch
 10_smart_bookmarks.patch
 12_safetypes.patch
-14_webkit_temporary_gconf_rename.patch
-15_webkit_temporary_gettext_domain_rename.patch
 99_autoreconf.patch
 99_ltmain_as-needed.patch

Modified: desktop/experimental/epiphany-webkit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/rules?rev=21526&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/rules [utf-8] Thu Sep 24 21:02:11 2009
@@ -49,7 +49,7 @@
 endif
 
 webkit_configure_flags := $(common_configure_flags) \
-		--libexecdir=\$${prefix}/lib/epiphany-webkit \
+		--libexecdir=\$${prefix}/lib/epiphany-browser \
 		--enable-gtk-doc \
 		--enable-spell-checker
 
@@ -77,7 +77,7 @@
 	echo=/bin/echo $(MAKE) -C $(builddir)
 	touch $@
 
-installdir = $(CURDIR)/debian/epiphany-$*
+installdir = $(CURDIR)/debian/epiphany-browser
 
 install-clean:
 	dh_testdir
@@ -93,47 +93,25 @@
 
 install: install-clean $(addprefix install-, $(FLAVORS))
 	dh_installdirs
-	mv debian/epiphany-webkit/usr/include debian/epiphany-webkit-dev/usr/
-	mv debian/epiphany-webkit/usr/lib/pkgconfig debian/epiphany-webkit-dev/usr/lib/
-	cd debian/epiphany-webkit/usr/share && \
-		mv aclocal gtk-doc $(CURDIR)/debian/epiphany-webkit-dev/usr/share/
-	mv debian/epiphany-webkit/etc/* debian/epiphany-webkit-data/etc
-	rmdir debian/epiphany-webkit/etc
-	mv debian/epiphany-webkit/usr/share debian/epiphany-webkit-data/usr/
-	cd debian/epiphany-webkit-data/usr/share/epiphany-webkit && \
-		mv mime-types-permissions.xml $(CURDIR)/debian/epiphany-webkit-data/etc/gnome/epiphany/webkit-mime-types-permissions.xml
-	cd debian/epiphany-webkit-data/usr/share/man/man1 && \
-		mv epiphany.1 epiphany-webkit.1
+	mv debian/epiphany-browser/usr/include debian/epiphany-browser-dev/usr/
+	mv debian/epiphany-browser/usr/lib/pkgconfig debian/epiphany-browser-dev/usr/lib/
+	cd debian/epiphany-browser/usr/share && \
+		mv aclocal gtk-doc $(CURDIR)/debian/epiphany-browser-dev/usr/share/
+	mv debian/epiphany-browser/etc/* debian/epiphany-browser-data/etc
+	rmdir debian/epiphany-browser/etc
+	mv debian/epiphany-browser/usr/share debian/epiphany-browser-data/usr/
+	cd debian/epiphany-browser-data/usr/share/epiphany-browser && \
+		mv mime-types-permissions.xml $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/mime-types-permissions.xml
+	cd debian/epiphany-browser-data/usr/share/man/man1 && \
+		mv epiphany.1 epiphany-browser.1
 	# Correct help file paths
-	cd debian/epiphany-webkit-data/usr/share/omf && mv epiphany epiphany-webkit
-	cd debian/epiphany-webkit-data/usr/share/gnome/help && mv epiphany epiphany-webkit
-	find debian/epiphany-webkit-data/usr/share/omf/epiphany-webkit/ \
-		-name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-webkit/#' {} \;
-	# Make both epiphanies installable together
+	cd debian/epiphany-browser-data/usr/share/omf && mv epiphany epiphany-browser
+	cd debian/epiphany-browser-data/usr/share/gnome/help && mv epiphany epiphany-browser
+	find debian/epiphany-browser-data/usr/share/omf/epiphany-browser/ \
+		-name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-browser/#' {} \;
 	dh_install
-	cd debian/epiphany-webkit-data/etc/gconf/schemas && \
-		mv epiphany.schemas epiphany-webkit.schemas && \
-		mv epiphany-lockdown.schemas epiphany-webkit-lockdown.schemas
-	cd debian/epiphany-webkit-data/usr/share/applications && \
-		mv epiphany.desktop epiphany-webkit.desktop && \
-		mv bme.desktop bme-webkit.desktop
-	cd debian/epiphany-webkit/usr/bin && \
+	cd debian/epiphany-browser/usr/bin && \
 		mv epiphany.sh epiphany
-
-	# "Rebranding"
-	mkdir debian/icons
-	uudecode -o - debian/icons.tar.uu | tar -xp -C debian/icons
-	for size in 16x16 22x22 24x24 32x32; do \
-		install -m 644 -o root -g root \
-			debian/icons/hicolor_apps_$${size}_epiphany-webkit.png \
-			debian/epiphany-webkit-data/usr/share/icons/hicolor/$${size}/apps/epiphany-webkit.png; \
-		install -m 644 -o root -g root \
-			debian/icons/hicolor_apps_$${size}_epiphany-webkit.svg \
-			debian/epiphany-webkit-data/usr/share/icons/hicolor/$${size}/apps/epiphany-webkit.svg; \
-	done
-	install -m 644 -o root -g root \
-		debian/icons/hicolor_apps_scalable_epiphany-webkit.svg \
-		debian/epiphany-webkit-data/usr/share/icons/hicolor/scalable/epiphany-webkit.svg
 
 clean::
 	dh_testdir
@@ -151,8 +129,8 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs -pepiphany-webkit-data ChangeLog
-	dh_installchangelogs -i -Nepiphany-webkit-data
+	dh_installchangelogs -pepiphany-browser-data ChangeLog
+	dh_installchangelogs -i -Nepiphany-browser-data
 	dh_installdocs -i
 	dh_installman -i
 	dh_installmenu -i
@@ -178,7 +156,7 @@
 	dh_scrollkeeper -a
 	dh_gconf -a
 	dh_desktop -a
-	dh_strip -a --dbg-package=epiphany-webkit-dbg
+	dh_strip -a --dbg-package=epiphany-browser-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a

More information about the pkg-gnome-commits mailing list