[Python-apps-commits] r10736 - in packages/s3ql/trunk/debian (10 files)

nikratio-guest at users.alioth.debian.org nikratio-guest at users.alioth.debian.org
Sat Apr 5 00:46:51 UTC 2014 

    Date: Saturday, April 5, 2014 @ 00:46:50
  Author: nikratio-guest
Revision: 10736

* Update Standards-Version to 3.9.5 (no changes needed).
* Repackaged to exclude minified javascript files.
* New upstream release (2.8.1)

Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/control
  packages/s3ql/trunk/debian/copyright
  packages/s3ql/trunk/debian/patches/clock-granularity.diff
  packages/s3ql/trunk/debian/patches/proc_mount.diff
  packages/s3ql/trunk/debian/patches/series
  packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff
  packages/s3ql/trunk/debian/rules
  packages/s3ql/trunk/debian/watch
Deleted:
  packages/s3ql/trunk/debian/patches/cython_version_check.diff

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/changelog	2014-04-05 00:46:50 UTC (rev 10736)
@@ -1,4 +1,4 @@
-s3ql (2.8-1) unstable; urgency=low
+s3ql (2.8.1+dfsg-1) UNRELEASED; urgency=low
 
   * Updated upstream project URL.
   * Added upstream PGP key and configured watch file for automatic
