From ee7e568449e1b189f1dfd3090fb4e6af9cbdead39a9d794a9b023226e2894d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 09:47:29 +0000 Subject: [PATCH 01/11] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=119 --- _servicedata | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 _servicedata diff --git a/_servicedata b/_servicedata deleted file mode 100644 index a00eaf2..0000000 --- a/_servicedata +++ /dev/null @@ -1,6 +0,0 @@ - - - git://github.com/adrianschroeter/obs-service-tar_scm.git - 309b68f96203645af093c0c2285655f2cf8f1aee - git://github.com/openSUSE/obs-service-tar_scm.git - 49c9462599650ab6a6d122b9156c732187cf99ea \ No newline at end of file From 626115a7313924effd533e876618b2090ab8d330f16871dc63b1449c1d4f9825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 09:54:10 +0000 Subject: [PATCH 02/11] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=120 --- _servicedata | 4 ++++ ...ce-tar_scm-0.6.1.1471594222.d257927.tar.gz | 3 --- ...ce-tar_scm-0.6.1.1472636708.355b59a.tar.gz | 3 +++ obs-service-tar_scm.changes | 20 +++++++++++++++++++ obs-service-tar_scm.spec | 6 +++--- 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 _servicedata delete mode 100644 obs-service-tar_scm-0.6.1.1471594222.d257927.tar.gz create mode 100644 obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..046f976 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + git://github.com/adrianschroeter/obs-service-tar_scm.git + 355b59aa569e514c37e412238037d574058ad049 \ No newline at end of file diff --git a/obs-service-tar_scm-0.6.1.1471594222.d257927.tar.gz b/obs-service-tar_scm-0.6.1.1471594222.d257927.tar.gz deleted file mode 100644 index dc831ae..0000000 --- a/obs-service-tar_scm-0.6.1.1471594222.d257927.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56a6d0ea834cdc5b28e56deadb7e929997eba9a291ade0d8857ef7c26d8a9ca4 -size 37650 diff --git a/obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz b/obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz new file mode 100644 index 0000000..c763115 --- /dev/null +++ b/obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a988c4ddeed7bf0b290d6a44df2900fc96fd29056cc78f8241e22179c77cdb6 +size 37246 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index ec491db..3b32bc0 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Aug 31 09:53:37 UTC 2016 - adrian@suse.de + +- fix debian builds + +------------------------------------------------------------------- +Wed Aug 31 09:53:23 UTC 2016 - adrian@suse.de + +- Update to version 0.6.1.1472636708.355b59a: + * fix some more merge regressions + * pep8 fixes/workarounds + * make yaml dependency optional for travis + * Add an option 'master' to submodules to fetch the latest mater branch. + * tar_scm.py: Always use an absolute path for the 'output' directory + * do not set files back to 1970... + * transfer mtime via obsinfo + * create needed sub directories for cache handling + * prefer local cache directory + * - weak dependency to mercurial for debian + ------------------------------------------------------------------- Fri Aug 19 08:11:24 UTC 2016 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index d3400b0..f3315c7 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.1.1471594222.d257927 +%define version_unconverted 0.6.1.1472636708.355b59a Name: obs-service-obs_scm %else -%define version_unconverted 0.6.1.1471594222.d257927 +%define version_unconverted 0.6.1.1472636708.355b59a Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.1.1471594222.d257927 +Version: 0.6.1.1472636708.355b59a Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From fe929581e1b34df6b86144a0a1e6b319d0c0c936dc86ba6a3d4190b6cb3e5834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 11:41:54 +0000 Subject: [PATCH 03/11] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=121 --- ...ianization-disable-running-mercurial-tests.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/0001-Debianization-disable-running-mercurial-tests.patch b/0001-Debianization-disable-running-mercurial-tests.patch index 14eca12..74d8194 100644 --- a/0001-Debianization-disable-running-mercurial-tests.patch +++ b/0001-Debianization-disable-running-mercurial-tests.patch @@ -14,19 +14,6 @@ building the package. tests/test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/debian/control b/debian/control -index a45fa04..6f3551d 100644 ---- a/debian/control -+++ b/debian/control -@@ -2,7 +2,7 @@ Source: obs-service-tar-scm - Section: devel - Priority: extra - Maintainer: Daniel Gollub --Build-Depends: debhelper (>= 8.0.0), bzr, git, mercurial, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-unittest2, subversion -+Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-unittest2, subversion - Standards-Version: 3.9.3 - Homepage: https://github.com/openSUSE/obs-service-tar_scm - X-Python-Version: >= 2.6 diff --git a/tests/test.py b/tests/test.py index 3814e71..ca480b7 100755 --- a/tests/test.py From 5916ea88009c2f4c197768cc7285c2e1b38b53a1d1212ca232dde418df48f5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 11:43:26 +0000 Subject: [PATCH 04/11] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=122 --- debian.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.dsc b/debian.dsc index 5a6a65c..8f701f9 100644 --- a/debian.dsc +++ b/debian.dsc @@ -6,4 +6,4 @@ Binary: obs-service-tar_scm Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 7), bzr, git, python (>= 2.6), python-argparse | python (>= 2.7), subversion, python-unittest2, pep8, python-lxml +Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-dateutil, python-unittest2, subversion From 95e4d5e7ef04e55256fbe0e185de69c78f1c62b375f3183f9158607017c0cb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 11:59:52 +0000 Subject: [PATCH 05/11] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=123 --- debian.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.dsc b/debian.dsc index 8f701f9..bfa051a 100644 --- a/debian.dsc +++ b/debian.dsc @@ -6,4 +6,4 @@ Binary: obs-service-tar_scm Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-dateutil, python-unittest2, subversion +Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-dateutil, python-unittest2, subversion, python-mock, python-yaml From 676c9551ad1a3e570451af44a7542e42493805ad9979d8b7402e27d59f72add3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 14:47:50 +0000 Subject: [PATCH 06/11] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=124 --- debian.dsc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian.dsc b/debian.dsc index bfa051a..c9ac3df 100644 --- a/debian.dsc +++ b/debian.dsc @@ -7,3 +7,13 @@ Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-dateutil, python-unittest2, subversion, python-mock, python-yaml + +Package: obs-service-tar_scm +Architecture: all +Provides: obs-service-obs-scm, obs-service-tar +Depends: ${misc:Depends}, ${python:Depends}, bzr, git, subversion, cpio, python-dateutil +Recommends: mercurial +Description: An OBS source service: fetches SCM tarballs + This is a source service for openSUSE Build Service. + It supports downloading from svn, git, hg and bzr repositories. + From 633eeb783061e4eaa4bd4723c93b4d08cc8ebb630e8ec7fda9c01a6e15372607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 14:50:04 +0000 Subject: [PATCH 07/11] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=125 --- debian.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.dsc b/debian.dsc index c9ac3df..15857f7 100644 --- a/debian.dsc +++ b/debian.dsc @@ -6,7 +6,7 @@ Binary: obs-service-tar_scm Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-dateutil, python-unittest2, subversion, python-mock, python-yaml +Build-Depends: debhelper (>= 8.0.0), python (>= 2.6), python-argparse | python (>= 2.7), python-dateutil Package: obs-service-tar_scm Architecture: all From 579c202873b009c82d9fe39b388255df4c618129a29fa45f00a07f116cb6c42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 14:56:03 +0000 Subject: [PATCH 08/11] up OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=126 --- _servicedata | 2 +- obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz | 3 --- obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz | 3 +++ obs-service-tar_scm.changes | 7 +++++++ obs-service-tar_scm.spec | 6 +++--- 5 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz create mode 100644 obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz diff --git a/_servicedata b/_servicedata index 046f976..e12cfb7 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - 355b59aa569e514c37e412238037d574058ad049 \ No newline at end of file + 4930b8160f27fc753c96e99400e22edba273bace \ No newline at end of file diff --git a/obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz b/obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz deleted file mode 100644 index c763115..0000000 --- a/obs-service-tar_scm-0.6.1.1472636708.355b59a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a988c4ddeed7bf0b290d6a44df2900fc96fd29056cc78f8241e22179c77cdb6 -size 37246 diff --git a/obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz b/obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz new file mode 100644 index 0000000..dd7f407 --- /dev/null +++ b/obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2773c52837bdda4fef9e8e539bf9eb99fc4b1ff6a96463c368db8a98dce00628 +size 37101 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 3b32bc0..6ed0554 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 31 14:55:10 UTC 2016 - adrian@suse.de + +- Update to version 0.6.1.1472655284.4930b81: + * add python-dateutil require for debian + * testing on debian is broken atm + ------------------------------------------------------------------- Wed Aug 31 09:53:37 UTC 2016 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index f3315c7..7d87143 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.1.1472636708.355b59a +%define version_unconverted 0.6.1.1472655284.4930b81 Name: obs-service-obs_scm %else -%define version_unconverted 0.6.1.1472636708.355b59a +%define version_unconverted 0.6.1.1472655284.4930b81 Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.1.1472636708.355b59a +Version: 0.6.1.1472655284.4930b81 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From 4bc60354199608dad9de0286c77a2c60244e182094f829ddaf335e835df9a08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 15:27:38 +0000 Subject: [PATCH 09/11] grr OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=127 --- _servicedata | 2 +- debian.dsc | 4 ++-- obs-service-tar_scm.changes | 30 ++++++++++++++++++++++++++++++ obs-service-tar_scm.spec | 6 +++--- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/_servicedata b/_servicedata index e12cfb7..0b1aeb1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - 4930b8160f27fc753c96e99400e22edba273bace \ No newline at end of file + ff9a5ca9d38691524048733ec6d070bfba6d4747 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 15857f7..5cb93a7 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,5 +1,5 @@ Format: 1.0 -Source: obs-service-tar_scm +Source: obs-service-tar-scm Version: 0.5.0 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm @@ -8,7 +8,7 @@ Architecture: all Standards-Version: 3.7.2 Build-Depends: debhelper (>= 8.0.0), python (>= 2.6), python-argparse | python (>= 2.7), python-dateutil -Package: obs-service-tar_scm +Package: obs-service-tar-scm Architecture: all Provides: obs-service-obs-scm, obs-service-tar Depends: ${misc:Depends}, ${python:Depends}, bzr, git, subversion, cpio, python-dateutil diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 6ed0554..9a2820a 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Aug 31 15:26:51 UTC 2016 - adrian@suse.de + +- Update to version 0.6.1.1472657181.ff9a5ca: + * make yaml dependency optional for travis + * Add an option 'master' to submodules to fetch the latest mater branch. + * tar_scm.py: Always use an absolute path for the 'output' directory + * do not set files back to 1970... + * transfer mtime via obsinfo + * create needed sub directories for cache handling + * prefer local cache directory + * - weak dependency to mercurial for debian + * add python-dateutil require for debian + * testing on debian is broken atm + +------------------------------------------------------------------- +Wed Aug 31 15:10:37 UTC 2016 - adrian@suse.de + +- Update to version 0.6.1.1472656157.58c52d8: + * make yaml dependency optional for travis + * Add an option 'master' to submodules to fetch the latest mater branch. + * tar_scm.py: Always use an absolute path for the 'output' directory + * do not set files back to 1970... + * transfer mtime via obsinfo + * create needed sub directories for cache handling + * prefer local cache directory + * - weak dependency to mercurial for debian + * add python-dateutil require for debian + * testing on debian is broken atm + ------------------------------------------------------------------- Wed Aug 31 14:55:10 UTC 2016 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 7d87143..e22fbf6 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.1.1472655284.4930b81 +%define version_unconverted 0.6.1.1472657181.ff9a5ca Name: obs-service-obs_scm %else -%define version_unconverted 0.6.1.1472655284.4930b81 +%define version_unconverted 0.6.1.1472657181.ff9a5ca Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.1.1472655284.4930b81 +Version: 0.6.1.1472657181.ff9a5ca Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From 316948ebcb79ba22277a045e97f7398ce82cdf1bf9c2f6f1dacf86862c7ff9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 15:33:30 +0000 Subject: [PATCH 10/11] grmbl OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=128 --- obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz | 3 --- obs-service-tar_scm-0.6.1.1472657181.ff9a5ca.tar.gz | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz create mode 100644 obs-service-tar_scm-0.6.1.1472657181.ff9a5ca.tar.gz diff --git a/obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz b/obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz deleted file mode 100644 index dd7f407..0000000 --- a/obs-service-tar_scm-0.6.1.1472655284.4930b81.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2773c52837bdda4fef9e8e539bf9eb99fc4b1ff6a96463c368db8a98dce00628 -size 37101 diff --git a/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca.tar.gz b/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca.tar.gz new file mode 100644 index 0000000..355467d --- /dev/null +++ b/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1c0528c6e38781138a3026eba90ab893094a93ed584d62118a298e3a4a4fb2e +size 37014 From e024a1d9a37da27e1823ab6ee85bf8ab70c573c3fa29c457efd5d61e97fc9992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Aug 2016 15:40:02 +0000 Subject: [PATCH 11/11] grumbel OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=129 --- debian.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.dsc b/debian.dsc index 5cb93a7..e822878 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.5.0 +Version: 0.6.1 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter