[maemo-commits] [maemo-commits] r12145 - projects/haf/trunk/libosso/debian

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Jun 7 10:37:52 EEST 2007 
Author: kihamala
Date: 2007-06-07 10:37:50 +0300 (Thu, 07 Jun 2007)
New Revision: 12145

Removed:
   projects/haf/trunk/libosso/debian/libosso-dbus-conf.conffiles
Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/debian/control
   projects/haf/trunk/libosso/debian/rules
Log:
removed unneeded conffiles + Debian fixes to debian/rules


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-06-06 18:34:33 UTC (rev 12144)
+++ projects/haf/trunk/libosso/debian/changelog	2007-06-07 07:37:50 UTC (rev 12145)
@@ -2,6 +2,8 @@
 
   * UNRELEASED
   * Partially applied a patch from Debian guys.
+  * Removed debian/libosso-dbus-conf.conffiles.
+  * Applied more Debian fixes to debian/rules.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed,  6 Jun 2007 20:42:22 +0300
 

Modified: projects/haf/trunk/libosso/debian/control
===================================================================
--- projects/haf/trunk/libosso/debian/control	2007-06-06 18:34:33 UTC (rev 12144)
+++ projects/haf/trunk/libosso/debian/control	2007-06-07 07:37:50 UTC (rev 12145)
@@ -2,22 +2,48 @@
 Section: x11
 Priority: optional
 Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libdbus-glib-1-dev (>=0.61-osso18), libglib2.0-dev, doxygen, mce-dev (>= 1.5.6)
+Build-Depends: debhelper (>= 4.0.0),
+               libdbus-glib-1-dev (>= 0.61-osso18),
+               libglib2.0-dev,
+               doxygen,
+               mce-dev
 Standards-Version: 3.6.0
 
 Package: libosso-dev
 Section: devel
 Architecture: any
-Depends: libosso1 (= ${Source-Version}), libdbus-glib-1-dev
-Description: Libosso development files
- Libosso header files for development.
+Depends: libosso1 (= ${Source-Version}),
+         libdbus-glib-1-dev
+Description: Basic library for maemo applications - development files
+ Libosso is the basic library containing required and helpful functions
+ for maemo applications. One of Libosso's main features is RPC (Remote
+ Procedure Calls) services (as it "wraps" D-Bus). In addition, Libosso
+ provides access to low-level hardware functions, such as turning on (or
+ keeping on) the display, autosaving, state saving and system time.
+ .
+ All maemo-compliant applications must use Libosso to respond coherently
+ to system changes and signals, such as the battery low, pre-shutdown
+ and state saving signals.
+ .
+ This package contains the development files.
 
 Package: libosso1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libosso-dbus-conf
-Description: Libosso library
- Libosso contains D-Bus-related functionality for Maemo applications.
+Depends: ${shlibs:Depends},
+         libosso-dbus-conf
+Description: Basic library for maemo applications - shared library
+ Libosso is the basic library containing required and helpful functions
+ for maemo applications. One of Libosso's main features is RPC (Remote
+ Procedure Calls) services (as it "wraps" D-Bus). In addition, Libosso
+ provides access to low-level hardware functions, such as turning on (or
+ keeping on) the display, autosaving, state saving and system time.
+ .
+ All maemo-compliant applications must use Libosso to respond coherently
+ to system changes and signals, such as the battery low, pre-shutdown
+ and state saving signals.
+ .
+ This package contains the shared library.
 
 Package: libosso-test
 Section: libs
@@ -25,9 +51,21 @@
 Architecture: any
 Conflicts: libosso0 (<< 0.8.6-1)
 Replaces: libosso0 (<< 0.8.6-1)
-Depends: libosso1 (= ${Source-Version}), libdbus-glib-1-dev, outo
-Description: Libosso unit tests
- Libosso unit tests stuff.
+Depends: libosso1 (= ${Source-Version}),
+         libdbus-glib-1-dev,
+         outo
+Description: Basic library for maemo applications - unit tests
+ Libosso is the basic library containing required and helpful functions
+ for maemo applications. One of Libosso's main features is RPC (Remote
+ Procedure Calls) services (as it "wraps" D-Bus). In addition, Libosso
+ provides access to low-level hardware functions, such as turning on (or
+ keeping on) the display, autosaving, state saving and system time.
+ .
+ All maemo-compliant applications must use Libosso to respond coherently
+ to system changes and signals, such as the battery low, pre-shutdown
+ and state saving signals.
+ .
+ This package contains the unit tests.
 
 Package: libosso-dbus-conf
 Section: base
@@ -35,18 +73,48 @@
 Conflicts: libosso0 (<< 0.8.6-1)
 Replaces: libosso0 (<< 0.8.6-1)
 Architecture: all
