Packaging: fixed distribution of files

Change-Id: Id002bf1b3aa78578f8c46fbd0900556bf98f9f30

diff --git a/debian/git-buildpackage-common.install b/debian/git-buildpackage-common.install
index 3fdd5528474f49cd25cf04b8f1ef7599ab340f13..18f9663386c89dcfa05d019c3cf8f794dae80938 100644 (file)
--- a/debian/git-buildpackage-common.install
+++ b/debian/git-buildpackage-common.install
@@ -1,15 +1,9 @@
 usr/bin/gbp-clone
 usr/bin/gbp-pull
-#usr/share/pyshared/gbp/*.py
-#usr/share/pyshared/gbp/scripts/clone.py
-#usr/share/pyshared/gbp/scripts/pull.py
-#usr/share/pyshared/gbp/scripts/common/*.py
-#usr/share/pyshared/gbp/git/*.py
-#usr/share/pyshared/gbp/pkg/*.py
-usr/lib/python*/dist-packages/gbp/*.py
-usr/lib/python2.7/dist-packages/gbp/scripts/clone.py
-usr/lib/python2.7/dist-packages/gbp/scripts/pull.py
-usr/lib/python2.7/dist-packages/gbp/scripts/common/*.py
-usr/lib/python2.7/dist-packages/gbp/git/*.py
-usr/lib/python2.7/dist-packages/gbp/pkg/*.py
+usr/lib/python*/dist-packages/gbp/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/clone.py*
+usr/lib/python*/dist-packages/gbp/scripts/pull.py*
+usr/lib/python*/dist-packages/gbp/scripts/common/*.py*
+usr/lib/python*/dist-packages/gbp/git/*.py*
+usr/lib/python*/dist-packages/gbp/pkg/*.py*
 etc/git-buildpackage/gbp.conf

diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install
index bef065cf6214a10fe4b8155b595389b7237df056..8c49491e2a1a18df29116d6f6ffe503ebce2e75d 100644 (file)
--- a/debian/git-buildpackage-rpm.install
+++ b/debian/git-buildpackage-rpm.install
@@ -1,5 +1,3 @@
-usr/bin/gbp-pq-rpm
-usr/bin/git-buildpackage-rpm
-usr/bin/git-import-orig-rpm
-usr/bin/git-import-srpm
-usr/lib/python*/dist-packages/gbp/rpm/*
+usr/bin/*rpm*
+usr/lib/python*/dist-packages/gbp/rpm/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/*rpm*.py*

diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install
index a420cb1cde80b084a10b2f2a27e0ff3cbdf8d93c..7a276d7ef115763941b5f4b75a481cd0dcc462ff 100644 (file)
--- a/debian/git-buildpackage.install
+++ b/debian/git-buildpackage.install
@@ -5,5 +5,12 @@ usr/bin/git-import-dsc
 usr/bin/git-import-dscs
 usr/bin/git-import-orig
 usr/bin/git-pbuilder
-#usr/share/pyshared/gbp/deb/*
-usr/lib/python*/dist-packages/gbp/deb/*
+usr/bin/gbp-create-remote-repo
+usr/lib/python*/dist-packages/gbp/deb/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/pq.py*
+usr/lib/python*/dist-packages/gbp/scripts/buildpackage.py*
+usr/lib/python*/dist-packages/gbp/scripts/dch.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dsc.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dscs.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_orig.py*
+usr/lib/python*/dist-packages/gbp/scripts/create_remote_repo.py*

diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index dc3bd4b2a04eb1e2d8a8fd60fb636bfcade3b732..f2c60857467f72450253aa8655f533a20e89cc70 100644 (file)
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -76,6 +76,7 @@ rm -rf %{buildroot}%{python_sitelib}/*info
 
 %files
 %defattr(-,root,root,-)
+%dir %{python_sitelib}/gbp/deb
 %{_bindir}/gbp-pq
 %{_bindir}/git-buildpackage
 %{_bindir}/git-dch
@@ -85,24 +86,36 @@ rm -rf %{buildroot}%{python_sitelib}/*info
 %{_bindir}/git-pbuilder
 %{_bindir}/gbp-create-remote-repo
 %{python_sitelib}/gbp/deb/
+%{python_sitelib}/gbp/scripts/pq.py*
+%{python_sitelib}/gbp/scripts/buildpackage.py*
+%{python_sitelib}/gbp/scripts/dch.py*
+%{python_sitelib}/gbp/scripts/import_dsc.py*
+%{python_sitelib}/gbp/scripts/import_dscs.py*
+%{python_sitelib}/gbp/scripts/import_orig.py*
+%{python_sitelib}/gbp/scripts/create_remote_repo.py*
 
 %files common
 %defattr(-,root,root,-)
 %{_bindir}/gbp-clone
 %{_bindir}/gbp-pull
-%{python_sitelib}/gbp
+%dir %{python_sitelib}/gbp
+%dir %{python_sitelib}/gbp/git
+%dir %{python_sitelib}/gbp/pkg
+%dir %{python_sitelib}/gbp/scripts
+%dir %{python_sitelib}/gbp/scripts/common
 %{python_sitelib}/gbp/*.py*
-%{python_sitelib}/gbp/git/
-%{python_sitelib}/gbp/pkg/
+%{python_sitelib}/gbp/scripts/__init__.py*
 %{python_sitelib}/gbp/scripts/clone.py*
 %{python_sitelib}/gbp/scripts/pull.py*
+%{python_sitelib}/gbp/scripts/common/*.py*
+%{python_sitelib}/gbp/git/*.py*
+%{python_sitelib}/gbp/pkg/*.py*
 %config %{_sysconfdir}/git-buildpackage
 
 
 %files rpm
 %defattr(-,root,root,-)
-%{_bindir}/gbp-pq-rpm
-%{_bindir}/git-buildpackage-rpm
-%{_bindir}/git-import-orig-rpm
-%{_bindir}/git-import-srpm
-%{python_sitelib}/gbp/rpm/
+%dir %{python_sitelib}/gbp/rpm
+%{_bindir}/*rpm*
+%{python_sitelib}/gbp/scripts/*rpm.py*
+%{python_sitelib}/gbp/rpm/*py*