Gürkan Sengün wrote:
> yes this sounds good to me, i'd make an additional dillo-light binary
> package. please try to create a patch.
 
Patch is attached. Note that it will double the package build time.
 
I had some issues building dillo with this patch if I had automake-1.7
or automake-1.8 installed. po/Makefile got a bad definition of
MKINSTALLDIRS. It built ok with only automake-1.9 installed.

-- 
see shy jo
diff --new-file -ur a/dillo-0.8.5/debian/control dillo-0.8.5/debian/control
--- a/dillo-0.8.5/debian/control        2006-01-03 17:01:14.000000000 -0500
+++ dillo-0.8.5/debian/control  2006-01-03 15:40:18.000000000 -0500
@@ -10,10 +10,25 @@
 Architecture: any
 Depends: ${shlibs:Depends}, wget
 Replaces: gzilla
-Conflicts: gzilla
+Conflicts: gzilla, dillo-light
 Provides: www-browser
 Description: Small and fast web browser
  Dillo aims to be a multiplatform browser alternative that is small, 
  stable, developer-friendly, usable, very fast, and extensible.
  .
  Homepage: http://www.dillo.org/
+
+Package: dillo-light
+Architecture: any
+Depends: ${shlibs:Depends}, wget
+Replaces: gzilla
+Conflicts: gzilla, dillo
+Provides: www-browser
+Description: Small and fast web browser, lightweight build
+ Dillo aims to be a multiplatform browser alternative that is small, 
+ stable, developer-friendly, usable, very fast, and extensible.
+ .
+ This build of dillo does not include support for fontconfig, leading to a
+ smaller disk and memory footprint, but worse support for fonts.
+ .
+ Homepage: http://www.dillo.org/
diff --new-file -ur a/dillo-0.8.5/debian/dillo-light.docs 
dillo-0.8.5/debian/dillo-light.docs
--- a/dillo-0.8.5/debian/dillo-light.docs       1969-12-31 19:00:00.000000000 
-0500
+++ dillo-0.8.5/debian/dillo-light.docs 2006-01-03 16:39:12.000000000 -0500
@@ -0,0 +1,19 @@
+README 
+AUTHORS
+dillorc
+NEWS
+doc/Cache.txt
+doc/Cookies.txt
+doc/Dillo.txt
+doc/Dw.txt
+doc/DwImage.txt
+doc/DwPage.txt
+doc/DwStyle.txt
+doc/DwTable.txt
+doc/DwWidget.txt
+doc/HtmlParser.txt
+doc/IO.txt
+doc/Images.txt
+doc/NC_design.txt
+doc/README
+doc/Selection.txt
diff --new-file -ur a/dillo-0.8.5/debian/dillo-light.menu 
dillo-0.8.5/debian/dillo-light.menu
--- a/dillo-0.8.5/debian/dillo-light.menu       1969-12-31 19:00:00.000000000 
-0500
+++ dillo-0.8.5/debian/dillo-light.menu 2006-01-03 16:39:26.000000000 -0500
@@ -0,0 +1,2 @@
+?package(dillo-light):needs="X11" section="Apps/Net"\
+ title="Dillo" command="/usr/bin/dillo"
diff --new-file -ur a/dillo-0.8.5/debian/dillo-light.postinst 
dillo-0.8.5/debian/dillo-light.postinst
--- a/dillo-0.8.5/debian/dillo-light.postinst   1969-12-31 19:00:00.000000000 
-0500
+++ dillo-0.8.5/debian/dillo-light.postinst     2006-01-03 16:37:52.000000000 
-0500
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ] ; then
+       update-alternatives --quiet --install /usr/bin/x-www-browser 
x-www-browser \
+               /usr/bin/dillo 100 \
+                --slave /usr/share/man/man1/x-www-browser.1.gz 
x-www-browser.1.gz \
+               /usr/share/man/man1/dillo.1.gz
+fi
+
+#DEBHELPER#
diff --new-file -ur a/dillo-0.8.5/debian/dillo-light.prerm 
dillo-0.8.5/debian/dillo-light.prerm
--- a/dillo-0.8.5/debian/dillo-light.prerm      1969-12-31 19:00:00.000000000 
-0500
+++ dillo-0.8.5/debian/dillo-light.prerm        2006-01-03 16:38:08.000000000 
-0500
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --quiet --remove x-www-browser /usr/bin/dillo
+        ;;
+    *)
+esac
+
+#DEBHELPER#
diff --new-file -ur a/dillo-0.8.5/debian/rules dillo-0.8.5/debian/rules
--- a/dillo-0.8.5/debian/rules  2006-01-03 17:01:14.000000000 -0500
+++ dillo-0.8.5/debian/rules    2006-01-03 16:39:50.000000000 -0500
@@ -23,10 +23,26 @@
        dh_testdir
        ./configure --prefix=/usr --sysconfdir=/etc --enable-ipv6 --enable-ssl 
--disable-tabs --enable-meta-refresh
        touch configure-stamp
+       rm -f configure-light-stamp
+
+configure-light: configure-light-stamp
+configure-light-stamp:
+       dh_testdir
+       ./configure --prefix=/usr --sysconfdir=/etc --enable-ipv6 --enable-ssl 
--disable-tabs --enable-meta-refresh --disable-anti-alias
+       touch configure-light-stamp
+       rm -f configure-stamp
+
+build-light: build-light-stamp
+build-light-stamp: configure-light
+       dh_testdir
+       $(MAKE)
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/dillo-light
+       $(MAKE) clean
+       touch build-light-stamp
 
 build: build-stamp
 
-build-stamp: configure-stamp patch-stamp
+build-stamp: patch-stamp build-light configure
        dh_testdir
        $(MAKE)
        touch build-stamp
@@ -34,7 +50,8 @@
 clean: unpatch
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
+       rm -f build-stamp configure-stamp 
+       rm -f configure-light-stamp build-light-stamp
        -$(MAKE) distclean
        -rm -f `find . -name "*~"`
        -rm -rf debian/dillo debian/files* core debian/substvars 
debian/prerm.debhelper debian/*postinst.debhelper debian/*postrm.debhelper
@@ -46,7 +63,7 @@
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_clean -k -Xdebian/dillo-light
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/dillo
 
@@ -59,15 +76,15 @@
 binary-arch: build install
        dh_testdir
        dh_testroot
-       mkdir -p debian/dillo/etc
-       $(MAKE) DESTDIR=`pwd`/debian/dillo install
        dh_installdirs
        dh_installchangelogs ChangeLog
        dh_installdocs 
        dh_installexamples
        dh_installmenu
        dh_installman debian/dillo.1
+       dh_installman -p dillo-light debian/dillo.1
        install -m 644 debian/dillo.desktop debian/dillo/usr/share/applications
+       install -m 644 debian/dillo.desktop 
debian/dillo-light/usr/share/applications
        dh_link
        dh_strip
        dh_compress

Attachment: signature.asc
Description: Digital signature

Reply via email to