emotion.rules.diff - emotion0-bin not including /usr/bin/emotion-config emotion.emotion0-bin.install.diff - incorrect debianizated emotion
Index: libs/emotion/debian/emotion0-bin.install =================================================================== RCS file: /var/cvs/e/e17/libs/emotion/debian/emotion0-bin.install,v retrieving revision 1.1 diff -u -3 -r1.1 emotion0-bin.install --- libs/emotion/debian/emotion0-bin.install 20 Apr 2006 14:41:13 -0000 1.1 +++ libs/emotion/debian/emotion0-bin.install 22 Apr 2006 09:25:22 -0000 @@ -1,2 +1,2 @@ -debian/tmp/usr/bin/emotion_* +debian/tmp/usr/bin/emotion* debian/tmp/usr/share/emotion/data/theme.edj
Index: libs/emotion/debian/rules =================================================================== RCS file: /var/cvs/e/e17/libs/emotion/debian/rules,v retrieving revision 1.2 diff -u -3 -r1.2 rules --- libs/emotion/debian/rules 2 Apr 2006 07:38:05 -0000 1.2 +++ libs/emotion/debian/rules 22 Apr 2006 09:24:56 -0000 @@ -1,94 +1,11 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# Rewrote debian/rules to use cdbs. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +DEB_MAKE_CLEAN_TARGET := clean -# This is the debhelper compatability version to use. -export DH_COMPAT=4 - - -CFLAGS ?= -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -INSTALL=/usr/bin/install -p -CONFIGUREOPTS = --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) - -configure: configure-stamp -configure-stamp: - dh_testdir - - test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure $(CONFIGUREOPTS) - - touch configure-stamp - -build: configure build-stamp -build-stamp: - dh_testdir - - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - -mv debian/changelog debian/changelog.saved - -$(MAKE) distclean - -mv debian/changelog.saved debian/changelog - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_movefiles - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_makeshlibs - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +clean:: + if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi +
-- Vlad Alyukov RT QA Engineer SWsoft, Inc.
