[SCM] Packaging for pytango branch, master, updated. debian/7.2.0-2-5-ge42aa9e

Frédéric-Emmanuel P?==?UTF-8?Q?ICCA picca at synchrotron-soleil.fr
Fri Dec 2 15:55:51 UTC 2011


The following commit has been merged in the master branch:
commit 7265487206dc45c18eec3407b91992c8c7376ac2
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Mon Nov 28 17:15:37 2011 +0100

    use the --install-html option instead of patching the souces

diff --git a/debian/changelog b/debian/changelog
index 23daa06..c4254b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ pytango (7.2.0-3) UNRELEASED; urgency=low
     - add the Vcs- fields
     - follow Debian Science policy for Maintainers
   * debian/copyright fixed using config-edit
+  * debian/patches
+    - remove all patches thanks to the --install-html option.
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Mon, 25 Jul 2011 23:05:59 +0200
 
diff --git a/debian/patches/0001-install-the-documentation-with-the-debian-docs-file.patch b/debian/patches/0001-install-the-documentation-with-the-debian-docs-file.patch
deleted file mode 100644
index 16d3cde..0000000
--- a/debian/patches/0001-install-the-documentation-with-the-debian-docs-file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Thu, 14 Apr 2011 19:27:37 +0200
-Subject: install the documentation with the debian docs file
-
----
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index d636e82..cb5348d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -418,7 +418,7 @@ class install(dftinstall):
-         return sphinx is not None
-     
-     sub_commands = list(dftinstall.sub_commands)
--    sub_commands.append(('install_html', has_html))
-+    #sub_commands.append(('install_html', has_html))
- 
- 
- cmdclass['install'] = install
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index eeb19c6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-install-the-documentation-with-the-debian-docs-file.patch
diff --git a/debian/rules b/debian/rules
index 4253bab..68ac156 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,8 @@ override_dh_clean:
 	rm -rf build/sphinx
 	dh_clean
 
+override_dh_auto_install:
+	dh_auto_install -- --install-html=$(CURDIR)/debian/python-pytango/usr/share/doc/python-pytango/
+
 %:
 	dh $@ --with python2 --with sphinxdoc

-- 
Packaging for pytango



More information about the debian-science-commits mailing list