From 8bc08dcb8ad6bd2d386f6c78e55417d3811db8db Mon Sep 17 00:00:00 2001
From: dolik <dolik@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 29 Mar 2010 00:03:07 +0000
Subject: [PATCH] .lpbuild: Changed dependency generation, fixed few typos

git-svn-id: svn://ultimatepp.org/upp/trunk@2278 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppbox/lpbuild/dopack-stub | 25 ++++++-------------------
 uppbox/lpbuild/rules       |  3 +--
 uppbox/lpbuild/theide.1    |  4 ++--
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/uppbox/lpbuild/dopack-stub b/uppbox/lpbuild/dopack-stub
index 2082e8696..265723be7 100644
--- a/uppbox/lpbuild/dopack-stub
+++ b/uppbox/lpbuild/dopack-stub
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is a stub of packaging script. It won't work alone,
-# you has to preset some variables first (see archdep).
+# some variables has to be set prior to execution (see lpbuild).
 
 PKG="upp"
 SRC_PATH=$1
@@ -43,7 +43,7 @@ fi
 strip --strip-all --remove-section=.comment --remove-section=.note $tmp/usr/bin/theide
 
 # copy source files to tmp folder
-# (coping is done by rsync, because it allows to exclude svn and also 
+# (copying is done by rsync, because it allows to exclude svn and also 
 #  to change permissions on the files)
 subfolders=( uppsrc examples tutorial reference bazaar )
 echo -n "copying sources:"
@@ -217,24 +217,11 @@ cd $tmp
 find ./ -type f -exec md5sum {} \; | sed s/.[/]// >> $outtmp/md5sums
 mv $outtmp/md5sums $tmp/DEBIAN/md5sums
 
-#~ #create control file
-#~ cat > $tmp/DEBIAN/control << EOF
-#~ Package: $PKG
-#~ Version: $release
-#~ Section: devel
-#~ Priority: optional
-#~ Architecture: $arch
-#~ Depends: ${shlibs:Depends}, libx11-dev (>= 1.0.0), libxft-dev (>= 2.1.8), libpng12-dev (>= 1.2.8), g++, libgtk2.0-dev (>= 2.8.17), libnotify
-#~ Installed-Size: $size
-#~ Maintainer: $MAINTAINER <$EMAIL>
-#~ Description: C++ library for cross-platform development with IDE
- #~ Ultimate++ is a radical and innovative GUI toolkit whose number one priority
- #~ is programmer productivity. C++ is a great programming language but
- #~ C++ programmers are sometimes hampered by the lack of effective libraries.
- #~ U++ libraries enable genuine productivity gains with shorter development
- #~ times and greatly reduced application source code size.
-#~ EOF
+# generate dependencies
 cd $SRC_PATH
+dpkg-shlibdeps $tmp/usr/bin/theide
+
+# create control file
 dpkg-gencontrol -P$tmp
 
 # copy maintainer scripts
diff --git a/uppbox/lpbuild/rules b/uppbox/lpbuild/rules
index 6e86ab7cb..d5aa95b1d 100644
--- a/uppbox/lpbuild/rules
+++ b/uppbox/lpbuild/rules
@@ -7,11 +7,10 @@ clean:
 	
 build:
 	$(MAKE) -C uppsrc -e OutFile=$(CURDIR)/debian/theide
-	dpkg-shlibdeps $(CURDIR)/debian/theide
 
 binary-indep:
 
-binary-arch: build clean
+binary-arch: clean build
 	bash -x $(CURDIR)/debian/dopack $(CURDIR) $(CURDIR)/..
 	
 binary: binary-indep binary-arch 
diff --git a/uppbox/lpbuild/theide.1 b/uppbox/lpbuild/theide.1
index d2f4528d6..4845d40f0 100644
--- a/uppbox/lpbuild/theide.1
+++ b/uppbox/lpbuild/theide.1
@@ -18,7 +18,7 @@ The first method invokes a Package selection dialog, the second method
 directly opens 
 .IR package " from " assembly 
 and third one allows you to build or export specified project according 
-to the suplied parameters. The last method does not open TheIde 
+to the supplied parameters. The last method does not open TheIde 
 but causes it to work in console mode.
 .SH DESCRIPTION
 TheIDE 
@@ -105,7 +105,7 @@ one is used. If none is specified, static linking is used.
 .SS Exporting:
 .RS
 .IP x
-Export files neccessary to build project to the directory 
+Export files necessary to build project to the directory 
 .I out
 .IP X
 Export all files in project to directory