[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, experimental, updated. debian/2.0.1-1-20-g0fb8c30

Chow Loong Jin hyperair at ubuntu.com
Mon Jun 13 18:34:35 UTC 2011


The following commit has been merged in the experimental branch:
commit 39d331dfb001371eb4f9f8b93face5a83e083f21
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat May 28 19:45:25 2011 +0800

    Fix pushd usage inside Makefile

diff --git a/debian/patches/0001-Use-C-instead-of-pushd-popd-for-update-pot.patch b/debian/patches/0001-Use-C-instead-of-pushd-popd-for-update-pot.patch
new file mode 100644
index 0000000..ccb6fa1
--- /dev/null
+++ b/debian/patches/0001-Use-C-instead-of-pushd-popd-for-update-pot.patch
@@ -0,0 +1,27 @@
+From f2c2243cb2946a5de4d42d73166051c568e125f5 Mon Sep 17 00:00:00 2001
+From: Chow Loong Jin <hyperair at ubuntu.com>
+Date: Sat, 28 May 2011 19:14:47 +0800
+Subject: [PATCH] Use -C instead of pushd/popd for update-pot
+
+---
+ Makefile.am |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1e26db7..91140b0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -58,9 +58,7 @@ all-local: update-pot
+ 
+ update-pot:
+ 	if [ "x$(top_srcdir)" = "x$(top_builddir)" ]; then \
+-		pushd $(top_builddir)/po; \
+-		$(MAKE) $(GETTEXT_PACKAGE).pot; \
+-		popd; \
++		$(MAKE) -C "$(top_builddir)/po" $(GETTEXT_PACKAGE).pot; \
+ 	fi;
+ 
+ # ---------------
+-- 
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 154b63f..a2eea2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-DBus-instead-of-NDesk.DBus.patch
 0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch
+0001-Use-C-instead-of-pushd-popd-for-update-pot.patch
 fsck-intltool.patch

-- 
banshee-community-extensions



More information about the Pkg-cli-apps-commits mailing list