[X2go-Commits] buildscripts.git - master (branch) updated: 88b6a034e2527cb6dbd6df06a24977a105c35b0b

X2go dev team git-admin at x2go.org
Wed Dec 21 01:34:13 CET 2011


The branch, master has been updated
       via  88b6a034e2527cb6dbd6df06a24977a105c35b0b (commit)
       via  c6738108235cd874c48bf1e6ee7ca9d675db53ef (commit)
       via  eb97641594b08b0d29dcaa486824a73fc4b823bf (commit)
       via  254c45c7421caaf8987dc5af0c560f3cb24a0bec (commit)
       via  55e112925fb4b395105da9dca9bb69e417f36012 (commit)
       via  ff305c9ba013a854730ae32f756b2946e5cd8753 (commit)
       via  d48b4bf31570862f67fff26b11ce05e6e9d1e255 (commit)
       via  cba9a1ba1606a27e1cf02ff3a449ae5b713c9198 (commit)
       via  519e9fb1f30d73e9487fc848d0465c841b1910d3 (commit)
       via  6ee6a308acd4209ec8f82d8515fcf75c49a2bc77 (commit)
       via  42eb8e16ce40995612c0350335ec76673e8312fa (commit)
       via  59de53e0cb82183f8f0df18cc47a3d64bb9846de (commit)
       via  e113941490954ff935f24d2425d40769265b6a41 (commit)
       via  a91c4eb8dd76e10a99124854ad5c2aa14917689b (commit)
       via  50cb55b8f335aaca08691173065bd27bdc33a482 (commit)
       via  8ce52aaa4b341522ed6248664f831fb9cdcc9e80 (commit)
       via  fbcdf7b29c1b17adbc3339601c14ca1307b22bcf (commit)
       via  942be141462ffdb03833ee6ee733ebe18afd8d4d (commit)
       via  57db6070f0cd8e35811ba77edab3a9469e1ed34d (commit)
       via  023fe9dd7598ccbea1160f8a782c1d89d4357060 (commit)
       via  f226c40f955ed30174757fcbd2947e47ac6fa477 (commit)
       via  420f8469c75505326a09a265e9210bf088d1246f (commit)
       via  13463bb908d9bf628bb12d1aa32090a13a9626c2 (commit)
       via  bbc82eba9905e1d831566f6e5df9d5dc82e33d7b (commit)
       via  74d41ec85f4e9213e5c6c6c00457d4cac547f1c3 (commit)
       via  945ccf0ab2c2f77d7a3c32f53afd655fa4e68930 (commit)
       via  236a356924c2c6822051e6b92f9da379aad8f54b (commit)
       via  df01b658ff2e688a67b799df16f0a8680be874f7 (commit)
       via  4eeee0c7208e75eddb497d281c4bfc96c6d6b109 (commit)
       via  64531446af6ffc51a4c5d13aa4047fad02ad090f (commit)
      from  eb1b39a01104834dd56aafc21bee53d9ae5da78b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 88b6a034e2527cb6dbd6df06a24977a105c35b0b
Merge: eb1b39a01104834dd56aafc21bee53d9ae5da78b c6738108235cd874c48bf1e6ee7ca9d675db53ef
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 21 01:34:05 2011 +0100

    Merge branch 'master' of ssh://code.it-zukunft-schule.de/~/git/buildscripts
    
    Conflicts:
    	bin/build-package

commit c6738108235cd874c48bf1e6ee7ca9d675db53ef
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 21 01:28:58 2011 +0100

    fix condition

commit eb97641594b08b0d29dcaa486824a73fc4b823bf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 21 01:21:48 2011 +0100

    replaced buildscripts with those form NWT build site

commit 254c45c7421caaf8987dc5af0c560f3cb24a0bec
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 16:58:00 2011 +0100

    fix BUILDS_FOR mechanism

commit 55e112925fb4b395105da9dca9bb69e417f36012
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 15:57:10 2011 +0100

    add new origin at end of itzks-gitcreate

commit ff305c9ba013a854730ae32f756b2946e5cd8753
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 15:34:48 2011 +0100

    permission fix for temp dirs

commit d48b4bf31570862f67fff26b11ce05e6e9d1e255
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 15:26:35 2011 +0100

    revert source format 3.0 (quilt) support, does not apply to our repos

