./libtinymail/debian r6: * debian/patches: Removed all old dpatch patches and added use-gtkhtml3.14.diff. Also converted patch system to quilt.

Jonny Lamb jonnylamb at jonnylamb.com
Fri Jun 27 20:05:31 UTC 2008 

------------------------------------------------------------
revno: 6
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: libtinymail-0.0.8
timestamp: Thu 2008-04-03 16:48:23 +0100
message:
  * debian/patches: Removed all old dpatch patches and added use-gtkhtml3.14.diff. Also converted patch system to quilt.
removed:
  debian/patches/
  debian/patches/00list
  debian/patches/build_gtkhtml.dpatch
  debian/patches/xul-fixes.dpatch
added:
  debian/patches/
  debian/patches/series
  debian/patches/use-gtkhtml3.14.diff
modified:
  debian/changelog
  debian/control
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-04-03 15:25:54 +0000
+++ b/debian/changelog	2008-04-03 15:48:23 +0000
@@ -11,8 +11,10 @@
   * debian/copyright: Added upstream URL, authors and copyright holders.
   * Renamed /usr/bin/tny-demoui to /usr/bin/tny-demoui-1.0-0 to deal with
     SONAME changes.
+  * debian/patches: Removed all old dpatch patches and added
+    use-gtkhtml3.14.diff. Also converted patch system to quilt.
 
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Wed, 02 Apr 2008 19:08:32 +0100
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Thu, 03 Apr 2008 16:46:27 +0100
 
 libtinymail (0.0.7-0ubuntu1) hardy; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2008-02-14 18:17:17 +0000
+++ b/debian/control	2008-04-03 15:48:23 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Maemo Maintainers <pkg-maemo-maintainers at alioth.debian.org>
 Uploaders: Loic Minier <lool at dooz.org>, Jonny Lamb <jonnylamb at jonnylamb.com>, Riku Voipio <riku.voipio at iki.fi>
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5), pkg-config, libgtk2.0-dev, libgnomevfs2-dev, libgnomeui-dev, libgnome-keyring-dev, libgtkhtml3.14-dev, libnm-glib-dev, libosso-dev, libtelepathy-glib-dev, dpatch
+Build-Depends: debhelper (>= 5), pkg-config, libgtk2.0-dev, libgnomevfs2-dev, libgnomeui-dev, libgnome-keyring-dev, libgtkhtml3.14-dev, libnm-glib-dev, libosso-dev, libtelepathy-glib-dev, quilt
 Homepage: http://tinymail.org/
 
 Package: libtinymail-1.0-0

=== added directory 'debian/patches'
=== removed directory 'debian/patches'
=== removed file 'debian/patches/00list'
--- a/debian/patches/00list	2008-02-14 18:17:17 +0000
+++ b/debian/patches/00list	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-build_gtkhtml

=== removed file 'debian/patches/build_gtkhtml.dpatch'
--- a/debian/patches/build_gtkhtml.dpatch	2008-02-14 18:17:17 +0000
+++ b/debian/patches/build_gtkhtml.dpatch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_gtkhtml.dpatch by Steve Kowalik <stevenk at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set build_gtkhtml to true if we turn it on ...
-
- at DPATCH@
-diff -urNad libtinymail-0.0.6~/configure libtinymail-0.0.6/configure
---- libtinymail-0.0.6~/configure	2007-12-24 05:07:26.000000000 +1100
-+++ libtinymail-0.0.6/configure	2008-01-04 10:58:54.000000000 +1100
-@@ -24590,7 +24590,7 @@
-   gtkhtml)
- 	build_webkit=false
- 	build_mozembed=false
--	build_gtkhtml=false
-+	build_gtkhtml=true
- 	build_demoui=true
-   ;;
-   none)
-diff -urNad libtinymail-0.0.6~/configure.ac libtinymail-0.0.6/configure.ac
---- libtinymail-0.0.6~/configure.ac	2007-12-24 04:39:55.000000000 +1100
-+++ libtinymail-0.0.6/configure.ac	2008-01-04 10:58:47.000000000 +1100
-@@ -139,7 +139,7 @@
-   gtkhtml)
- 	build_webkit=false
- 	build_mozembed=false
--	build_gtkhtml=false
-+	build_gtkhtml=true
- 	build_demoui=true
-   ;;
-   none)

