[Debian-l10n-commits] poedit branch master updated. debian/1.6.9-2-1-g67efa41

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".

The branch, master has been updated
       via  67efa41e13d8b90c3c58b4d4268fbd262878861f (commit)
      from  c135a54a71904d0fc26e583bee477c909fd32e37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=67efa41e13d8b90c3c58b4d4268fbd262878861f

commit 67efa41e13d8b90c3c58b4d4268fbd262878861f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Oct 11 18:45:47 2014 +0200

    Really fix arch-independent package build

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog             |  7 +++++++
 debian/poedit-common.install |  2 --
 debian/rules                 | 14 +++++++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)
 delete mode 100644 debian/poedit-common.install

diff --git a/debian/changelog b/debian/changelog
index 89f297a..31a81a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+poedit (1.6.9-3) unstable; urgency=medium
+
+  * Really fix build failures by using install-indep
+    and tweaking auto_install target.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 11 Oct 2014 16:14:24 +0200
+
 poedit (1.6.9-2) unstable; urgency=medium
 
   * Fix build failure when poedit-common is not built.
diff --git a/debian/poedit-common.install b/debian/poedit-common.install
deleted file mode 100644
index db2f5a2..0000000
--- a/debian/poedit-common.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/locale
-usr/share/poedit
diff --git a/debian/rules b/debian/rules
index c4d8363..6a358b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,15 @@ override_dh_auto_configure:
 	./bootstrap
 	dh_auto_configure -- --disable-silent-rules --enable-debug
 
-override_dh_install:
-	dh_install
-	[ -d debian/poedit-common ] && find debian/poedit-common/usr/share/locale -type d -empty -delete
-	mv debian/poedit/usr/bin/poedit debian/poedit/usr/bin/poeditor
-	mv debian/poedit/usr/share/man/man1/poedit.1 debian/poedit/usr/share/man/man1/poeditor.1
+override_dh_auto_install:
+	dh_auto_install
+	mv debian/tmp/usr/bin/poedit debian/tmp/usr/bin/poeditor
+	mv debian/tmp/usr/share/man/man1/poedit.1 debian/tmp/usr/share/man/man1/poeditor.1
+
+override_dh_install-indep:
+	dh_install -ppoedit-common debian/tmp/usr/share/locale usr/share/
+	dh_install -ppoedit-common debian/tmp/usr/share/poedit usr/share/
+	find debian/poedit-common/usr/share/locale -type d -empty -delete
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
-----------------------------------------------------------------------


hooks/post-receive
-- 
poedit