Rik Mills has proposed merging 
~acheron/kubuntu-packaging/+git/kconfigwidgets:kubuntu_yakkety_archive into 
~kubuntu-packagers/kubuntu-packaging/+git/kconfigwidgets:kubuntu_yakkety_archive.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~acheron/kubuntu-packaging/+git/kconfigwidgets/+merge/296916

On previous commit, when inspecting resultant .debs it appeared that the new 
man pages translations where not going to their correct locations, but instead 
were sequentially overwriting the original in the main usr/share/man/man1/ 
location. Or at least the final result was a Ukranian man page there, which was 
the last on the translation list.

After looking at sparse manpages section of the debian maintainers guide, and 
packaging schemes from other packages, plus a few tries on variations in 
pbuilder, something similar to

https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kdelibs4support/tree/debian?h=kubuntu_yakkety_archive

seemed a possibility

tested in pbuilder, and it now seems that all the man pages go to their correct 
locations.
-- 
Your team Kubuntu Packagers is requested to review the proposed merge of 
~acheron/kubuntu-packaging/+git/kconfigwidgets:kubuntu_yakkety_archive into 
~kubuntu-packagers/kubuntu-packaging/+git/kconfigwidgets:kubuntu_yakkety_archive.
diff --git a/debian/changelog b/debian/changelog
index e3096f6..192f501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 kconfigwidgets (5.23.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Clive Johnston ]
   * Refreshing symbols
   * New upstream release (5.23.0)
   * Adding man pages to libkf5configwidgets-data.manpages and
     not-installed
 
+  [ Rik Mills ]
+  * Install man page translations in correct locations
+
  -- Clive Johnston <[email protected]>  Tue, 07 Jun 2016 16:46:30 +0100
 
 kconfigwidgets (5.22.0-0ubuntu1) yakkety; urgency=medium
diff --git a/debian/libkf5configwidgets-data.install b/debian/libkf5configwidgets-data.install
index d329af4..63d07fe 100644
--- a/debian/libkf5configwidgets-data.install
+++ b/debian/libkf5configwidgets-data.install
@@ -1,3 +1,4 @@
 usr/bin/preparetips5
 usr/share/locale/*
-
+usr/share/man/*/man1/preparetips5.1
+usr/share/man/man1/preparetips5.1
diff --git a/debian/libkf5configwidgets-data.manpages b/debian/libkf5configwidgets-data.manpages
deleted file mode 100644
index 3cd003d..0000000
--- a/debian/libkf5configwidgets-data.manpages
+++ /dev/null
@@ -1,9 +0,0 @@
-debian/tmp/usr/share/man/man1/preparetips5.1
-debian/tmp/usr/share/man/ca/man1/preparetips5.1
-debian/tmp/usr/share/man/de/man1/preparetips5.1
-debian/tmp/usr/share/man/it/man1/preparetips5.1
-debian/tmp/usr/share/man/nl/man1/preparetips5.1
-debian/tmp/usr/share/man/pt_BR/man1/preparetips5.1
-debian/tmp/usr/share/man/ru/man1/preparetips5.1
-debian/tmp/usr/share/man/sv/man1/preparetips5.1
-debian/tmp/usr/share/man/uk/man1/preparetips5.1
diff --git a/debian/not-installed b/debian/not-installed
index acf6e15..882616d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,4 +1,4 @@
-#installed by libkf5configwidgets5.manpages
+#installed by libkf5configwidgets-data
 ./usr/share/man/man1/preparetips5.1
 ./usr/share/man/ca/man1/preparetips5.1
 ./usr/share/man/de/man1/preparetips5.1
-- 
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel

Reply via email to