From 8744137d271a2a133732a3f8a3620e20ecb6a638 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 8 Dec 2015 23:35:04 +0200 Subject: [PATCH] Update pristine-tar branches of test repositories Make them compatible with Debian. Signed-off-by: Markus Lehtonen --- gbp-test.data/manifest.json | 40 +++++++-------- ...ne-tar-data-for-gbp-test-1.0.tar.bz2.patch | 47 ++++++++--------- ...ne-tar-data-for-gbp-test-1.1.tar.bz2.patch | 47 ++++++++--------- gbp-test2.data/manifest.json | 18 +++---- ...ne-tar-data-for-gbp-test2-2.0.tar.gz.patch | 50 ++++++++----------- 5 files changed, 90 insertions(+), 112 deletions(-) diff --git a/gbp-test.data/manifest.json b/gbp-test.data/manifest.json index fc62eea..08d2968 100644 --- a/gbp-test.data/manifest.json +++ b/gbp-test.data/manifest.json @@ -64,14 +64,6 @@ "sha1": "4140ac36c9511620734b1692d175ff8bb7435b79", "tree": "ea3ca259d5a73df217bbcc0b5e099faa3ba1dbbd" }, - "42239c7f237b51a02b701dbd077f161c3a8036cb": { - "author": "Markus Lehtonen 1405419535 +0300", - "committer": "Markus Lehtonen 1405419535 +0300", - "message": "pristine-tar data for gbp-test-1.0.tar.bz2", - "patchfile": "pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch", - "sha1": "42239c7f237b51a02b701dbd077f161c3a8036cb", - "tree": "f158ca5c2372e2386efc41d55da67117de6457c1" - }, "6450890aa002b0868537ee50cc1aea177fdcc941": { "author": "Markus Lehtonen 1352272541 +0200", "committer": "Markus Lehtonen 1352272541 +0200", @@ -135,6 +127,17 @@ "sha1": "925e9580ae2a76331dff7c09a27080c695d88cc3", "tree": "19149d2bb381d1d4e7d52d9e3c96df18d69b3eab" }, + "b03064b98c05d4778de76df5afa30bbf7b6c5631": { + "author": "Markus Lehtonen 1449595707 +0200", + "committer": "Markus Lehtonen 1449595707 +0200", + "message": "pristine-tar data for gbp-test-1.1.tar.bz2", + "parents": [ + "bf7525b3afe67f7416246c7fa7a9c6c6dc6f2887" + ], + "patchfile": "pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch", + "sha1": "b03064b98c05d4778de76df5afa30bbf7b6c5631", + "tree": "6f140200031de57c51de29fd2e57043c26d3174e" + }, "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f": { "author": "Markus Lehtonen 1369033598 +0300", "committer": "Markus Lehtonen 1448549157 +0200", @@ -146,6 +149,14 @@ "sha1": "b3cd99dae46fcec1ad7e4b2adf41b1ec6cfa590f", "tree": "fc16065ed8b66d42d060670d611ecf6bad1746b9" }, + "bf7525b3afe67f7416246c7fa7a9c6c6dc6f2887": { + "author": "Markus Lehtonen 1449595698 +0200", + "committer": "Markus Lehtonen 1449595698 +0200", + "message": "pristine-tar data for gbp-test-1.0.tar.bz2", + "patchfile": "pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch", + "sha1": "bf7525b3afe67f7416246c7fa7a9c6c6dc6f2887", + "tree": "810ea4b61a223e8ed1aca6e980fa51db7af65582" + }, "cb5596d72659212d947f0cb882d758edb70a69b8": { "author": "Markus Lehtonen 1352272405 +0200", "committer": "Markus Lehtonen 1352272405 +0200", @@ -168,17 +179,6 @@ "sha1": "cbf747086e12cc390cdae71ce297b0e1a55a420a", "tree": "22658ce6155376fc6348769bc1756725acca705b" }, - "ee75150c3e9f3dacc1000d7ebc34a833e23b0356": { - "author": "Markus Lehtonen 1405419544 +0300", - "committer": "Markus Lehtonen 1405419544 +0300", - "message": "pristine-tar data for gbp-test-1.1.tar.bz2", - "parents": [ - "42239c7f237b51a02b701dbd077f161c3a8036cb" - ], - "patchfile": "pristine-tar-data-for-gbp-test-1.1.tar.bz2.patch", - "sha1": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356", - "tree": "2435a8996297f840489f8dfbda5d19d3ed49a669" - }, "f234683df1682cc81a631856b2bf284340234975": { "author": "Markus Lehtonen 1352396256 +0200", "committer": "Markus Lehtonen 1448549157 +0200", @@ -206,7 +206,7 @@ "refs/heads/fork": "cbf747086e12cc390cdae71ce297b0e1a55a420a", "refs/heads/master": "925e9580ae2a76331dff7c09a27080c695d88cc3", "refs/heads/pq/master": "2daf4a20c32d63966f55ffff05643388b58b7a4d", - "refs/heads/pristine-tar": "ee75150c3e9f3dacc1000d7ebc34a833e23b0356", + "refs/heads/pristine-tar": "b03064b98c05d4778de76df5afa30bbf7b6c5631", "refs/heads/upstream": "6450890aa002b0868537ee50cc1aea177fdcc941", "refs/tags/fork/release/1.0-1": "e7d565fd0795315ef64c28aedabcfc4c0d7c579a", "refs/tags/release/1.0-1": "b96b77fa4c4016f788aa5a36fa53241305ba86b2", diff --git a/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch b/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch index f30b81b..5c9826a 100644 --- a/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch +++ b/gbp-test.data/pristine-tar-data-for-gbp-test-1.0.tar.bz2.patch @@ -1,37 +1,30 @@ From: Markus Lehtonen -Date: Tue, 15 Jul 2014 13:18:55 +0300 +Date: Tue, 8 Dec 2015 19:28:18 +0200 Subject: [PATCH] pristine-tar data for gbp-test-1.0.tar.bz2 diff --git a/gbp-test-1.0.tar.bz2.delta b/gbp-test-1.0.tar.bz2.delta new file mode 100644 -index 0000000000000000000000000000000000000000..3f9f7283723d8738e02b5129e92846437c613e33 +index 0000000000000000000000000000000000000000..e5368ef01667d60f2823c6a12bfbd493e987dfab GIT binary patch -literal 1234 -zcmV;@1TFg?iwFP@0L4=P1MQi8OdDk!$Db>ZkxHNvLB?b>3JLg9?(Mm2mtaM~_!2gh -z1291BS2+M~02M -z4p*O65!NeUu<26w`=sqXcfY64^W5{?_rA|PXDF(W+U}7hyXe02hC%w6h-gOtPRY~M;@Gf2K5~a#pqx0>f34Mhn?lCFNc&H!T&kCA91Zg9kq664 -zO3TY;_w6lCXS<=f4m2M37*zh>N>UD2V-)LHg8yTV1OJZ&k^O(h!z26uoGAEzoD+Su -zt69|lX_fvtjKTk70qFGVM(zK0xj~VlTE`OnpW#IC|5y;&|HYt(8}U5;KPL+QALm40 -z?P?bBe}-kkpZ{4=gy;X5kpFP$I-2J5Lpy2cn((+sws~Ypkx3_6rG^HV$5H!t(k-=F -zY8zZ6X{ihOM`)M{JQ+-y7sx$DYjWLHVJl- -z6|jkASi6ZAYiOI*Xk_goHp+IZNK1mrYSab|>hiK#fo2d6FIynN@J5ge4AH8LJQtpk -z<8g$Hq-IV~mnpL9tO$7%5K8p!dj^S@XSdH%-- -z-|%35p7|dajEW-6|NaL=U+roZTmQifuUh{RXqf-Sg52km$+T~%5+(e6{Lt#B=&Yni -zkKLYBq#youvMlplwO^Z)-<6cwn#E1|smJi>Nr!rZS#u-2lQVJo#-l@PQCk`g5R24qkSh^`wpM}!g7S` -zIKY+co9ODV-~XZgzNvNHZ@-sUZCP$JOuzL?&c_$qeS^DFHr=%8hr3Qs9ogc4HaXy5 -z+2-l#?9IrKdvqORgYTYm9N)@)cA@B}FWV3EfwK?j_blK0-_M_Ri^?Qc6RoR2l9^DPK>7MEmFXI@%`3cvd(AU@3*kNPVIPLU}(+8ao+`V -zH#;7yqnmTK2iBW&w{IL?)4x0L9Pc+L`8rRHyjiRa1ROg%_viV|Pan!INg^Hi -z`N3OOxqEw1!Id7#rJ?qJrQIz@w~i(FKh47WPfURKKUX)=SG$_U{GUAeg|Ghzm;?Wh -w1?1#GsQ>@~00000000000000000000000000000001#*V314n(5CBjB02+aB2mk;8 +literal 850 +zcmV-Y1FifYiwFQR6K7Tc1MQZ1NEA^V$A6=Sp@!Q@bh%W9N#&b2GjG-D2kZPN=93eh6TuFw+$bMCEs*0p3 +z`Xo6duh*}7TwjU-Y5gjf*RK~>xfMxP)Nq(}cs-biCp;1m7W5#qyuc!Gg(q6Cs(!!L +zb$^L|&nghG+3ENBlwvK*=@5iWB8!*^nV7|LCNCBur^8~wvM5*-*&!l{WI8Mfq9{a2 +zVS-o?45WxYHqu4R5kN+EJQr!l@q)3P?j}cmR1~qHB|s<^V1R8%%FMUilw~hR#2;@% +z*()A}7BMkNX#q)dy3MkrNt4GtJL#^QKBT_vL2PsNpm9oL48tTx#IAk+tQ|XF9GL)0KU8M&6UQ08z7b` +z8VfM|7q(0&&I7RJl1@1A5Q +z+(M?Ub*Hne8HeQ)Y-K}!+C!@^_mq9%*`tYz%P-H{-qK0V&$AbPm{fju_R5Qs(l@<0 +zc&*^> -Date: Tue, 15 Jul 2014 13:19:04 +0300 +Date: Tue, 8 Dec 2015 19:28:27 +0200 Subject: [PATCH] pristine-tar data for gbp-test-1.1.tar.bz2 diff --git a/gbp-test-1.1.tar.bz2.delta b/gbp-test-1.1.tar.bz2.delta new file mode 100644 -index 0000000000000000000000000000000000000000..f142beddaf21b582fea8eb837b22aea886209c28 +index 0000000000000000000000000000000000000000..3e4f0bf6ec4c81895ae8dbdcd0dbe8684b0778be GIT binary patch -literal 1236 -zcmV;_1S|U=iwFQ10L4=P1MQiAY!hV|$KUH_hJ!$f!W!9JBW`X)*ZX~|1O~}4Vp3Qb -z1Qp_PyWX~L?ONLFHXyEDjLr#y0-~~jl7Pm*P{!i2#0+CH0q4e+88w=zlT5}R0|E;y -znd5w0og2NfnRzK0JfF0^_wIT7zIXTb`+lE$n`OxptDcobyX^I43E4Dhsq~5-kL*SI -zL1K884R0}#TasdEM9~aS(Rhc!$0>%Rcx0~9@f_}m-=~OPd@BF9oyd!uAuy!br8r#j -zGKwWRma=jzo5j&q*2)Q_kcgw=q)|x|Wmp{LtW4tFzB1sypugI+Owd0iaDPjL8lMkH -zj^ZNq&u}a<$3#S9`ge)mEq=$gN$TMla*}ptsQy!T%t9vAmXG2F-|JoT3Tb-HdSgjN -z9Nl`OZ0X#J%ZHo0GO6U>-lCY6ZA;(m?%HW}mhNvozq)4k&=Y=ul&gNHS6B)Tv!|QWuL45;pa|U|EHrn -zlPc3*_jV8Y^Bd}Bx2<3D$L6{P?|yT3(Z;6yw%WaI>PriU)B1WYUtg@+zbnoi7zuce -z@49X|+8)?ve7XPh$=>$XN7H}t1Z={Wo-NVy7Dy -z3rfQN5guj?iwBcrc|0f342MEP%~1?09=p+Aw_6FlIod3_T`sv?S;n&*nQbLSktFFt -zGMmrl7(tdfQj#c97AZj}vP+Vcr4j{!i)fqXNfvRDZSypzISHDj5UHuilaUn}79Z18 -z#62^-woQT4R>e6%976Fwrf;&TDFfF^lUknX|A<^sAIu{Rb22=lB9)l!q9SH?Bp83% -zzN7kuqo*2D+It`T{(S>M%!|0;H~p>0_wK*6V*Z6%!>QCSa)NmX7qNgO9W?K -zil4fYaUee2(p$53Vf`m26c>7)Qt>5{kW1>b)}Qt>d;XW=D~@DqM*MRvUrPnFRPhFa%D0wfbLY4U=6NkAT0m;f(ff!YcLij#4A=9ocLT-+^Rw~ +z#TcYw8VrWjfUmn4p__|*!LU&*@+;J%sPQlx2+$cnNx&k7(iwRPk +zgar^yq$E!4ykNAM*%@x~Qg20BG_?fKQvuRfOIkWv`$;jGy +zk5Ay)hxDZ=B_k_BHMig4p&Ffhpz_6_%+(JZzQq&m_9DxWwiJY{39-w)t%3A`Ptty`qpdwHu598p(nsmWFrp(rOms#M8x=Jg2$v;Q!*u_L +zxy0|kk&o>A-xqLf5BFcQNu`m9q9#?tEdP1j>;F&SB$oeu!MMExVft`iA*4QUoHKMg +zw(Wd)Ixl@>!@2zI4(EQ`m6V$Fg0|Pi8Wnb3%yPZITsO7J<9&6arapiDg(*|=B6nL( +zT|fV!cINRLyBF@`uX$_k%yTU}(0 1405419767 +0300", - "committer": "Markus Lehtonen 1405419767 +0300", - "message": "pristine-tar data for gbp-test2-2.0.tar.gz", - "patchfile": "pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch", - "sha1": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f", - "tree": "aa56ec00b2a895dc32612e9717b525725c40e4a9" - }, "80d0f75635f6ac35f080736236836aac1e596845": { "author": "Markus Lehtonen 1357733987 +0200", "committer": "Markus Lehtonen 1448551035 +0200", @@ -116,6 +108,14 @@ "sha1": "dc4481d39005968f1f2673d760af69b411eccc33", "tree": "af52702a859e84653bfab0a1e0f9253177772f28" }, + "f89f9c7f4662c16559e6b76771a6f6689d48e2ad": { + "author": "Markus Lehtonen 1449597175 +0200", + "committer": "Markus Lehtonen 1449597175 +0200", + "message": "pristine-tar data for gbp-test2-2.0.tar.gz", + "patchfile": "pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch", + "sha1": "f89f9c7f4662c16559e6b76771a6f6689d48e2ad", + "tree": "29de04114bb7e206a81405bd95bb989fba0bce61" + }, "fb1bf5f16bfa1a4e3ffd29fcc0820bd60fbd1a35": { "author": "Markus Lehtonen 1352806552 +0200", "committer": "Markus Lehtonen 1448551003 +0200", @@ -131,7 +131,7 @@ "refs": { "refs/heads/master": "2a17b0d682aa73f10a6e242e0f60408b61812047", "refs/heads/master-orphan": "a93779ad111470b1619f2ceb7a31dd10d6ad6a4f", - "refs/heads/pristine-tar": "75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f", + "refs/heads/pristine-tar": "f89f9c7f4662c16559e6b76771a6f6689d48e2ad", "refs/heads/upstream": "6dccee0ab7689e5ae446d39535138ea39a88e70c", "refs/tags/release/1%2.0-0": "3ee597fee679b6138467ac62e4f857ef5b59b240", "refs/tags/release/1%2.0-1": "d586d2c9384b2536bc1db0a6940578533ff9d122", diff --git a/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch b/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch index 5709e95..81504f6 100644 --- a/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch +++ b/gbp-test2.data/pristine-tar-data-for-gbp-test2-2.0.tar.gz.patch @@ -1,39 +1,31 @@ From: Markus Lehtonen -Date: Tue, 15 Jul 2014 13:22:47 +0300 +Date: Tue, 8 Dec 2015 19:52:55 +0200 Subject: [PATCH] pristine-tar data for gbp-test2-2.0.tar.gz diff --git a/gbp-test2-2.0.tar.gz.delta b/gbp-test2-2.0.tar.gz.delta new file mode 100644 -index 0000000000000000000000000000000000000000..94f3aed61c8e4d15c7ba44ca7df329d00facc63f +index 0000000000000000000000000000000000000000..b57b2b423cadf9d96d26f78b097d3ebb713fcf6b GIT binary patch -literal 1302 -zcmV+x1?l=9iwFSs0L4=P1MQi6Y*SSn$Il%Dwr*iH0kSy)3xqIvtmnSl#ceP*UI8)z -zqoStXwU@1~T}#`|Z3rump&~FbF^eLP1QT%hh!Z!3@Q4O=3XzvUm~%${KqMP7H4V)5 -zdRkZ*z3ob7Q?l&$N!xpFf4`o`J?DGBIk#E5BB^S=ESY7eD@)IDobF|(R7J55VX1JrB`4|1|E(u@a6<$ZXV}~po18;) -znCEDND2Q3KK_Dj#)@w*q8Zc@KjxyMPf(@MJVUG-W5TdVkHU0EYi~Jpl(D&{KSYU9l -z{#k+OKPDpT)4xq}uBx!q43J0ekOR~+MD;)EjRfRHCzhcRotN5|Y`|!fwC#wd99=lO -z^yhU~C)Olw{jI6M(RAwM3rBW-Q@Vfsj>V_G>Uqz-p>DU?m{*#6_|wDJFaPpWd-k#O -zD^3c!1KEiS^>eScoViw?-#B@D9n+-Ee`ort^o>gw97sYQ+ -z>gd9^<|dw*=Sy$Pu{HFp>-aLw`K!LRryMK%j>>+&)r0CZEdg7GUb|*+MPCM -zCv!|mVGsRK@R_D^+m)VD-xme{AL2w`?P?S|2L2mnl*&k|M!c6{||AZuXZ&N -z{hy^(&;Mu){vQh#OJ(v(i&fSvEu2%ZxKLxRu-U4!T%{o2;ep!!D@n;>FOOmygYbWz -zW5NGpLFoNIvDvU))l*_oGkt*G)({9lz$_VNVeimz?R4+@{hDv*eZ@tN8Fx&1)CNKJoP* -zV_KW=mPJS7C@LjrRz~~&y_qd**3bTY+>efi##cQ>2o)mq2&G+y&}gdcQG`+{?Q%-1 -zMJSolPCzK0d{V7(EfhjrAkzPpi4a8!2#t^MQ;I?+gho*>O+;v1=&X_cEKkCnwDj~hAiqvPyGuA@{MpfOncmV(a0000000000000000000000000000000ATp= -MA6fZ-?f_5#06lu0WdHyG +literal 879 +zcmV-#1Cab5iwFSs7-v=h1MQYuNEA^Rfd7+r!6diRkX&ke5bQ$E<;;wWMHDMVS1E}w +zN{_S0-PK)p9mmWfobE-JhYWg(iZ+PI3n5g9Bo#gslm%%}nGZz|6+Ki&R&L{JQ7g5+ +z>_&Ay=5l7v|Ih!Q^Pm6B?;{nSQd*@$4B<>Qs +zT3U^KG$uJKKy=k@a}u4*p8DdhaeqPX`~DN}dk@XF(}M{Jr9=d{;oZ*cS!*u2T8dU5 +z#RY8xMm~UfOh%S<0OL{lbbxeZDL@trKr*se0TRR4l<>;}06f(A;m86&;jU?;P)7(< +zfN`j720+?xB$1J5Bo2xj6Ncn7e*a};BoE75)X@wC8L5Ujv*^Z83G(l;g=$qEe??4f +zM6LfgA#(r6W=Y8Q|2QD9Lhrw(Mk9d$)naNRTK!LsRQU3B>zQ(qhJp-5fzAR14OWR)PD74l* +z?V0$j`(tm%m?b9z9c7`F^FArJPKT`N7oN7%FKTt~USU_;>aM=JmYUgrm(;bRW~y|z +z3{0uNv*AtX`In}kBV<3Ya5HS|dh#+@6MFXc)2WOz_v$7+Fg~O2qZ+uEus^rg3t4|~ +zX8#WK+5nBUjp+Y>9FhOLA}B2X=3 literal 0 HcmV?d00001 -- 2.34.1