Changeset 71

Show
Ignore:
Timestamp:
10/18/07 13:07:01 (1 year ago)
Author:
inz
Message:

Make package chinook compatible.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • mh-shot-tool/trunk/Makefile

    r64 r71  
    3838CFLAGS += $(WARNINGS) 
    3939 
    40 mh_shot_tool_CFLAGS += $(shell if pkg-config hildon-fm --exists; then pkg-config hildon-fm --cflags; echo -DHILDON_FM; fi) 
    41 mh_shot_tool_LDFLAGS += $(shell if pkg-config hildon-fm --exists; then pkg-config hildon-fm --libs; fi) 
    42 mh_shot_tool_CFLAGS += $(shell if pkg-config hildon-libs --exists; then pkg-config hildon-libs --cflags; echo -DHILDON; else pkg-config gtk+-2.0 --cflags; fi) 
    43 mh_shot_tool_LDFLAGS += $(shell if pkg-config hildon-libs --exists; then pkg-config hildon-libs --libs; else pkg-config gtk+-2.0 --libs; fi) 
     40#mh_shot_tool_CFLAGS += $(shell if pkg-config hildon-fm-2 --exists; then pkg-config hildon-fm-2 --cflags; echo -DHILDON_FM=2; elif pkg-config hildon-fm --exists; then pkg-config hildon-fm --cflags; echo -DHILDON_FM=1; fi) 
     41mh_shot_tool_CFLAGS += $(shell if pkg-config tablet-browser-interface --exists; then pkg-config tablet-browser-interface --cflags; echo -DTABLET_BROWSER; fi) 
     42mh_shot_tool_CFLAGS += $(shell if pkg-config osso-browser-interface --exists; then pkg-config osso-browser-interface --cflags; echo -DOSSO_BROWSER; fi) 
     43#mh_shot_tool_LDFLAGS += $(shell if pkg-config hildon-fm-2 --exists; then pkg-config hildon-fm-2 --libs; elif pkg-config hildon-fm --exists; then pkg-config hildon-fm --libs; fi) 
     44mh_shot_tool_CFLAGS += $(shell if pkg-config hildon-1 --exists; then pkg-config hildon-1 --cflags; echo -DHILDON=1; elif pkg-config hildon-libs --exists; then pkg-config hildon-libs --cflags; echo -DHILDON=0; else pkg-config gtk+-2.0 --cflags; fi) 
     45mh_shot_tool_LDFLAGS += $(shell if pkg-config hildon-1 --exists; then pkg-config hildon-1 --libs; elif pkg-config hildon-libs --exists; then pkg-config hildon-libs --libs; else pkg-config gtk+-2.0 --libs; fi) 
    4446 
    4547mh_shot_tool_CFLAGS += `pkg-config gtk+-2.0 libsoup-2.2 libosso --cflags` \ 

  • mh-shot-tool/trunk/debian/changelog

    r70 r71  
     1mh-shot-tool (0.0.3) mistral; urgency=low 
     2 
     3  * Make package chinook compatible. 
     4 
     5 -- Santtu Lakkala <inz@inz.fi>  Thu, 18 Oct 2007 13:06:43 +0300 
     6 
    17mh-shot-tool (0.0.2) mistral; urgency=low 
    28 

  • mh-shot-tool/trunk/debian/control

    r64 r71  
    33Priority: optional 
    44Maintainer: Santtu Lakkala <inz@inz.fi> 
    5 Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev, libsoup2.2-dev, libosso-dev, osso-browser-interface-dev 
     5Build-Depends: debhelper (>= 4.0.0), libhildon1-dev | hildon-libs-dev | libgtk2.0-dev, libsoup2.2-dev, libosso-dev, tablet-browser-interface-dev | osso-browser-interface-dev 
    66Standards-Version: 3.6.0 
    77 

  • mh-shot-tool/trunk/debian/rules

    r64 r71  
    1919ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) 
    2020        INSTALL_PROGRAM += -s 
     21endif 
     22ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS))) 
     23        CFLAGS += -mthumb 
    2124endif 
    2225 

  • mh-shot-tool/trunk/shot.c

    r70 r71  
    77#include <string.h> 
    88#include <libosso.h> 
    9 #include <osso-browser-interface.h> 
     9#if defined(TABLET_BROWSER) 
     10# include <tablet-browser-interface.h> 
     11#elif defined(OSSO_BROWSER) 
     12# include <osso-browser-interface.h> 
     13#endif 
    1014#ifdef HILDON 
    11 #include <hildon-widgets/hildon-window.h> 
    12 #include <hildon-widgets/hildon-defines.h> 
     15# if HILDON == 1 
     16#  include <hildon/hildon-window.h> 
     17#  include <hildon/hildon-defines.h> 
     18# else 
     19#  include <hildon-widgets/hildon-window.h> 
     20#  include <hildon-widgets/hildon-defines.h> 
     21# endif 
     22#else 
     23# define HILDON_MARGIN_DEFAULT 5 
    1324#endif 
    1425