Changeset 1158

Show
Ignore:
Timestamp:
04/20/05 12:38:22 (4 years ago)
Author:
asterix
Message:

the new plugin system is ready, so I merge the branch with the trunk

Location:
trunk
Files:
7 removed
92 modified
4 copied

Legend:

Unmodified
Added
Removed

  • trunk/debian/control

    r477 r1158  
    1212Depends: python (>= 2.3), python-glade2 (>= 2.4.0), python-gtk2 (>= 2.4.0) 
    1313Suggests: python-gnupginterface 
    14 Description: jabber client in python 
    15  Gajim is a Jabber client, like Psi, based on a plugin system. 
    16  logger and gtkgui plugins are included. 
     14Description: GTK jabber client written in python 
     15 Gajim is a GTK jabber client written in python. 

  • trunk/Makefile

    r1010 r1158  
    11VERSION         ?= 0.6.1 
    22 
    3 MODULES         = common plugins/gtkgui 
     3MODULES         = src src/common 
    44PREFIX          = /usr 
    55DESTDIR         = / 
    … …  
    2121translation: 
    2222        for l in $(LANGS) ; do \ 
    23                 msgfmt Messages/$$l/LC_MESSAGES/gajim.po -o Messages/$$l/LC_MESSAGES/gajim.mo; \ 
     23                msgfmt po/$$l/LC_MESSAGES/gajim.po -o po/$$l/LC_MESSAGES/gajim.mo; \ 
    2424        done 
    2525 
    2626trayicon: 
    27         make -C plugins/gtkgui all; 
     27        make -C src all; 
    2828 
    2929idle: 
    30         make -C common all; 
     30        make -C src/common all; 
    3131 
    3232pyo: 
    … …  
    4444        -rm -rf gajim-$(VERSION) 
    4545        mkdir gajim-$(VERSION) 
    46         cp -r plugins scripts common Core doc Messages sounds gajim-$(VERSION)/ 
    47         cp setup_win32.py gajim.iss AUTHORS gajim.1 gajim.xpm gajim.ico COPYING Makefile Changelog README gajim.py gajim-$(VERSION) 
     46        cp -r data src doc po gajim-$(VERSION)/ 
     47        cp AUTHORS gajim.1 gajim.xpm gajim.ico COPYING Makefile Changelog README gajim.py gajim-$(VERSION) 
    4848        -find gajim-$(VERSION) -name '.svn' -exec rm -rf {} \; 2> /dev/null 
    4949        find gajim-$(VERSION) -name '*.pyc' -exec rm {} \; 
    … …  
    5151        find gajim-$(VERSION) -name '.*' -exec rm {} \; 
    5252        @echo tarring gajim-$(VERSION) ... 
    53         @tar cjf gajim-$(VERSION).tar.bz2 gajim-$(VERSION)/ 
     53        @tar czf gajim-$(VERSION).tar.gz gajim-$(VERSION)/ 
    5454        rm -rf gajim-$(VERSION) 
    5555