=== added file 'debian/patches/series'
--- a/debian/patches/series	1970-01-01 00:00:00 +0000
+++ b/debian/patches/series	2008-04-03 15:48:23 +0000
@@ -0,0 +1,1 @@
+use-gtkhtml3.14.diff

=== added file 'debian/patches/use-gtkhtml3.14.diff'
--- a/debian/patches/use-gtkhtml3.14.diff	1970-01-01 00:00:00 +0000
+++ b/debian/patches/use-gtkhtml3.14.diff	2008-04-03 15:48:23 +0000
@@ -0,0 +1,24 @@
+diff -Nru libtinymail-0.0.8.orig/configure libtinymail-0.0.8/configure
+--- libtinymail-0.0.8.orig/configure	2008-04-03 16:42:32.000000000 +0100
++++ libtinymail-0.0.8/configure	2008-04-03 16:43:29.000000000 +0100
+@@ -27107,7 +27107,7 @@
+ 
+ 
+ if test x$build_gtkhtml = xtrue; then
+-  extraplatpkgs="libgtkhtml-3.8"
++  extraplatpkgs="libgtkhtml-3.14"
+   extratnypkgs="$extratnypkgs $extraplatpkgs"
+ 
+ pkg_failed=no
+diff -Nru libtinymail-0.0.8.orig/configure.ac libtinymail-0.0.8/configure.ac
+--- libtinymail-0.0.8.orig/configure.ac	2008-04-03 16:42:31.000000000 +0100
++++ libtinymail-0.0.8/configure.ac	2008-04-03 16:44:16.000000000 +0100
+@@ -405,7 +405,7 @@
+ 
+ dnl ### libtinymailui-gtkhtml, a library that wraps the GtkHtml widget ##
+ if test x$build_gtkhtml = xtrue; then
+-  extraplatpkgs="libgtkhtml-3.8"
++  extraplatpkgs="libgtkhtml-3.14"
+   extratnypkgs="$extratnypkgs $extraplatpkgs"
+   PKG_CHECK_MODULES(LIBTINYMAILUI_GTKHTML, $extraplatpkgs glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extragtkpkgs)
+ else

=== removed file 'debian/patches/xul-fixes.dpatch'
--- a/debian/patches/xul-fixes.dpatch	2008-02-14 18:17:17 +0000
+++ b/debian/patches/xul-fixes.dpatch	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## xul-fixes.dpatch by Steve Kowalik <stevenk at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure we use the unstable gtkmozembed headers.
-
- at DPATCH@
-diff -urNad libtinymail-0.0.6~/configure libtinymail-0.0.6/configure
---- libtinymail-0.0.6~/configure	2007-12-24 05:07:26.000000000 +1100
-+++ libtinymail-0.0.6/configure	2008-01-03 11:15:39.000000000 +1100
-@@ -26358,6 +26358,7 @@
- echo "${ECHO_T}yes" >&6; }
- 	:
- fi
-+  LIBTINYMAILUI_MOZEMBED_CFLAGS="${LIBTINYMAILUI_MOZEMBED_CFLAGS} `$PKG_CONFIG --cflags --define-variable=includetype=unstable $mozilla_gtkmozembed`"
-   MOZILLA_HOME="$mozilla_home"
- 
- cat >>confdefs.h <<_ACEOF
-diff -urNad libtinymail-0.0.6~/configure.ac libtinymail-0.0.6/configure.ac
---- libtinymail-0.0.6~/configure.ac	2007-12-24 04:39:55.000000000 +1100
-+++ libtinymail-0.0.6/configure.ac	2008-01-03 11:15:23.000000000 +1100
-@@ -370,6 +370,7 @@
-   extraplatpkgs="$mozilla_xpcom $mozilla_gtkmozembed"
-   extratnypkgs="$extratnypkgs $extraplatpkgs"
-   PKG_CHECK_MODULES(LIBTINYMAILUI_MOZEMBED, $extraplatpkgs glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extragtkpkgs)
-+  LIBTINYMAILUI_MOZEMBED_CFLAGS="${LIBTINYMAILUI_MOZEMBED_CFLAGS} `$PKG_CONFIG --cflags --define-variable=includetype=unstable $mozilla_gtkmozembed`"
-   MOZILLA_HOME="$mozilla_home"
-   AC_DEFINE_UNQUOTED(MOZILLA_HOME,"$mozilla_home",["The path of the mozilla engine"])
- else

More information about the pkg-maemo-commits mailing list