commit cba9a1ba1606a27e1cf02ff3a449ae5b713c9198
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 14:15:46 2011 +0100

    more dfsg support fixes

commit 519e9fb1f30d73e9487fc848d0465c841b1910d3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 14:05:42 2011 +0100

    fix fetching of pristine-tar branch

commit 6ee6a308acd4209ec8f82d8515fcf75c49a2bc77
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 13:36:46 2011 +0100

    syntax fix

commit 42eb8e16ce40995612c0350335ec76673e8312fa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 13:35:55 2011 +0100

    checkout the orig tarball from the tmp git project, not from the maser copy

commit 59de53e0cb82183f8f0df18cc47a3d64bb9846de
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 13:27:49 2011 +0100

    no checkout of pristine-tar branch before calling pristine-tar

commit e113941490954ff935f24d2425d40769265b6a41
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 13:25:05 2011 +0100

    add .dfsgX versioning support

commit a91c4eb8dd76e10a99124854ad5c2aa14917689b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 13:17:19 2011 +0100

    regexp modification

commit 50cb55b8f335aaca08691173065bd27bdc33a482
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 13:12:47 2011 +0100

    code block fix

commit 8ce52aaa4b341522ed6248664f831fb9cdcc9e80
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 20 13:11:05 2011 +0100

    add support for source format 3.0 (quilt)

commit fbcdf7b29c1b17adbc3339601c14ca1307b22bcf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 11 23:30:42 2011 +0100

    another path fix for itzks-gitcreate

commit 942be141462ffdb03833ee6ee733ebe18afd8d4d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 11 23:10:35 2011 +0100

    fix for itzks-gitcreate

commit 57db6070f0cd8e35811ba77edab3a9469e1ed34d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 11 22:12:51 2011 +0100

    remove comments

commit 023fe9dd7598ccbea1160f8a782c1d89d4357060
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 7 18:01:59 2011 +0100

    last package does not need a \newline...

commit f226c40f955ed30174757fcbd2947e47ac6fa477
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 3 17:09:27 2011 +0100

    make GPG_KEY configurable at beginning of script

commit 420f8469c75505326a09a265e9210bf088d1246f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 3 16:44:52 2011 +0100

    place DEBEMAIL and DEBFULLNAME at beginning of script

commit 13463bb908d9bf628bb12d1aa32090a13a9626c2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 3 16:12:12 2011 +0100

    make git server configurable at beginning of script

commit bbc82eba9905e1d831566f6e5df9d5dc82e33d7b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 3 15:57:40 2011 +0100

    fix use of ~ for home path

commit 74d41ec85f4e9213e5c6c6c00457d4cac547f1c3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 2 22:40:01 2011 +0100

    change upload site in itzks-gitcreate

commit 945ccf0ab2c2f77d7a3c32f53afd655fa4e68930
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 2 16:41:30 2011 +0100

    fix email address used in ITZKS packages

commit 236a356924c2c6822051e6b92f9da379aad8f54b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 2 16:03:14 2011 +0100

    fully rename heuler (x2go name for nightly builds) to nightly...

commit df01b658ff2e688a67b799df16f0a8680be874f7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 2 15:53:20 2011 +0100

    fix cd statement

commit 4eeee0c7208e75eddb497d281c4bfc96c6d6b109
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 2 15:51:10 2011 +0100

    allow creation of Git subfolders

commit 64531446af6ffc51a4c5d13aa4047fad02ad090f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 2 15:39:29 2011 +0100

    Start from scratch, used X2Go's buildscripts as templates...

-----------------------------------------------------------------------

Summary of changes:
 bin/build-package |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/bin/build-package b/bin/build-package
index 8a1f94f..3a891b6 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -182,7 +182,7 @@ build_packages() {
 				[ "x$l_CODENAME" = "xlenny" ] && VERSION=oldstable
 				
 				# modify the section for non-main package builds
-				[ "x$COMPONENT" != "xmain" ] || {
+				[ "x$COMPONENT" != "xmain" ] && {
 					mv debian/control debian/control.tmp
 					cat debian/control.tmp | sed  "s#Section:[\ ]*\(.*\)#Section: $COMPONENT/\1#g" > debian/control
 				}


hooks/post-receive
-- 
buildscripts.git (buildscripts upstream project)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "buildscripts.git" (buildscripts upstream project).




More information about the x2go-commits mailing list