diff --git a/uppbox/lpbuild/control b/uppbox/lpbuild/control index a0ea98181..97aa9e5ca 100644 --- a/uppbox/lpbuild/control +++ b/uppbox/lpbuild/control @@ -3,12 +3,12 @@ Section: devel Priority: optional Maintainer: Jan Dolinar Standards-Version: 3.8.4 -Build-Depends: g++ (= 4.1) | g++ (>= 4.3), libx11-dev (>= 1.0.0), libxft-dev (>= 2.1.8), libpng12-dev (>= 1.2.8), libbz2, libgtk2.0-dev (>= 2.8.17), libnotify-dev +Build-Depends: g++ (= 4.1) | g++ (>= 4.3), libx11-dev (>= 1.0.0), libxft-dev (>= 2.1.8), libpng12-dev (>= 1.2.8), libbz2-dev, libgtk2.0-dev (>= 2.8.17), libnotify-dev Homepage: http://www.ultimatepp.org Package: upp Architecture: all -Depends: theide, g++ (= 4.1) | g++ (>= 4.3), libx11-dev (>= 1.0.0), libxft-dev (>= 2.1.8), libpng12-dev (>= 1.2.8), libgtk2.0-dev (>= 2.8.17), libnotify-dev +Depends: theide, g++ (= 4.1) | g++ (>= 4.3), libx11-dev (>= 1.0.0), libxft-dev (>= 2.1.8), libpng12-dev (>= 1.2.8), libbz2-dev, libgtk2.0-dev (>= 2.8.17), libnotify-dev Description: C++ library for cross-platform development Ultimate++ is a radical and innovative GUI toolkit whose number one priority is programmer productivity. C++ is a great programming language but @@ -16,35 +16,6 @@ Description: C++ library for cross-platform development U++ libraries enable genuine productivity gains with shorter development times and greatly reduced application source code size. -Package: theide -Architecture: any -Depends: ${shlibs:Depends} -Replaces: upp (<= 2332) -Description: IDE (not only) for Ultimate++ framework - TheIDE introduces modular concepts to C++ programming. It features - BLITZ-build technology to speedup C++ rebuilds up to 4 times, Visual - designers for U++ libraries, Topic++ system for documenting code - and creating rich text resources for applications (like help and code - documentation) and Assist++ - a powerful C++ code analyzer that provides - features like code completion, navigation and transformation. - -Package: theide-nogtk -Architecture: any -Depends: ${shlibs:Depends} -Provides: theide -Replaces: theide, upp (<=2332) -Conflicts: theide -Description: IDE (not only) for Ultimate++ framework [nogtk build] - TheIDE introduces modular concepts to C++ programming. It features - BLITZ-build technology to speedup C++ rebuilds up to 4 times, Visual - designers for Ultimate++ libraries, Topic++ system for documenting code - and creating rich text resources for applications (like help and code - documentation) and Assist++ - a powerful C++ code analyzer that provides - features like code completion, navigation and transformation. - . - This package contains TheIDE built with simpler look to reduce - package dependencies. - Package: umk Architecture: any Depends: ${shlibs:Depends} diff --git a/uppbox/lpbuild/rules b/uppbox/lpbuild/rules index aaf06e674..039d7a57d 100644 --- a/uppbox/lpbuild/rules +++ b/uppbox/lpbuild/rules @@ -20,25 +20,15 @@ clean: -rm -f debian/files -rm -f debian/substvars -$(CURDIR)/debian/ide: - sed -i -e 's/IDE_VERSION[ \t]*"\([0-9]*\)[^"]*"/IDE_VERSION "\1-'$(SERIES)-$(ARCH)'"/' $(CURDIR)/uppsrc/ide/version.h - $(MAKE) $(JOBS) PKG=ide $(compiler) "NESTS=uppsrc" "FLAGS=GUI MT GCC SHARED" VERBOSE=Y BINEXT= "BINPREFIX=debian/" - -$(CURDIR)/debian/ide-nogtk: - sed -i -e 's/IDE_VERSION[ \t]*"\([0-9]*\)[^"]*"/IDE_VERSION "\1-'$(SERIES)-$(ARCH)'-nogtk"/' $(CURDIR)/uppsrc/ide/version.h - $(MAKE) $(JOBS) PKG=ide $(compiler) "NESTS=uppsrc" "FLAGS=GUI MT NOGTK GCC SHARED" VERBOSE=Y BINEXT=-nogtk "BINPREFIX=debian/" - $(CURDIR)/debian/umk: $(MAKE) $(JOBS) PKG=umk $(compiler) "NESTS=uppsrc" "FLAGS=GCC SHARED" VERBOSE=Y BINEXT= "BINPREFIX=debian/" -build: $(CURDIR)/debian/ide $(CURDIR)/debian/ide-nogtk $(CURDIR)/debian/umk +build: $(CURDIR)/debian/umk binary-indep: bash -x $(CURDIR)/debian/dopack $(CURDIR) $(CURDIR)/.. upp binary-arch: build - bash -x $(CURDIR)/debian/dopack $(CURDIR) $(CURDIR)/.. theide - bash -x $(CURDIR)/debian/dopack $(CURDIR) $(CURDIR)/.. theide-nogtk bash -x $(CURDIR)/debian/dopack $(CURDIR) $(CURDIR)/.. umk binary: binary-indep binary-arch