[Pkg-cli-apps-commits] [SCM] gnome-do branch, master, updated. debian/0.8.5-2-5-g52909fa

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit c849ac747ca8b93f9f81a4cafb386863684c1977
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu Jan 19 03:51:57 2012 +0800

    Refresh patches and drop dpatch cruft

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index bc16e04..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_fix_libX11_linkage
-02_use_cli_for_wrapper
-10_sk_translation_update
-04_dont_disable_deprecated.dpatch
diff --git a/debian/patches/01_fix_libX11_linkage.diff b/debian/patches/01_fix_libX11_linkage.diff
old mode 100755
new mode 100644
index b5eaf30..52792eb
--- a/debian/patches/01_fix_libX11_linkage.diff
+++ b/debian/patches/01_fix_libX11_linkage.diff
@@ -6,10 +6,11 @@
 ## DP: on link.
 
 @DPATCH@
-diff -urNad gnome-do-0.4.0.1~/libdo/Makefile.in gnome-do-0.4.0.1/libdo/Makefile.in
---- gnome-do-0.4.0.1~/libdo/Makefile.am	2008-03-18 13:31:06.000000000 +1100
-+++ gnome-do-0.4.0.1/libdo/Makefile.am	2008-03-18 13:57:00.000000000 +1100
-@@ -18,6 +18,6 @@
+Index: gnome-do/libdo/Makefile.am
+===================================================================
+--- gnome-do.orig/libdo/Makefile.am	2012-01-19 03:34:08.447686546 +0800
++++ gnome-do/libdo/Makefile.am	2012-01-19 03:51:22.161371463 +0800
+@@ -16,7 +16,7 @@
  	eggaccelerators.c
  
  libdo_la_LDFLAGS = -export-dynamic -module -avoid-version
@@ -17,10 +18,12 @@ diff -urNad gnome-do-0.4.0.1~/libdo/Makefile.in gnome-do-0.4.0.1/libdo/Makefile.
 +libdo_la_LIBADD = $(LIBDO_LIBS) -lX11
  
  maintainer-clean-local:
-diff -urNad gnome-do-0.4.0.1~/libdo/Makefile.in gnome-do-0.4.0.1/libdo/Makefile.in
---- gnome-do-0.4.0.1~/libdo/Makefile.in	2008-03-18 13:31:06.000000000 +1100
-+++ gnome-do-0.4.0.1/libdo/Makefile.in	2008-03-18 13:57:00.000000000 +1100
-@@ -261,7 +261,7 @@
+ 	rm -f Makefile.in
+Index: gnome-do/libdo/Makefile.in
+===================================================================
+--- gnome-do.orig/libdo/Makefile.in	2012-01-19 03:34:08.447686546 +0800
++++ gnome-do/libdo/Makefile.in	2012-01-19 03:51:22.161371463 +0800
+@@ -297,7 +297,7 @@
  	eggaccelerators.c
  
  libdo_la_LDFLAGS = -export-dynamic -module -avoid-version
diff --git a/debian/patches/02_use_cli_for_wrapper.diff b/debian/patches/02_use_cli_for_wrapper.diff
old mode 100755
new mode 100644

-- 
gnome-do