← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/mousetweaks/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/01_use-gtk2.patch

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2011-05-11 09:57:14 UTC
  • mfrom: (1.1.56 upstream)
  • Revision ID: james.westby@ubuntu.com-20110511095714-3any59d2bvboqlun
Tags: 3.1.1-0ubuntu1
* New upstream release
  - Add description to doap file
  - New and updated translations:
    + [eo] Kristjan Schmidt
    + [fi] Jiri Grönroos, Timo Jyrinki (launchpad.net import)
    + [tr] Muhammet Kara
    + [ug] Gheyret T. Kenji
* debian/patches/01_use-gtk2.patch: Drop, we are switching to GTk 3

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_use-gtk2.patch
1
 
diff -Nur -x '*.orig' -x '*~' mousetweaks-2.91.4//configure mousetweaks-2.91.4.new//configure
2
 
--- mousetweaks-2.91.4//configure       2010-12-20 09:59:23.000000000 -0600
3
 
+++ mousetweaks-2.91.4.new//configure   2011-01-10 19:28:07.217756001 -0600
4
 
@@ -6110,7 +6110,7 @@
5
 
 
6
 
 GLIB_REQUIRED=2.25.3
7
 
 GIO_REQUIRED=2.25.9
8
 
-GTK_REQUIRED=3.0.0
9
 
+GTK_REQUIRED=2.23
10
 
 GDS_REQUIRED=0.1.0
11
 
 
12
 
 
13
 
@@ -6124,7 +6124,7 @@
14
 
     if test -n "$PKG_CONFIG" && \
15
 
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED
16
 
     gio-2.0 >= \$GIO_REQUIRED
17
 
-    gtk+-3.0 >= \$GTK_REQUIRED
18
 
+    gtk+-2.0 >= \$GTK_REQUIRED
19
 
     gsettings-desktop-schemas >= \$GDS_REQUIRED
20
 
     x11
21
 
     xcursor
22
 
@@ -6132,7 +6132,7 @@
23
 
     xtst\""; } >&5
24
 
   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
25
 
     gio-2.0 >= $GIO_REQUIRED
26
 
-    gtk+-3.0 >= $GTK_REQUIRED
27
 
+    gtk+-2.0 >= $GTK_REQUIRED
28
 
     gsettings-desktop-schemas >= $GDS_REQUIRED
29
 
     x11
30
 
     xcursor
31
 
@@ -6143,7 +6143,7 @@
32
 
   test $ac_status = 0; }; then
33
 
   pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED
34
 
     gio-2.0 >= $GIO_REQUIRED
35
 
-    gtk+-3.0 >= $GTK_REQUIRED
36
 
+    gtk+-2.0 >= $GTK_REQUIRED
37
 
     gsettings-desktop-schemas >= $GDS_REQUIRED
38
 
     x11
39
 
     xcursor
40
 
@@ -6161,7 +6161,7 @@
41
 
     if test -n "$PKG_CONFIG" && \
42
 
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED
43
 
     gio-2.0 >= \$GIO_REQUIRED
44
 
-    gtk+-3.0 >= \$GTK_REQUIRED
45
 
+    gtk+-2.0 >= \$GTK_REQUIRED
46
 
     gsettings-desktop-schemas >= \$GDS_REQUIRED
47
 
     x11
48
 
     xcursor
49
 
@@ -6169,7 +6169,7 @@
50
 
     xtst\""; } >&5
51
 
   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
52
 
     gio-2.0 >= $GIO_REQUIRED
53
 
-    gtk+-3.0 >= $GTK_REQUIRED
54
 
+    gtk+-2.0 >= $GTK_REQUIRED
55
 
     gsettings-desktop-schemas >= $GDS_REQUIRED
56
 
     x11
57
 
     xcursor
58
 
@@ -6180,7 +6180,7 @@
59
 
   test $ac_status = 0; }; then
60
 
   pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED
61
 
     gio-2.0 >= $GIO_REQUIRED
62
 
-    gtk+-3.0 >= $GTK_REQUIRED
63
 
+    gtk+-2.0 >= $GTK_REQUIRED
64
 
     gsettings-desktop-schemas >= $GDS_REQUIRED
65
 
     x11
66
 
     xcursor
67
 
@@ -6207,7 +6207,7 @@
68
 
         if test $_pkg_short_errors_supported = yes; then
69
 
                DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED
70
 
     gio-2.0 >= $GIO_REQUIRED
71
 
-    gtk+-3.0 >= $GTK_REQUIRED
72
 
+    gtk+-2.0 >= $GTK_REQUIRED
73
 
     gsettings-desktop-schemas >= $GDS_REQUIRED
74
 
     x11
75
 
     xcursor
76
 
@@ -6216,7 +6216,7 @@
77
 
         else
78
 
                DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED
79
 
     gio-2.0 >= $GIO_REQUIRED
80
 
-    gtk+-3.0 >= $GTK_REQUIRED
81
 
+    gtk+-2.0 >= $GTK_REQUIRED
82
 
     gsettings-desktop-schemas >= $GDS_REQUIRED
83
 
     x11
84
 
     xcursor
85
 
@@ -6228,7 +6228,7 @@
86
 
 
87
 
        as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED
88
 
     gio-2.0 >= $GIO_REQUIRED
89
 
-    gtk+-3.0 >= $GTK_REQUIRED
90
 
+    gtk+-2.0 >= $GTK_REQUIRED
91
 
     gsettings-desktop-schemas >= $GDS_REQUIRED
92
 
     x11
93
 
     xcursor
94
 
diff -Nur -x '*.orig' -x '*~' mousetweaks-2.91.4//configure.ac mousetweaks-2.91.4.new//configure.ac
95
 
--- mousetweaks-2.91.4//configure.ac    2010-11-29 04:53:31.000000000 -0600
96
 
+++ mousetweaks-2.91.4.new//configure.ac        2011-01-10 19:27:35.117756001 -0600
97
 
@@ -45,13 +45,13 @@
98
 
 
99
 
 GLIB_REQUIRED=2.25.3
100
 
 GIO_REQUIRED=2.25.9
101
 
-GTK_REQUIRED=3.0.0
102
 
+GTK_REQUIRED=2.23
103
 
 GDS_REQUIRED=0.1.0
104
 
 
105
 
 PKG_CHECK_MODULES(DEPENDENCIES,
106
 
     glib-2.0 >= $GLIB_REQUIRED
107
 
     gio-2.0 >= $GIO_REQUIRED
108
 
-    gtk+-3.0 >= $GTK_REQUIRED
109
 
+    gtk+-2.0 >= $GTK_REQUIRED
110
 
     gsettings-desktop-schemas >= $GDS_REQUIRED
111
 
     x11
112
 
     xcursor