@@ -6,6 +6,8 @@
   * New upstream release.
   * Do not crash when building with snapshot Cython versions
     (Closes: #742760)
+  * Update Standards-Version to 3.9.5 (no changes needed).
+  * Repackaged to exclude minified javascript files.
 
  -- Nikolaus Rath <Nikolaus at rath.org>  Fri, 14 Mar 2014 19:11:06 -0700
 

Modified: packages/s3ql/trunk/debian/control
===================================================================
--- packages/s3ql/trunk/debian/control	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/control	2014-04-05 00:46:50 UTC (rev 10736)
@@ -23,7 +23,7 @@
                texlive-latex-extra,
                texlive-fonts-recommended,
                libsqlite3-dev (>= 3.7.0)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: https://bitbucket.org/nikratio/s3ql/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/s3ql/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/s3ql/trunk/

Modified: packages/s3ql/trunk/debian/copyright
===================================================================
--- packages/s3ql/trunk/debian/copyright	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/copyright	2014-04-05 00:46:50 UTC (rev 10736)
@@ -2,26 +2,13 @@
 Upstream-Name: s3ql
 Upstream-Contact: s3ql at googlegroups.com
 Source: https://bitbucket.org/nikratio/s3ql/
+Files-Excluded: doc/html
 
 Files: *
 Copyright: Copyright (c) 1998 - 2012 Nikolaus Rath <Nikolaus at rath.org>
 License: GPL-3
 
-Files: doc/html/_static/*
-Copyright: Copyright (c) 2007-2011 by the Sphinx team (see Sphinx's AUTHORS file).
- All rights reserved.
-License: BSD-2-clause
-
-Files: doc/latex/*
-Copyright: Copyright (c) 2007-2011 by the Sphinx team (see Sphinx's AUTHORS file).
- All rights reserved.
-License: BSD-2-clause
-
-Files: doc/latex/manual.tex
-Copyright: Copyright (c) 1998 - 2012 Nikolaus Rath <Nikolaus at rath.org>
 License: GPL-3
-
-License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License Version 3 as
  published by the Free Software Foundation.
@@ -35,26 +22,3 @@
  Version 3 can be found in the `/usr/share/common-licenses/GPL-3'
  file.
 
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- .
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: packages/s3ql/trunk/debian/patches/clock-granularity.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/clock-granularity.diff	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/patches/clock-granularity.diff	2014-04-05 00:46:50 UTC (rev 10736)
@@ -13,7 +13,7 @@
 
 --- a/tests/t3_fs_api.py
 +++ b/tests/t3_fs_api.py
-@@ -43,7 +43,7 @@
+@@ -49,7 +49,7 @@
  stamp2 = stamp1
  while stamp1 == stamp2:
      stamp2 = time.time()

Deleted: packages/s3ql/trunk/debian/patches/cython_version_check.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/cython_version_check.diff	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/patches/cython_version_check.diff	2014-04-05 00:46:50 UTC (rev 10736)
@@ -1,24 +0,0 @@
-Description: Remove Cython version check
-Origin: debian
-Forwarded: no
-Last-Update: <2014-03-26>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
-The Cython version check fails for snapshot Cython releases. Since
-the build-depends already ensure that the correct Cython version
-is available, we just remove the check in setup.py.
-
---- a/setup.py
-+++ b/setup.py
-@@ -204,11 +204,6 @@
-         except ImportError:
-             raise SystemExit('Cython needs to be installed for this command') from None
- 
--        cython_ver = [ int(x) for x in Cython.__version__.split('.') ]
--        if cython_ver < [0, 17]:
--            raise SystemExit('Found Cython %s, but need 0.17 or newer'
--                             % (Cython.__version__,))
--
-         directives = dict(extra_warnings)
-         directives['embedsignature'] = True
-         directives['language_level'] = 3

Modified: packages/s3ql/trunk/debian/patches/proc_mount.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/proc_mount.diff	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/patches/proc_mount.diff	2014-04-05 00:46:50 UTC (rev 10736)
@@ -6,8 +6,17 @@
 
 --- a/tests/t4_adm.py
 +++ b/tests/t4_adm.py
-@@ -47,6 +47,7 @@
+@@ -19,7 +19,7 @@
+ import unittest
+ import subprocess
+ import pytest
+-
++import os
  
+ @pytest.mark.usefixtures('s3ql_cmd_argv')
+ class AdmTests(unittest.TestCase):
+@@ -48,6 +48,7 @@
+ 
          self.assertEqual(proc.wait(), 0)
  
 +    @unittest.skipUnless(os.path.exists('/proc/mounts'), '/proc/mounts not available')

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/patches/series	2014-04-05 00:46:50 UTC (rev 10736)
@@ -1,5 +1,3 @@
-cython_version_check.diff
 proc_mount.diff
 clock-granularity.diff
 sphinx-1.1.1-compat.diff
-cython_version_check.diff

Modified: packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff	2014-04-05 00:46:50 UTC (rev 10736)
@@ -27,9 +27,9 @@
 +os.environ['LANG'] = 'C.UTF-8'
 +locale.setlocale(locale.LC_ALL, '')
      
+ from distutils.version import LooseVersion
  import os
- import subprocess
-@@ -65,6 +72,7 @@
+@@ -67,6 +74,7 @@
          except ImportError:
              raise SystemExit('This command requires Sphinx to be installed.') from None
  
@@ -37,7 +37,7 @@
          fix_docutils()
          
          dest_dir = os.path.join(basedir, 'doc')
-@@ -289,6 +297,35 @@
+@@ -301,6 +309,35 @@
      
      assert docutils.parsers.get_parser_class('rst') is rst.Parser
  

Modified: packages/s3ql/trunk/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/rules	2014-04-05 00:46:50 UTC (rev 10736)
@@ -6,7 +6,8 @@
 
 # NOTE:
 # Anyone willing to convert the package to pure debhelper
-# (i.e., without dh sequencer) is very welcome to do so.
+# (i.e., without dh sequencer) and/or pybuild is very 
+# welcome to do so.
 
 %:
 	dh $@ --with python3,sphinxdoc
@@ -101,3 +102,8 @@
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -ps3ql --dbg-package=s3ql-dbg
 endif
+
+.PHONY: get-orig-source
+get-orig-source:
+	uscan --rename --destdir=$(CURDIR) --repack --force-download \
+	      --download-current-version

Modified: packages/s3ql/trunk/debian/watch
===================================================================
--- packages/s3ql/trunk/debian/watch	2014-04-03 07:33:11 UTC (rev 10735)
+++ packages/s3ql/trunk/debian/watch	2014-04-05 00:46:50 UTC (rev 10736)
@@ -1,6 +1,6 @@
 # watch control file for uscan
 version=3
-opts=pgpsigurlmangle=s/$/.asc/ \
+opts=pgpsigurlmangle=s/$/.asc/,dversionmangle=s/\+dfsg\d?$// \
   https://bitbucket.org/nikratio/s3ql/downloads \
   .*/s3ql-(\d\S*)\.tar\.bz2 \
   debian

More information about the Python-apps-commits mailing list