← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-do/trusty

« back to all changes in this revision

Viewing changes to debian/patches/01_fix_libX11_linkage.diff

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers
  • Date: 2012-03-26 11:12:21 UTC
  • mfrom: (0.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120326111221-1jk143fy37zxi3e4
Tags: 0.9-1
http://bugs.debian.org/665537
* New upstream version no longer uses deprecated internal glib headers.
  (Closes: #665537)
* [59fa37b9] Fix watch file
* [63486516] Imported Upstream version 0.9
* [8c636d84] Disable testsuite for now; requires running dbus and gconf daemons
* [e46de4b9] Remove inaccurate README.Source
* [4591d677] Add git-buildpackage configuration to default to pristine-tar

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_fix_libX11_linkage.diff
6
6
## DP: on link.
7
7
 
8
8
@DPATCH@
9
 
diff -urNad gnome-do-0.4.0.1~/libdo/Makefile.in gnome-do-0.4.0.1/libdo/Makefile.in
10
 
--- gnome-do-0.4.0.1~/libdo/Makefile.am 2008-03-18 13:31:06.000000000 +1100
11
 
+++ gnome-do-0.4.0.1/libdo/Makefile.am  2008-03-18 13:57:00.000000000 +1100
12
 
@@ -18,6 +18,6 @@
 
9
Index: gnome-do/libdo/Makefile.am
 
10
===================================================================
 
11
--- gnome-do.orig/libdo/Makefile.am     2012-01-19 03:34:08.447686546 +0800
 
12
+++ gnome-do/libdo/Makefile.am  2012-01-19 03:51:22.161371463 +0800
 
13
@@ -16,7 +16,7 @@
13
14
        eggaccelerators.c
14
15
 
15
16
 libdo_la_LDFLAGS = -export-dynamic -module -avoid-version
17
18
+libdo_la_LIBADD = $(LIBDO_LIBS) -lX11
18
19
 
19
20
 maintainer-clean-local:
20
 
diff -urNad gnome-do-0.4.0.1~/libdo/Makefile.in gnome-do-0.4.0.1/libdo/Makefile.in
21
 
--- gnome-do-0.4.0.1~/libdo/Makefile.in 2008-03-18 13:31:06.000000000 +1100
22
 
+++ gnome-do-0.4.0.1/libdo/Makefile.in  2008-03-18 13:57:00.000000000 +1100
23
 
@@ -261,7 +261,7 @@
 
21
        rm -f Makefile.in
 
22
Index: gnome-do/libdo/Makefile.in
 
23
===================================================================
 
24
--- gnome-do.orig/libdo/Makefile.in     2012-01-19 03:34:08.447686546 +0800
 
25
+++ gnome-do/libdo/Makefile.in  2012-01-19 03:51:22.161371463 +0800
 
26
@@ -297,7 +297,7 @@
24
27
        eggaccelerators.c
25
28
 
26
29
 libdo_la_LDFLAGS = -export-dynamic -module -avoid-version