-Description: Libosso D-Bus configuration settings for Scratchbox.
- Libosso D-Bus configuration settings for Scratchbox environment.
+Description: Basic library for maemo applications - Scratchbox D-Bus configuration
+ Libosso is the basic library containing required and helpful functions
+ for maemo applications. One of Libosso's main features is RPC (Remote
+ Procedure Calls) services (as it "wraps" D-Bus). In addition, Libosso
+ provides access to low-level hardware functions, such as turning on (or
+ keeping on) the display, autosaving, state saving and system time.
+ .
+ All maemo-compliant applications must use Libosso to respond coherently
+ to system changes and signals, such as the battery low, pre-shutdown
+ and state saving signals.
+ .
+ This package contains the D-Bus configuration settings for Scratchbox.
 
 Package: libosso1-dbg
 Section: libs
 Architecture: any
 Depends: libosso1 (= ${Source-Version})
-Description: Libosso library debug info
- Debug symbols and stuff for the Libosso library.
+Description: Basic library for maemo applications - detached debug symbols
+ Libosso is the basic library containing required and helpful functions
+ for maemo applications. One of Libosso's main features is RPC (Remote
+ Procedure Calls) services (as it "wraps" D-Bus). In addition, Libosso
+ provides access to low-level hardware functions, such as turning on (or
+ keeping on) the display, autosaving, state saving and system time.
+ .
+ All maemo-compliant applications must use Libosso to respond coherently
+ to system changes and signals, such as the battery low, pre-shutdown
+ and state saving signals.
+ .
+ This package contains the detached debug symbols.
 
 Package: libosso1-doc
 Section: doc
-Architecture: any
-Description: Libosso API documentation
- Libosso API documentation.
+Architecture: all
+Description: Basic library for maemo applications - documentation
+ Libosso is the basic library containing required and helpful functions
+ for maemo applications. One of Libosso's main features is RPC (Remote
+ Procedure Calls) services (as it "wraps" D-Bus). In addition, Libosso
+ provides access to low-level hardware functions, such as turning on (or
+ keeping on) the display, autosaving, state saving and system time.
+ .
+ All maemo-compliant applications must use Libosso to respond coherently
+ to system changes and signals, such as the battery low, pre-shutdown
+ and state saving signals.
+ .
+ This package contains the documentation.

Deleted: projects/haf/trunk/libosso/debian/libosso-dbus-conf.conffiles
===================================================================
--- projects/haf/trunk/libosso/debian/libosso-dbus-conf.conffiles	2007-06-06 18:34:33 UTC (rev 12144)
+++ projects/haf/trunk/libosso/debian/libosso-dbus-conf.conffiles	2007-06-07 07:37:50 UTC (rev 12145)
@@ -1,2 +0,0 @@
-/etc/dbus-1/system.d/libosso.conf
-/etc/libosso/sessionbus-libosso.conf

Modified: projects/haf/trunk/libosso/debian/rules
===================================================================
--- projects/haf/trunk/libosso/debian/rules	2007-06-06 18:34:33 UTC (rev 12144)
+++ projects/haf/trunk/libosso/debian/rules	2007-06-07 07:37:50 UTC (rev 12145)
@@ -11,72 +11,60 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+CFLAGS += -Wall -g -ansi -Werror -Wshadow -D_GNU_SOURCE
+CFLAGS += -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+# Use soft-float and thumb mode if it is enabled.
+CFLAGS += $(if $(findstring thumb,$(DEB_BUILD_OPTIONS)),-mthumb)
 
-CFLAGS = -Wall -g -ansi -Werror -Wshadow -D_GNU_SOURCE
+configure_flags := \
+	--prefix=/usr \
+	--mandir=\$${prefix}/share/man \
+	--infodir=\$${prefix}/share/info \
+	--disable-dependency-tracking \
+	--disable-gtk-doc \
+	--sysconfdir=/etc \
+	--disable-maintainer-mode
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
 else
-	CFLAGS += -O2
+	configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-# Use soft-float and thumb mode if it is enabled.
-ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -mthumb
-endif
 
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-dependency-tracking --disable-gtk-doc --sysconfdir=/etc 
+	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 
 build: build-stamp
 build-stamp:  config.status
 	dh_testdir
-
 	# Add here commands to compile the package.
 	$(MAKE)
 	$(MAKE) doxygen
+	touch $@
 
-	touch build-stamp
-
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
-
+	rm -f build-stamp
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	-test -r /usr/share/misc/config.sub && test -r config.sub && \
+		cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && test -r config.guess && \
+		cp -f /usr/share/misc/config.guess config.guess
+	dh_clean
 
-	dh_clean 
-
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+#	rm -f $(CURDIR)/debian/build/usr/lib/outo/*.*a
 
-	# Add here commands to install the package into debian/build
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/build
-	rm -f $(CURDIR)/debian/build/usr/lib/outo/*.*a
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -85,9 +73,9 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
-	dh_install --sourcedir=debian/build -v
+	dh_install --sourcedir=debian/tmp -v
 	dh_installman
 	dh_link
 	dh_strip --dbg-package=libosso1
@@ -101,4 +89,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install
More information about the maemo-commits mailing list