← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gcalctool/karmic-updates

« back to all changes in this revision

Viewing changes to debian/patches/99_autoconf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell, Robert Ancell, Daniel Holbach
  • Date: 2009-05-11 16:02:16 UTC
  • mfrom: (1.1.52 upstream)
  • Revision ID: james.westby@ubuntu.com-20090511160216-5wpmr4g8sv6vrk0m
Tags: 5.27.1-0ubuntu1
https://launchpad.net/bugs/373095
https://launchpad.net/bugs/348699
[ Robert Ancell ]
* New upstream release (LP: #373095)
  - Convert Glade UI to GtkBuilder UI
  - Fix display on startup to be replaced on entry (LP: #348699)
  - Make GConf schemas translatable
  - Replace MP number arrays with an MPNumber structure
  - Tidied up error messages
  - Tidied up GConf schema, use native GConf types, the following settings will
    be reset after upgrade:
    - The initial window position
    - The visibility of trailing zeros
    - The visibility of thousands separators
    - The visibility of the register window
  - Updated translations

* Merge from Debian unstable (5.24.3.1-1). Remaining Ubuntu changes
  - Launchpad integration:
    + debian/control.in: Build-Depends on launchpad-integration
    + inclusion of debian/patches/01_lpi.patch and
      debian/patches/99_autoconf.patch
  - debian/control.in: Add VCS link
  - debian/control.in: Remove dependency on Glade
  - debian/control: Rebuilt with contro.in changes

[ Daniel Holbach ]
* debian/watch: track current unstable release too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/99_autoconf.patch
 
1
diff -Nur -x '*.orig' -x '*~' gcalctool-5.27.1/aclocal.m4 gcalctool-5.27.1.new/aclocal.m4
 
2
--- gcalctool-5.27.1/aclocal.m4 2009-05-04 15:42:05.000000000 +1000
 
3
+++ gcalctool-5.27.1.new/aclocal.m4     2009-05-11 13:15:51.000000000 +1000
 
4
@@ -5049,6 +5049,9 @@
 
5
   openbsd*)
 
6
     with_gnu_ld=no
 
7
     ;;
 
8
+  linux* | k*bsd*-gnu)
 
9
+    _LT_TAGVAR(link_all_deplibs, $1)=no
 
10
+    ;;
 
11
   esac
 
12
 
 
13
   _LT_TAGVAR(ld_shlibs, $1)=yes
 
14
diff -Nur -x '*.orig' -x '*~' gcalctool-5.27.1/configure gcalctool-5.27.1.new/configure
 
15
--- gcalctool-5.27.1/configure  2009-05-04 15:42:09.000000000 +1000
 
16
+++ gcalctool-5.27.1.new/configure      2009-05-11 13:15:57.000000000 +1000
 
17
@@ -6894,7 +6894,7 @@
 
18
 
 
19
 
 
20
 
 
21
-pkg_modules="gtk+-2.0 >= 2.14.0 gobject-2.0 gdk-x11-2.0 glib-2.0 atk gdk-pixbuf-2.0 gmodule-export-2.0"
 
22
+pkg_modules="gtk+-2.0 >= 2.14.0 gobject-2.0 gdk-x11-2.0 glib-2.0 atk gdk-pixbuf-2.0 gmodule-export-2.0 launchpad-integration"
 
23
 
 
24
 pkg_failed=no
 
25
 { $as_echo "$as_me:$LINENO: checking for PACKAGE" >&5
 
26
@@ -11331,6 +11331,9 @@
 
27
   openbsd*)
 
28
     with_gnu_ld=no
 
29
     ;;
 
30
+  linux* | k*bsd*-gnu)
 
31
+    link_all_deplibs=no
 
32
+    ;;
 
33
   esac
 
34
 
 
35
   ld_shlibs=yes
 
36
@@ -14025,7 +14028,7 @@
 
37
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 
38
   lt_status=$lt_dlunknown
 
39
   cat > conftest.$ac_ext <<_LT_EOF
 
40
-#line 14028 "configure"
 
41
+#line 14031 "configure"
 
42
 #include "confdefs.h"
 
43
 
 
44
 #if HAVE_DLFCN_H
 
45
@@ -14121,7 +14124,7 @@
 
46
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 
47
   lt_status=$lt_dlunknown
 
48
   cat > conftest.$ac_ext <<_LT_EOF
 
49
-#line 14124 "configure"
 
50
+#line 14127 "configure"
 
51
 #include "confdefs.h"
 
52
 
 
53
 #if HAVE_DLFCN_H