← Back to branch summary

~jtaylor/ubuntu/oneiric/gajim/multiple-CVE

« back to all changes in this revision

Viewing changes to data/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Nafallo Bjälevik
  • Date: 2008-11-16 00:26:27 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20081116002627-4olie99o2rqc7001
Tags: 0.12~beta1-0ubuntu1
* New upstream beta release:
  + Security improvements: End-to-End encryption, SSL certificat verification
  + Ability to minimize groupchats in roster
  + Chat to groupchat transformation
  + Block/Unblock contacts directly from roster
  + Single window mode
  + PEP support (User activity, mood and tune)
  + Security improvements: Kerberos (GSSAPI) SASL Authentication mechanism
  + Improve GUI of some windows
  + Fix handling of invalid XML
  + Fix freeze on connection
* Dropped all changes, patches and backports.
* src/common/passwords.py:
  - Change keyring to 'login', which is what gets unlocked at login.
* debian/copyright:
  - Updated for the GPL-3 change and for the amount of upstream authors.
* debian/control:
  - Update Standards-Version and drop XS for Vcs-Bzr.
  - Add Homepage and use ${shlibs:Depends}.
* debian/rules:
  - Update to not ignore errors from make clean.
  - Update with dh_shlibdeps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.am
1
 
SUBDIRS = glade emoticons pixmaps iconsets 
 
1
SUBDIRS = glade emoticons pixmaps iconsets moods activities
2
2
@INTLTOOL_DESKTOP_RULE@
3
3
 
4
4
desktopdir = $(datadir)/applications
12
12
sounds_DATA = $(srcdir)/sounds/*.wav
13
13
 
14
14
otherdir = $(pkgdatadir)/data/other
15
 
other_DATA = other/servers.xml
16
 
 
17
 
man_MANS = gajim.1 gajim-remote.1
 
15
other_DATA = other/servers.xml other/cacerts.pem
 
16
 
 
17
if BUILD_REMOTE_CONTROL
 
18
OPTIONAL_MAN = gajim-remote.1
 
19
else
 
20
OPTIONAL_MAN =
 
21
endif
 
22
 
 
23
man_MANS = gajim.1 $(OPTIONAL_MAN)
18
24
 
19
25
 
20
26
EXTRA_DIST = $(desktop_in_files) \