[Pkg-tigervnc-devel] TigerVNC debian upload
Joachim Falk
joachim.falk at gmx.de
Mon Mar 25 08:59:47 UTC 2013
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hey,
Am 25.03.2013 02:09, schrieb Yaroslav Halchenko:
>
> On Sat, 23 Mar 2013, Yaroslav Halchenko wrote:
>
>>>>>> built fine for both wheezy and sid... As for the final
>>>>>> upload -- shouldn't we update X to 1.12.4 in tigervnc?
>>> OK, i have just update the container xorg server to 1.12.4.
>>> The resulting Xtigervnc is running fine in my environment. I
>>> have pushed to alioth. Maybe someone else wants to test this.
>
>> COOL -- I will test it too and if find nothing preventing upload,
>> will do so.
>
> ah -- it seems that it still might need more TLC ...
>
> 1. I have added libfltk1.3 to build-depends so it tries to build
> against system-wide (not internal copy)
Don't do that, as TigerVNC needs a special copy of fltk. It has extra
patches on top of the lib, which, last I checked, are not included in
the debian provided libfltk1.3.
> 2. added few more entries into debian/copyright
>
> 3. get-orig-source fails on me :-/ and I guess I am not that much
> of a guru in pristine-tar since it barely makes sense for me in
> this case... any hints?
Hmm, the pristine-tar situation for xorg is a bit complex. For the
newer xservers used in wheezy, the xorg debian strike force no longer
provides printe-tars. Hence, I have added the pristine-tar for the
xorg server in the pristine-tar branch of our pkg-tigervnc project.
The complex stuff below tries to merge our pkg-tigervnc/pristine-tar into
the debian xorg/pristine-tar branch to provide the missing
xorg-server_1.12.4.orig.tar.gz.delta and
xorg-server_1.12.4.orig.tar.gz.id files.
To not affect the checkout in xorg-server it first makes a copy of
xorg-server to xorg-server-helper. However, with the newer git
versions ,which uses .git files instead of .git dirs, the situation
has become even more complex, as the git repository objects are now
kept in the top project .git/modules/xorg-server directory.
> fatal: A branch named 'pristine-tar' already exists. fatal: remote
> pkg-tigervnc already exists.
This looks like you once did a debian/rules get-orig-source with the
newer git version while support for this version was still missing in
debian/rules. Hence, the xorg-server subproject was affected by the
modifications in the xorg-server-helper copy, because they both
referenced the .git/modules/xorg-server directory for git object file
storage. Can you try to checkout this stuff from scratch?
> $> gbp-pull gbp:info: Branch 'master' is already up to date.
>
> $> debian/rules get-orig-source git submodule update --init || {
> echo "Ups... Can't fetch subprojects!"; exit 1; } ( cd tigervnc &&
> pristine-tar checkout ../tigervnc_1.2.0.orig.tar.gz ) && \ mv -f
> tigervnc/../tigervnc_1.2.0.orig.tar.gz
> /home/yoh/deb/perspect/tigervnc/pkg-tigervnc/../tigervnc_1.2.0+X1.12.4.orig-tigervnc.tar.gz
>
>
pristine-tar: successfully generated ../tigervnc_1.2.0.orig.tar.gz
> ( cd /home/yoh/deb/perspect/tigervnc/pkg-tigervnc && { git fetch
> origin pristine-tar:pristine-tar || true; } ) && { \ cp -pr
> /home/yoh/deb/perspect/tigervnc/pkg-tigervnc/xorg-server
> /home/yoh/deb/perspect/tigervnc/pkg-tigervnc/xorg-server-help && \
> ( cd /home/yoh/deb/perspect/tigervnc/pkg-tigervnc/xorg-server-help
> && \ if test -f .git; then \ gitdir=`sed -ne
> '/^gitdir:/{s/^[^:]*:\s*//;p}' .git`; \ test x"$gitdir" != x"" -a
> -d "$gitdir" || exit 1; \ rm -f .git && cp -pr "$gitdir" .git ||
> exit 1; \ sed -e '/worktree/d' $gitdir/config > .git/config || exit
> 1; \ fi && \ { git checkout -b pristine-tar
> remotes/origin/pristine-tar || true; } && \ { git remote add
> pkg-tigervnc .. || true; } && \ git fetch pkg-tigervnc && \ git
> merge remotes/pkg-tigervnc/pristine-tar -m "Merge in pristine-tar
> delta+id files for currently used xorg-server version." && \
> pristine-tar checkout ../xorg-server_1.12.4.orig.tar.gz ) && \ mv
> -f
> /home/yoh/deb/perspect/tigervnc/pkg-tigervnc/xorg-server_1.12.4.orig.tar.gz
> /home/yoh/deb/perspect/tigervnc/pkg-tigervnc/../tigervnc_1.2.0+X1.12.4.orig-xorg-server.tar.gz
> && \ rm -rf
> /home/yoh/deb/perspect/tigervnc/pkg-tigervnc/xorg-server-help; } ||
> { rm -rf
> /home/yoh/deb/perspect/tigervnc/pkg-tigervnc/xorg-server-help; exit
> 1; } fatal: A branch named 'pristine-tar' already exists. fatal:
> remote pkg-tigervnc already exists. Merge made by the 'recursive'
> strategy. tigervnc_1.2.0+X1.12.1.902.orig.tar.gz.delta | Bin 0 ->
> 698 bytes tigervnc_1.2.0+X1.12.1.902.orig.tar.gz.id | 1 +
> tigervnc_1.2.0+X1.7.7.orig.tar.gz.delta | Bin 0 -> 1201 bytes
> tigervnc_1.2.0+X1.7.7.orig.tar.gz.id | 1 +
> tigervnc_1.2.0.orig.tar.gz.delta | Bin 0 -> 36036
> bytes tigervnc_1.2.0.orig.tar.gz.id | 1 +
> xorg-server_1.10.4.orig.tar.gz.delta | Bin 0 -> 65568
> bytes xorg-server_1.10.4.orig.tar.gz.id | 1 +
> xorg-server_1.12.1.902.orig.tar.gz.delta | Bin 0 -> 2283562
> bytes xorg-server_1.12.1.902.orig.tar.gz.id | 1 +
> xorg-server_1.12.4.orig.tar.gz.delta | Bin 0 -> 2302003
> bytes xorg-server_1.12.4.orig.tar.gz.id | 1 + 12 files
> changed, 6 insertions(+) create mode 100644
> tigervnc_1.2.0+X1.12.1.902.orig.tar.gz.delta create mode 100644
> tigervnc_1.2.0+X1.12.1.902.orig.tar.gz.id create mode 100644
> tigervnc_1.2.0+X1.7.7.orig.tar.gz.delta create mode 100644
> tigervnc_1.2.0+X1.7.7.orig.tar.gz.id create mode 100644
> tigervnc_1.2.0.orig.tar.gz.delta create mode 100644
> tigervnc_1.2.0.orig.tar.gz.id create mode 100644
> xorg-server_1.10.4.orig.tar.gz.delta create mode 100644
> xorg-server_1.10.4.orig.tar.gz.id create mode 100644
> xorg-server_1.12.1.902.orig.tar.gz.delta create mode 100644
> xorg-server_1.12.1.902.orig.tar.gz.id create mode 100644
> xorg-server_1.12.4.orig.tar.gz.delta create mode 100644
> xorg-server_1.12.4.orig.tar.gz.id fatal: Path
> 'xorg-server_1.12.4.orig.tar.gz.delta' exists on disk, but not in
> 'refs/heads/pristine-tar'. pristine-tar: git show
> refs/heads/pristine-tar:xorg-server_1.12.4.orig.tar.gz.delta
> failed make: *** [get-orig-source] Error 1 debian/rules
> get-orig-source 3,97s user 1,44s system 55% cpu 9,663 total
>
> $> git br * master master-old2 pristine-tar
>
> $> git show pristine-tar commit
> 6df9bdfd01a26e9e2b864c0cada32fc75164bb59 Author: Joachim Falk
> <joachim.falk at gmx.de> Date: Sat Mar 23 14:56:42 2013 +0100
>
> pristine-tar data for xorg-server_1.12.4.orig.tar.gz
>
> diff --git a/xorg-server_1.12.4.orig.tar.gz.delta
> b/xorg-server_1.12.4.orig.tar.gz.delta new file mode 100644 index
> 0000000..ade1233 Binary files /dev/null and
> b/xorg-server_1.12.4.orig.tar.gz.delta differ diff --git
> a/xorg-server_1.12.4.orig.tar.gz.id
> b/xorg-server_1.12.4.orig.tar.gz.id new file mode 100644 index
> 0000000..33dccf9 --- /dev/null +++
> b/xorg-server_1.12.4.orig.tar.gz.id @@ -0,0 +1 @@
> +b4a39093ac8e959eaab6584c0fb34065bffb13a8
>
> $> pristine-tar checkout xorg-server_1.12.4.orig.tar.gz fatal:
> ambiguous argument
> 'b4a39093ac8e959eaab6584c0fb34065bffb13a8^{tree}': unknown revision
> or path not in the working tree. Use '--' to separate paths from
> revisions, like this: 'git <command> [<revision>...] --
> [<file>...]' fatal: Not a valid object name tar: This does not look
> like a tar archive tar: Exiting with failure status due to previous
> errors pristine-tar: command failed: git archive --format=tar
> b4a39093ac8e959eaab6584c0fb34065bffb13a8\^\{tree\} | (cd
> '/home/yoh/.tmp/pristine-tar.HQbFxmVvd6' && tar x)
>
> $> apt-cache policy pristine-tar pristine-tar: Installed: 1.26
> Candidate: 1.26 Version table: *** 1.26 0 600
> http://debian.lcs.mit.edu/debian/ sid/main amd64 Packages 100
> /var/lib/dpkg/status 1.25 0 900 http://debian.lcs.mit.edu/debian/
> wheezy/main amd64 Packages
Regards,
Joachim Falk
- --
Joachim Falk <Joachim.Falk at gmx.de>
You can always tell a really good idea by the enemies it makes.
--programmers' axiom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQIcBAEBAgAGBQJRUBH3AAoJEIjUIAk+3OYMDWAP/0DPFRH5BpQoZc0hVok+JbYO
TEaCEBktHoLDzRjG42oiTbluz9aX8eV1qhbsIX8k5ZQ35nhetfyx9nAyq73/P+Bg
nqy0vu4RQOSFlBtzK49hAjLD020IqQof93JHYCdgJsybaCyVL+pW81gNO/DmAI1h
JOCD5R/62nwy7Z6z5qfG/92yGM3IqoceYvEV0aPWujhek8CjydEAfUwPzhX/efPA
JiRKH1hLt/xaCgJV6h2jNwu0KugKlhxc9/9fvB8dWSQjafdXvjt+Ocr9D5vY84pN
Sa/haIqzTwTmbPOEyQ8cRHqFIil/k2cmH3rX1ZMeL2puJcPiNFb6UJeaMRBiQWkP
Qcoy2U0VHnJjEtAbsZvlqvpoZvKuG2i6FhB04mBDWacC7pCQ+4yUPaajuP4j6bWr
CG6N0P82PPc3Bj/kvUpNLtS04AL4nqyVstnMV9T/8xAzKnwZVEKa2CU5eJuyy/M5
7SarZUgyoSEqhEIZxdkfpO9uQ69mxbdlo+Q8WmiajZqljtRPgb/zMidXPBYfxW+q
8uQoMgXzaQHq8bGsyjgcxqFFzjlV4+yJEW5BxRARuaMQdAkw546AaWXhfi6jDU2M
rGItCxB+Jqla+1lKyDKk0i0PwDmVvyCSe4BY0/ez0l1QRUKa+4OHSiDaxFRqE1iz
RqVT1/0gHddlD1EKkTZJ
=CYra
-----END PGP SIGNATURE-----
More information about the Pkg-tigervnc-devel
mailing list