← Back to branch summary

~thomas-voss/pbuilderjenkins/ayatana-scrollbar

« back to all changes in this revision

Viewing changes to Builder.sh

  • Committer: Thomas Voß
  • Date: 2012-04-03 05:42:06 UTC
  • Revision ID: thomas.voss@canonical.com-20120403054206-beiwfbif6x2sl7j6
Fixed some issues regarding package name generation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Builder.sh
65
65
 
66
66
# pull main branch and merge in packaging branch
67
67
bzr branch $main_branch "$work_dir/trunk"
 
68
bzr branch "$packaging_branch" "$work_dir/packaging"
 
69
mv "$work_dir/packaging/debian" "$work_dir/trunk"
 
70
 
68
71
cd "$work_dir/trunk"
69
 
bzr merge  "$packaging_branch"
70
 
#bzr build nest-part ubuntu "$packaging_branch" debian
71
72
 
72
73
if [ -f autogen.sh ]; then
73
74
    autoreconf -f -i
84
85
#sed -i 's/--disable-scrollkeeper/--disable-scrollkeeper --enable-gcov/g' debian/rules
85
86
 
86
87
# Extract some packaging information
87
 
version=`dpkg-parsechangelog | awk '/^Version/ {print $2}' | sed -e "s/\(.*\)-[0-9]ubuntu.*/\1/"`+bzr${trunkrev}
88
 
version=${version}ubuntu0+${packaging_rev}
 
88
version=`dpkg-parsechangelog | awk '/^Version/ {print $2}' | sed -e "s/\(.*\)-[0-9]ubuntu.*/\1/"`
 
89
if [ -z "$chrooted" ]; then
 
90
    version=`dpkg-parsechangelog | awk '/^Version/ {print $2}' | sed -e "s/\(.*\)-[0-9]ubuntu.*/\1/"`
 
91
else
 
92
    version=`dpkg-parsechangelog | awk '/^Version/ {print $2}' | sed -e "s/\(.*\)-[0-9]ubuntu.*/\1/"`
 
93
    version=${version}ubuntu0+${packaging_rev}
 
94
fi
 
95
 
89
96
sourcename=`dpkg-parsechangelog | awk '/^Source/ {print $2}'`
90
97
# Generate the actual source package
91
98
cd ..
94
101
cd trunk
95
102
 
96
103
if [ -z "$chrooted" ]; then
 
104
    trunk_dir=$(readlink -f ".")
 
105
    
97
106
    export BUILD_DIR=$(readlink -f ".")
98
107
    export RESULT_DIR=$result_dir
99
108
    
100
109
    cd "$hook_dir"
101
 
    ./D00dependency_hooks
102
 
    cd "$BUILD_DIR"
103
 
    debuild -uc -us -d
 
110
    "./D00dependency_hooks"
 
111
 
 
112
    cd "$trunk_dir"
 
113
    mk-build-deps --install --tool "apt-get --assume-yes" --build-dep debian/control    
 
114
    DEB_BUILD_OPTIONS="nostrip noopt debug" debuild -uc -us -d
104
115
    cd "$hook_dir"
105
 
    "./B00dependency_hooks"
106
 
    cd "$BUILD_DIR"
 
116
    "./B00build_hooks"
107
117
else
108
118
    # Make our result dir known to pbuilder env
109
119
    echo "$result_dir" > 'ReportDir'