so I committed and testing now wow -- we even crossed with commits progressing the revision... I took yours since you committed first, although it is a bit 'incorrect':
-fis-gtm (5.5-000+git100-g949806c-1) UNRELEASED; urgency=low +fis-gtm (5.5-000+git102-g949806c-1) UNRELEASED; urgency=low that number in +git102 would tell that we have 102 commits since 5.5-000... it is not used anywhere ATM but important for versions comparisons (i.e. to say that this snapshot is older than a new one). You can easily obtain it if you do what I did (I can't push to your repo): git tag -m 'Imported 55000 release' 5.5-000 dee71008ddc86a6d5b91e6fdb0dc61e82bee6a62 # so you get 5.5-000 taged (with annotation) in git # and then get your 'describe' for the brad's branch HEAD git describe origin/hackathonjune2012-brad to get the number (pretty much version) you need I even have a bash function to ease modifications in debian/changelog for such purposes: http://git.onerussian.com/?p=etc/bash.git;a=blob;f=.bash/bashrc/30_aliases_sh;hb=HEAD#l215 so I would do GIT_DIR=../fis-gtm-5.5-000/.git dch_gitrev origin/hackathonjune2012-brad but oops - didn't work ;) will fix it eventually -- might be due to running with GIT_DIR anyways -- here is also my ultimate building command now (didn't want to bother with adjusting my out-of-packaging default build behavior of git-buildpackage): tarball=../fis-gtm_`LC_ALL=C dpkg-parsechangelog | awk '/^Version:/{print $2;}' | sed -e 's,-[^-]*$,,g'`.orig.tar.gz; [ -e $tarball ] || debian/rules get-orig-source; git clean -dfx; tar --strip-components=1 -xzvf $tarball && quilt push -a && PATH=/usr/lib/ccache:$PATH dpkg-buildpackage -uc -us -rfakeroot On Thu, 21 Jun 2012, Yaroslav Halchenko wrote: > On Thu, 21 Jun 2012, Yaroslav Halchenko wrote: > > ok -- I have just git svn dcommitted few relevant changes: > > * 804f96c - (HEAD, git-svn, master) Progress to use most recent > > origin/hackathonjune2012-brad (43 seconds ago) [yoh] > > * 1cc6a96 - debian/watch - parse upstream's single number version (e.g. > > 55000 -> 5.5-000) (45 seconds ago) [yoh] > > * 7aefbdd - get-orig-source: fetch tarball from github of pre-release > > snapshots (46 seconds ago) [yoh] > > so now you can just do > > debian/rules get-orig-source > > and depending on either it is a packaging of a released version or of git > > tarball -- it should fetch a corresponding tarball for you from uscan or > > from > > github directly. Tarball will match treeish in the latest debian changelog > > entry. > > all patches still apply fine as I see ;-) > but it doesn't build any longer :-/ (returning all others into CCs ;) > [ 0%] Building C object > CMakeFiles/gtm_threadgbl_deftypes.dir/sr_port/gtm_threadgbl_deftypes.c.o > /usr/lib/ccache/gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 > -D_LARGEFILE64_SOURCE -ansi -fsigned-char -fPIC -Wmissing-prototypes -O2 > -DNDEBUG -fno-defer-pop -fno-strict-aliasing -ffloat-store > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_linux > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_x86_64 > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_x86_regs > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_unix_gnp > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_unix_cm > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_unix > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_port_cm > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_port > -I/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/obj-x86_64-linux-gnu -o > CMakeFiles/gtm_threadgbl_deftypes.dir/sr_port/gtm_threadgbl_deftypes.c.o -c > /home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_port/gtm_threadgbl_deftypes.c > In file included from > /home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_port/mprof.h:17:0, > from > /home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_port/gtm_threadgbl_deftypes.c:61: > /home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/sr_port/fix_xfer_entry.h:22:23: > fatal error: xfer_desc.i: No such file or directory > compilation terminated. > make[3]: *** > [CMakeFiles/gtm_threadgbl_deftypes.dir/sr_port/gtm_threadgbl_deftypes.c.o] > Error 1 > make[3]: Leaving directory > `/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/obj-x86_64-linux-gnu' > make[2]: *** [CMakeFiles/gtm_threadgbl_deftypes.dir/all] Error 2 > make[2]: Leaving directory > `/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/obj-x86_64-linux-gnu' > make[1]: *** [all] Error 2 > make[1]: Leaving directory > `/home/yoh/deb/perspect/fis-gtm/fis-gtm-gitsvn/obj-x86_64-linux-gnu' > dh_auto_build: make -j1 returned exit code 2 > I guess smth is needed in addition to > commit 33f1fdacf98c92e01bb5fb116521a234010cc3fa > Author: Brad King <[email protected]> > Date: Thu Jun 21 09:33:15 2012 -0400 > Generate xfer_desc.i with CMake code > CMakeLists.txt | 31 ++++- > sr_unix/gen_xfer_desc.cmake | 63 ++++++++++ > sr_x86_64/xfer_desc.i | 275 > ------------------------------------------- > 3 files changed, 90 insertions(+), 279 deletions(-) -- Yaroslav O. Halchenko Postdoctoral Fellow, Department of Psychological and Brain Sciences Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
