Changeset 140

Show
Ignore:
Timestamp:
04/21/06 15:41:09 (3 years ago)
Author:
abauer
Message:

Updated the debian packaging

Fixed a bug in the --with-wbxml switch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/6620-branch/acinclude.m4

    r127 r140  
    1515    AC_MSG_RESULT(disabled) 
    1616  else 
    17     if test "x$with_wbxml" != x; then 
     17    if test "x$with_wbxml" != x -a "x$with_wbxml" != "xyes"; then 
    1818      WBXML_CFLAGS="-I$with_wbxml/include" 
    1919      WBXML_LIBS="-L$with_wbxml/lib -lwbxml2" 

  • branches/6620-branch/debian

    • Property svn:ignore changed from
      libsyncml
      libsyncml-dev
       to
      libsyncml
      libsyncml-dev
      build-stamp
      libsyncml-utils.substvars
      libsyncml-dbg
      libsyncml-utils
      build
      tmp
      libsyncml.postinst.debhelper
      libsyncml.postrm.debhelper

  • branches/6620-branch/debian/compat

    r134 r140  
    1 4 
     15 

  • branches/6620-branch/debian/control

    r134 r140  
    33Priority: optional 
    44Maintainer: Armin Bauer armin.bauer@desscon.com 
    5 Build-Depends: debhelper (>= 4.0.0), libopenobex-1.0-0 (>= 1.1), libxml2 (>= 2.6.16), libglib2.0-0 (>= 2.6.0), libsoup2.2-8 (>= 2.2.91), libwbxml2 (>= 0.9.1) 
     5Build-Depends: debhelper (>= 4.0.0), libopenobex1-dev (>= 1.2), libxml2-dev (>= 2.6.16), libglib2.0-dev (>= 2.6.0), libsoup2.2-dev (>= 2.2.91), libwbxml2-dev (>= 0.9.0-3.1) 
    66Standards-Version: 3.6.2 
    77 
    88Package: libsyncml 
    99Architecture: any 
    10 Depends: libopenobex-1.0-0 (>= 1.1), libxml2 (>= 2.6.16), libglib2.0-0 (>= 2.6.0), libsoup2.2-8 (>= 2.2.91), libwbxml2 (>= 0.9.1) 
     10Depends: ${shlibs:Depends} 
    1111Description: SyncML protocol library 
    1212 Libsyncml implement the SyncML protocol. It support SyncML version 1.0, 
    …… 
    1414 used as a client or as a server. 
    1515 
     16Package: libsyncml-utils 
     17Architecture: any 
     18Depends: ${shlibs:Depends} 
     19Description: SyncML protocol library utilities 
     20 Libsyncml implement the SyncML protocol. It support SyncML version 1.0, 
     21 1.1 and 1.2. The available transport are Obex and Http. This library can be 
     22 used as a client or as a server. 
     23 . 
     24 This package provides some tools for quickly adding or displaying 
     25 items of SyncML capable devices 
     26 
    1627Package: libsyncml-dev 
    1728Section: devel 
    1829Architecture: any 
    19 Depends: libsyncml (= ${Source-Version}) 
    20 Description: SyncML protocol library 
     30Depends: libsyncml (= ${Source-Version}), libopenobex1-dev (>= 1.2), libxml2-dev (>= 2.6.16), libglib2.0-dev (>= 2.6.0), libsoup2.2-dev (>= 2.2.91), libwbxml2-dev (>= 0.9.0-3.1) 
     31Description: SyncML protocol development library 
    2132 Libsyncml implement the SyncML protocol. It support SyncML version 1.0, 
    2233 1.1 and 1.2. The available transport are Obex and Http. This library can be 
    …… 
    2637 libsyncml. 
    2738 
     39Package: libsyncml-dbg 
     40Architecture: any 
     41Depends: libsyncml (= ${Source-Version}) 
     42Description: Debug symbols for libsyncml 
     43 Debug symbols for libsyncml that will allow useful tracebacks and debugging 
     44 on end user machines. 

  • branches/6620-branch/debian/files

    r134 r140  
    11libsyncml_0.3.0-1_i386.deb libs optional 
     2libsyncml-utils_0.3.0-1_i386.deb libs optional 
    23libsyncml-dev_0.3.0-1_i386.deb devel optional 
     4libsyncml-dbg_0.3.0-1_i386.deb libs optional 

  • branches/6620-branch/debian/libsyncml.substvars

    r134 r140  
    1 shlibs:Depends=libbluetooth1 (>= 2.25), libc6 (>= 2.3.6-6), libexpat1 (>= 1.95.8), libgcrypt11 (>=1.2.2), libglib2.0-0 (>= 2.10.0), libgnutls11 (>= 1.0.16), libgpg-error0 (>= 1.2), libpopt0 (>= 1.7), libsoup2.2-8 (>= 2.2.91), libtasn1-2 (>=0.2.13), libusb-0.1-4 (>= 2:0.1.11), libwbxml2, libxml2 (>= 2.6.23), zlib1g (>= 1:1.2.1) 
     1shlibs:Depends=libbluetooth1 (>= 2.25), libc6 (>= 2.3.6-6), libexpat1 (>= 1.95.8), libgcrypt11 (>=1.2.2), libglib2.0-0 (>= 2.10.0), libgnutls11 (>= 1.0.16), libgpg-error0 (>= 1.2), libopenobex1, libpopt0 (>= 1.7), libsoup2.2-8 (>= 2.2.91), libtasn1-2 (>=0.2.13), libusb-0.1-4 (>= 2:0.1.11), libwbxml2, libxml2 (>= 2.6.23), zlib1g (>= 1:1.2.1) 

  • branches/6620-branch/debian/rules

    r134 r140  
    11#!/usr/bin/make -f 
    2 # -*- makefile -*- 
     2# Based on the multi2 sample debian/rules file: 
     3# --- 
    34# Sample debian/rules that uses debhelper. 
    4 # This file was originally written by Joey Hess and Craig Small. 
    5 # As a special exception, when this file is copied by dh-make into a 
    6 # dh-make output file, you may use that output file without restriction. 
    7 # This special exception was added by Craig Small in version 0.37 of dh-make. 
     5# This file is public domain software, originally written by Joey Hess. 
     6# 
     7# This version is for a multibinary package. It also allows you to build any 
     8# of the binary packages independantly, via binary-<package> targets. 
     9# --- 
    810 
    9 # Uncomment this to turn on verbose mode. 
     11# Uncomment this to turn on verbose mode.  
    1012#export DH_VERBOSE=1 
    1113 
     14# This has to be exported to make some magic below work. 
     15export DH_OPTIONS 
    1216 
    1317# These are used for cross-compiling and for saving the configure script 
    …… 
    1620DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) 
    1721 
    18  
    19 CFLAGS = -Wall -g 
    20  
     22CFLAGS = -Werror -g 
    2123ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) 
    2224        CFLAGS += -O0 
    …… 
    2527endif 
    2628 
    27 config.status: configure 
     29export CFLAGS 
     30 
     31SRC     := $(PWD) 
     32BUILD   := $(PWD)/debian/build 
     33TARGET  := $(PWD)/debian/tmp 
     34 
     35configure: debian/rules 
    2836        dh_testdir 
    29         # Add here commands to configure the package. 
    30         CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
     37        autoreconf -i 
    3138 
    32  
    33 build: build-stamp 
    34  
    35 build-stamp:  config.status 
     39build: configure debian/build-stamp 
     40debian/build-stamp:  
    3641        dh_testdir 
    37  
    38         # Add here commands to compile the package. 
    39         $(MAKE) 
    40  
    41         touch build-stamp 
     42        [ -d $(BUILD) ] || mkdir $(BUILD) 
     43        cd $(BUILD) && CFLAGS="$(CFLAGS)" $(SRC)/configure --host=$(DEB_HOST_GNU_TYPE) \ 
     44           --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \ 
     45           --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ 
     46           --enable-static --enable-obex --enable-http --with-wbxml --disable-unit-tests 
     47        $(MAKE) -C $(BUILD) 
     48        # FIXME invoke this once upstream decide on the right fix. 
     49        # $(MAKE) -C $(BUILD) check 
     50        touch debian/build-stamp 
    4251 
    4352clean: 
    4453        dh_testdir 
    4554        dh_testroot 
    46         rm -f build-stamp  
     55        rm -f debian/build-stamp 
     56        rm -rf debian/build 
     57        dh_clean 
    4758 
    48         # Add here commands to clean up after the build process. 
    49         -$(MAKE) distclean 
    50 ifneq "$(wildcard /usr/share/misc/config.sub)" "" 
    51         cp -f /usr/share/misc/config.sub config.sub 
    52 endif 
    53 ifneq "$(wildcard /usr/share/misc/config.guess)" "" 
    54         cp -f /usr/share/misc/config.guess config.guess 
    55 endif 
    56  
    57  
    58         dh_clean  
    59  
     59install: DH_OPTIONS= 
    6060install: build 
    6161        dh_testdir 
    6262        dh_testroot 
    63         dh_clean -k  
     63        dh_clean -k 
    6464        dh_installdirs 
    6565 
    66         # Add here commands to install the package into debian/libsyncml. 
    67         $(MAKE) install DESTDIR=$(CURDIR)/debian/libsyncml 
     66        $(MAKE) -C $(BUILD) install DESTDIR=$(TARGET) 
     67        dh_install --sourcedir=$(TARGET) --fail-missing 
    6868 
    69  
    70 # Build architecture-independent files here. 
    71 binary-indep: build install 
    72 # We have nothing to do by default. 
    73  
    74 # Build architecture-dependent files here. 
    75 binary-arch: build install 
     69# This single target is used to build all the packages, all at once, or 
     70# one at a time. So keep in mind: any options passed to commands here will 
     71# affect _all_ packages. Anything you want to only affect one package 
     72# should be put in another target, such as the install target. 
     73binary-common: 
    7674        dh_testdir 
    7775        dh_testroot 
    78         dh_installchangelogs ChangeLog 
     76        dh_installchangelogs 
    7977        dh_installdocs 
    8078        dh_installexamples 
    81 #       dh_install 
    82 #       dh_installmenu 
    83 #       dh_installdebconf        
     79        dh_installmenu 
     80#       dh_installdebconf 
    8481#       dh_installlogrotate 
    8582#       dh_installemacsen 
     83#       dh_installcatalogs 
    8684#       dh_installpam 
    8785#       dh_installmime 
    8886#       dh_installinit 
     87#       dh_installman 
    8988#       dh_installcron 
    9089#       dh_installinfo 
    91         dh_installman 
     90        dh_strip --dbg-package=libsyncml-dbg 
    9291        dh_link 
    93         dh_strip 
    9492        dh_compress 
    9593        dh_fixperms 
    9694#       dh_perl 
    97 #     dh_python 
    98 #       dh_makeshlibs 
     95      dh_python 
     96        dh_makeshlibs -Xformats  ### -V ? 
    9997        dh_installdeb 
    10098        dh_shlibdeps 
    …… 
    103101        dh_builddeb 
    104102 
     103# Build architecture independant packages using the common target. 
     104binary-indep: build install 
     105# (Uncomment this next line if you have such packages.) 
     106#        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common 
     107 
     108# Build architecture dependant packages using the common target. 
     109binary-arch: build install 
     110        $(MAKE) -f $(SRC)/debian/rules DH_OPTIONS=-a binary-common 
     111 
     112# Any other binary targets build just one binary package at a time. 
     113binary-%: build install 
     114        make -f $(SRC)/debian/rules binary-common DH_OPTIONS=-p$* 
     115 
    105116binary: binary-indep binary-arch 
    106 .PHONY: build clean binary-indep binary-arch binary install  
     117.PHONY: build clean binary-indep binary-arch binary-common binary install