← Back to branch summary

~ubuntu-branches/ubuntu/hardy/evince/hardy

« back to all changes in this revision

Viewing changes to debian/patches/02_autoconf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-11-27 22:31:42 UTC
  • mfrom: (1.1.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20071127223142-v41zyp2ulj6g22n6
Tags: 2.20.2-1ubuntu1
* Sync with Debian
* debian/control.in:
  - Depends on ghostscript-x
  - updated Build-Depends for lpi and hildon changes
  - updated maintainer informationx
* debian/patches/01_launchpad.patch:
  - launchpad integration changes
* debian/patches/03_hildon_interface.patch
  Adds support for Hildon interface with including:
  - Registration of the program into the hildon enviromment.
  - D-bus processing via ossolib.
  - Changed selection and button event handling to match Hildon model.
  - Changes in accelerators handling Zoom, Fullscreen and Presentation
    modes.
  - Uses Hildon chooser dialog.
  - Selects the Hildon interface definition file when in Hildon mode.
  - If the arch is not lpia, the standard gtk interface is used.
  - Fixes interface rendering problem when compiled for lpia.
  - Adjusted the Makefile.am files to include the Hildon interface
    options and interface file evince-hildon-ui.xml.
* debian/patches/99_autoreconf.patch:
  - updated
* debian/rules:
  - do not remove the documentation
  - use the hildon configure option during the lpia build

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_autoconf.patch
1
 
diff -Nur evince-2.20.0/configure evince-2.20.0.new/configure
2
 
--- evince-2.20.0/configure     2007-09-17 18:34:36.000000000 +0200
3
 
+++ evince-2.20.0.new/configure 2007-09-17 23:05:23.000000000 +0200
4
 
@@ -24801,12 +24801,12 @@
5
 
         pkg_cv_SHELL_CORE_CFLAGS="$SHELL_CORE_CFLAGS"
6
 
     else
7
 
         if test -n "$PKG_CONFIG" && \
8
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= \$KEYRING_REQUIRED\"") >&5
9
 
-  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED") 2>&5
10
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED launchpad-integration gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= \$KEYRING_REQUIRED\"") >&5
11
 
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED") 2>&5
12
 
   ac_status=$?
13
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
14
 
   (exit $ac_status); }; then
15
 
-  pkg_cv_SHELL_CORE_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED" 2>/dev/null`
16
 
+  pkg_cv_SHELL_CORE_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED" 2>/dev/null`
17
 
 else
18
 
   pkg_failed=yes
19
 
 fi
20
 
@@ -24819,12 +24819,12 @@
21
 
         pkg_cv_SHELL_CORE_LIBS="$SHELL_CORE_LIBS"
22
 
     else
23
 
         if test -n "$PKG_CONFIG" && \
24
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= \$KEYRING_REQUIRED\"") >&5
25
 
-  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED") 2>&5
26
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED launchpad-integration gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= \$KEYRING_REQUIRED\"") >&5
27
 
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED") 2>&5
28
 
   ac_status=$?
29
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
30
 
   (exit $ac_status); }; then
31
 
-  pkg_cv_SHELL_CORE_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED" 2>/dev/null`
32
 
+  pkg_cv_SHELL_CORE_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED" 2>/dev/null`
33
 
 else
34
 
   pkg_failed=yes
35
 
 fi
36
 
@@ -24843,14 +24843,14 @@
37
 
         _pkg_short_errors_supported=no
38
 
 fi
39
 
         if test $_pkg_short_errors_supported = yes; then
40
 
-               SHELL_CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED"`
41
 
+               SHELL_CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED"`
42
 
         else
43
 
-               SHELL_CORE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED"`
44
 
+               SHELL_CORE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED"`
45
 
         fi
46
 
        # Put the nasty error message in config.log where it belongs
47
 
        echo "$SHELL_CORE_PKG_ERRORS" >&5
48
 
 
49
 
-       { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) were not met:
50
 
+       { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) were not met:
51
 
 
52
 
 $SHELL_CORE_PKG_ERRORS
53
 
 
54
 
@@ -24861,7 +24861,7 @@
55
 
 and SHELL_CORE_LIBS to avoid the need to call pkg-config.
56
 
 See the pkg-config man page for more details.
57
 
 " >&5
58
 
-echo "$as_me: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) were not met:
59
 
+echo "$as_me: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) were not met:
60
 
 
61
 
 $SHELL_CORE_PKG_ERRORS
62