[SCM] Packaging for sardana branch, master, updated. debian/1.0.0_rc6-2-6-g4736c9c

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Thu Mar 8 21:56:27 UTC 2012


The following commit has been merged in the master branch:
commit accec417ac65b15b36d72bcf11a60b32d2dcde9e
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Mar 3 11:03:55 2012 +0100

    updated for the 1.0.0~rc7

diff --git a/debian/changelog b/debian/changelog
index 2b70c87..b29c44d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sardana (1.0.0~rc6-2) unstable; urgency=low
+sardana (1.0.0~rc7-1) unstable; urgency=low
 
   * Initial release (Closes: #XXXXXX)
   * Thanks to Justin B Rye for package description review
diff --git a/debian/copyright b/debian/copyright
index 1db1f22..c13b820 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,18 +15,6 @@ Files: doc/*
 Copyright: 2012, CELLS / ALBA Synchrotron, Bellaterra, Spain
 License: CC-BY-SA-3.0
 
-Files: doc/logo.bmp
-Copyright: UNKNOWN
-License: UNKNOWN
-
-Files: doc/manuals/*.jpg
-Copyright: UNKNOWN
-License: UNKNOWN
-
-Files: doc/manuals/*.pdf
-Copyright: UNKNOWN the Sardana Overview.pdf source is missing .lyx
-License: UNKNOWN
-
 License: CC-BY-SA-3.0
   THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE
   TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR
@@ -417,6 +405,4 @@ License: LGPL-3+
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-3'.
 
-License: UNKNOWN
- Please put here the right licenses informations
 
diff --git a/debian/patches/0001-forwarded-upstream-fix-sphinxdoc-build.patch b/debian/patches/0001-forwarded-upstream-fix-sphinxdoc-build.patch
deleted file mode 100644
index f50049b..0000000
--- a/debian/patches/0001-forwarded-upstream-fix-sphinxdoc-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sat, 25 Feb 2012 14:44:40 +0100
-Subject: forwarded upstream fix sphinxdoc build
-
----
- src/sardana/macroserver/macroserver.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/sardana/macroserver/macroserver.py b/src/sardana/macroserver/macroserver.py
-index f678f36..97d3479 100644
---- a/src/sardana/macroserver/macroserver.py
-+++ b/src/sardana/macroserver/macroserver.py
-@@ -308,7 +308,7 @@ class MacroServer(MSContainer, MSObject, SardanaElementManager, SardanaIDManager
-         evt = { "new" : new_elements, "change" : changed_elements,
-                 "del" : deleted_elements }
-         self.fire_event(EventType("ElementsChanged"), evt)
--    reload_macro_lib.__doc__ = MacroManager.reloadMacroLib
-+    reload_macro_lib.__doc__ = MacroManager.reloadMacroLib.__doc__
-     
-     def reload_macro_libs(self, lib_names):
-         for lib_name in lib_names:
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c50765c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-forwarded-upstream-fix-sphinxdoc-build.patch

-- 
Packaging for sardana



More information about the debian-science-commits mailing list