[Python-apps-commits] r12269 - in packages/synopsis/trunk/debian (14 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Wed Aug 19 21:07:58 UTC 2015
Date: Wednesday, August 19, 2015 @ 21:07:57
Author: piotr
Revision: 12269
* Team upload.
* Convert from dh_pysupport to dh_python2 (closes: #786064)
* Convert debian/patches from dpatch to quilt
- change source format to 3.0 (quilt)
Added:
packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.diff
packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.diff
packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.diff
packages/synopsis/trunk/debian/patches/series
Modified:
packages/synopsis/trunk/debian/changelog
packages/synopsis/trunk/debian/control
packages/synopsis/trunk/debian/rules
packages/synopsis/trunk/debian/source/format
Deleted:
packages/synopsis/trunk/debian/patches/00list
packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.dpatch
packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.dpatch
packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.dpatch
packages/synopsis/trunk/debian/patches/Makefile
packages/synopsis/trunk/debian/pycompat
Modified: packages/synopsis/trunk/debian/changelog
===================================================================
--- packages/synopsis/trunk/debian/changelog 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/changelog 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1,7 +1,15 @@
-synopsis (0.12-9) UNRELEASED; urgency=low
+synopsis (0.12-9) unstable; urgency=low
+ * Team upload.
+
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
+ [ Piotr Ożarowski ]
+ * Convert from dh_pysupport to dh_python2 (closes: #786064)
+ * Convert debian/patches from dpatch to quilt
+ - change source format to 3.0 (quilt)
+
-- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 18:05:51 +0200
synopsis (0.12-8) unstable; urgency=low
Modified: packages/synopsis/trunk/debian/control
===================================================================
--- packages/synopsis/trunk/debian/control 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/control 2015-08-19 21:07:57 UTC (rev 12269)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Carl Chenet <chaica at ohmytux.com>
-Build-Depends: debhelper (>= 7.0.50~), python-support, dpatch, python-dev, python, xutils-dev, libgc-dev, pkg-config, graphviz, bison, flex, libatomic-ops-dev
+Build-Depends: debhelper (>= 7.0.50~), dh-python, python-dev, python, xutils-dev, libgc-dev, pkg-config, graphviz, bison, flex, libatomic-ops-dev
XS-Python-Version: all
Standards-Version: 3.9.2
Homepage: http://synopsis.fresco.org/
@@ -12,7 +12,6 @@
Package: synopsis
Architecture: any
-XB-Python-Version: ${python:Versions}
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, cpp, graphviz, gsfonts
Description: source-code Introspection Tool
Synopsis is a multi-language source code introspection tool that
@@ -27,7 +26,6 @@
Package: synopsis-idl
Architecture: any
-XB-Python-Version: ${python:Versions}
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, synopsis (= ${binary:Version})
Description: IDL parser for synopsis
Synopsis is a multi-language source code introspection tool that
Deleted: packages/synopsis/trunk/debian/patches/00list
===================================================================
--- packages/synopsis/trunk/debian/patches/00list 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/patches/00list 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1,4 +0,0 @@
-#No current patches.
-10_bts558996_FTBFS_hppa_invalid_initializer
-20_bts576225_FTBFS_sparc_undefined_reference
-30_bts565051_FTBFS_GCC4.5.dpatch
Added: packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.diff
===================================================================
--- packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.diff (rev 0)
+++ packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.diff 2015-08-19 21:07:57 UTC (rev 12269)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_bts558996_FTBFS_hppa_invalid_initializer.dpatch by Jakub Wilk <jwilk at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a FTBFS on HTTP due to an "invalid initializer"
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synopsis~/src/Synopsis/gc/pthread_support.c synopsis/src/Synopsis/gc/pthread_support.c
+--- synopsis~/src/Synopsis/gc/pthread_support.c 2008-11-07 00:59:12.000000000 +0100
++++ synopsis/src/Synopsis/gc/pthread_support.c 2010-04-29 09:53:29.000000000 +0200
+@@ -1297,7 +1297,7 @@
+ /* as STL alloc.h. This isn't really the right way to do this. */
+ /* but until the POSIX scheduling mess gets straightened out ... */
+
+-volatile AO_TS_t GC_allocate_lock = 0;
++volatile AO_TS_t GC_allocate_lock = AO_TS_INITIALIZER;
+
+
+ void GC_lock(void)
Property changes on: packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.dpatch
===================================================================
--- packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.dpatch 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/patches/10_bts558996_FTBFS_hppa_invalid_initializer.dpatch 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_bts558996_FTBFS_hppa_invalid_initializer.dpatch by Jakub Wilk <jwilk at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a FTBFS on HTTP due to an "invalid initializer"
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synopsis~/src/Synopsis/gc/pthread_support.c synopsis/src/Synopsis/gc/pthread_support.c
---- synopsis~/src/Synopsis/gc/pthread_support.c 2008-11-07 00:59:12.000000000 +0100
-+++ synopsis/src/Synopsis/gc/pthread_support.c 2010-04-29 09:53:29.000000000 +0200
-@@ -1297,7 +1297,7 @@
- /* as STL alloc.h. This isn't really the right way to do this. */
- /* but until the POSIX scheduling mess gets straightened out ... */
-
--volatile AO_TS_t GC_allocate_lock = 0;
-+volatile AO_TS_t GC_allocate_lock = AO_TS_INITIALIZER;
-
-
- void GC_lock(void)
Added: packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.diff
===================================================================
--- packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.diff (rev 0)
+++ packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.diff 2015-08-19 21:07:57 UTC (rev 12269)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_bts576225_FTBFS_sparc_undefined_reference.dpatch by Jakub Wilk <jwilk at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a FTBFS on sparc due to "undefined reference"
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synopsis~/src/Synopsis/gc/configure synopsis/src/Synopsis/gc/configure
+--- synopsis~/src/Synopsis/gc/configure 2008-12-29 17:30:54.000000000 +0100
++++ synopsis/src/Synopsis/gc/configure 2010-04-29 10:04:27.000000000 +0200
+@@ -6267,6 +6267,9 @@
+ sparc*-sun-solaris2.*)
+ machdep="mach_dep.lo sparc_mach_dep.lo"
+ ;;
++ sparc*-*-*)
++ machdep="mach_dep.lo sparc_mach_dep.lo"
++ ;;
+ ia64-*-*)
+ machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
+ ;;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synopsis~/src/Synopsis/gc/configure.ac synopsis/src/Synopsis/gc/configure.ac
+--- synopsis~/src/Synopsis/gc/configure.ac 2008-11-07 00:59:12.000000000 +0100
++++ synopsis/src/Synopsis/gc/configure.ac 2010-04-29 10:04:27.000000000 +0200
+@@ -402,6 +402,9 @@
+ sparc*-sun-solaris2.*)
+ machdep="mach_dep.lo sparc_mach_dep.lo"
+ ;;
++ sparc*-*-*)
++ machdep="mach_dep.lo sparc_mach_dep.lo"
++ ;;
+ ia64-*-*)
+ machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
+ ;;
Property changes on: packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.dpatch
===================================================================
--- packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.dpatch 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/patches/20_bts576225_FTBFS_sparc_undefined_reference.dpatch 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bts576225_FTBFS_sparc_undefined_reference.dpatch by Jakub Wilk <jwilk at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a FTBFS on sparc due to "undefined reference"
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synopsis~/src/Synopsis/gc/configure synopsis/src/Synopsis/gc/configure
---- synopsis~/src/Synopsis/gc/configure 2008-12-29 17:30:54.000000000 +0100
-+++ synopsis/src/Synopsis/gc/configure 2010-04-29 10:04:27.000000000 +0200
-@@ -6267,6 +6267,9 @@
- sparc*-sun-solaris2.*)
- machdep="mach_dep.lo sparc_mach_dep.lo"
- ;;
-+ sparc*-*-*)
-+ machdep="mach_dep.lo sparc_mach_dep.lo"
-+ ;;
- ia64-*-*)
- machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
- ;;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synopsis~/src/Synopsis/gc/configure.ac synopsis/src/Synopsis/gc/configure.ac
---- synopsis~/src/Synopsis/gc/configure.ac 2008-11-07 00:59:12.000000000 +0100
-+++ synopsis/src/Synopsis/gc/configure.ac 2010-04-29 10:04:27.000000000 +0200
-@@ -402,6 +402,9 @@
- sparc*-sun-solaris2.*)
- machdep="mach_dep.lo sparc_mach_dep.lo"
- ;;
-+ sparc*-*-*)
-+ machdep="mach_dep.lo sparc_mach_dep.lo"
-+ ;;
- ia64-*-*)
- machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
- ;;
Added: packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.diff
===================================================================
--- packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.diff (rev 0)
+++ packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.diff 2015-08-19 21:07:57 UTC (rev 12269)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_bts565051_FTBFS_GCC4.5.dpatch by Matthias Klose <doko at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS with GCC 4.5
+
+ at DPATCH@
+--- synopsis-0.12.orig/Synopsis/Parsers/Cxx/Types.cc
++++ synopsis-0.12/Synopsis/Parsers/Cxx/Types.cc
+@@ -169,7 +169,7 @@
+ // Class Types::FuncPtr
+ //
+
+-FuncPtr::FuncPtr(Type::Type* ret, const Mods& premods, const Type::vector& params)
++FuncPtr::FuncPtr(Type* ret, const Mods& premods, const Type::vector& params)
+ : m_return(ret), m_premod(premods), m_params(params)
+ {}
+
Property changes on: packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.dpatch
===================================================================
--- packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.dpatch 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/patches/30_bts565051_FTBFS_GCC4.5.dpatch 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_bts565051_FTBFS_GCC4.5.dpatch by Matthias Klose <doko at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS with GCC 4.5
-
- at DPATCH@
---- synopsis-0.12.orig/Synopsis/Parsers/Cxx/Types.cc
-+++ synopsis-0.12/Synopsis/Parsers/Cxx/Types.cc
-@@ -169,7 +169,7 @@
- // Class Types::FuncPtr
- //
-
--FuncPtr::FuncPtr(Type::Type* ret, const Mods& premods, const Type::vector& params)
-+FuncPtr::FuncPtr(Type* ret, const Mods& premods, const Type::vector& params)
- : m_return(ret), m_premod(premods), m_params(params)
- {}
-
Deleted: packages/synopsis/trunk/debian/patches/Makefile
===================================================================
--- packages/synopsis/trunk/debian/patches/Makefile 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/patches/Makefile 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1,4 +0,0 @@
-
-.PHONY: 00list
-00list: $(wildcard *.dpatch)
- ls -1 $^ | sed -ne 's,\.dpatch,,p' >| $@
Added: packages/synopsis/trunk/debian/patches/series
===================================================================
--- packages/synopsis/trunk/debian/patches/series (rev 0)
+++ packages/synopsis/trunk/debian/patches/series 2015-08-19 21:07:57 UTC (rev 12269)
@@ -0,0 +1,3 @@
+10_bts558996_FTBFS_hppa_invalid_initializer.diff
+20_bts576225_FTBFS_sparc_undefined_reference.diff
+30_bts565051_FTBFS_GCC4.5.diff
Deleted: packages/synopsis/trunk/debian/pycompat
===================================================================
--- packages/synopsis/trunk/debian/pycompat 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/pycompat 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1 +0,0 @@
-2
Modified: packages/synopsis/trunk/debian/rules
===================================================================
--- packages/synopsis/trunk/debian/rules 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/rules 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1,22 +1,18 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
-
PKG_TMP=$(CURDIR)/debian/tmp
export ROOTSYNOPSIS=$(CURDIR)/debian/synopsis
export ROOTSYNOPSISDOC=$(CURDIR)/debian/synopsis-doc
-build build-arch build-indep: patch-stamp
-
-clean: unpatch
+clean:
dh clean
# cancel mor stuff, to build it twice in a row
find $(CURDIR)/Synopsis -name "*.pyc" -delete
rm -rf build/
%:
- dh $@
+ dh $@ --with python2
override_dh_auto_clean:
Modified: packages/synopsis/trunk/debian/source/format
===================================================================
--- packages/synopsis/trunk/debian/source/format 2015-08-19 20:40:46 UTC (rev 12268)
+++ packages/synopsis/trunk/debian/source/format 2015-08-19 21:07:57 UTC (rev 12269)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-apps-commits
mailing list