diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2006-10-12 01:10:06 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2006-10-12 01:10:06 +0400 |
| commit | afc975ea178f205f25aaae63040cafa5691f098e (patch) | |
| tree | ce6e808472dcb6641d67fff432545d4a4db78986 /debian/patches | |
| parent | e0e503472a5185b0d7603d0db8cb6c6686393232 (diff) | |
updated debian files from official release and for autotools.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/00_debian-copying.patch | 44 | ||||
| -rw-r--r-- | debian/patches/00_debian-xpm.patch | 22 |
2 files changed, 31 insertions, 35 deletions
diff --git a/debian/patches/00_debian-copying.patch b/debian/patches/00_debian-copying.patch index c5d2e11ab..85797fe57 100644 --- a/debian/patches/00_debian-copying.patch +++ b/debian/patches/00_debian-copying.patch @@ -1,26 +1,22 @@ -Index: Makefile +Index: Makefile.am =================================================================== ---- Makefile (revision 6485) -+++ Makefile (working copy) -@@ -89,7 +89,6 @@ - done - if [[ -n $$(find po -name *.mo) ]]; then \ - ${MAKE} -C po install PREFIX=$(PREFIX) ; \ - fi -- cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/"; - cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/"; - cp AUTHORS "$(DESTDIR)$(PREFIX)/share/gajim/"; - mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps"; -Index: src/dialogs.py -=================================================================== ---- src/dialogs.py (revision 6485) -+++ src/dialogs.py (working copy) -@@ -558,7 +558,7 @@ - dlg.set_version(gajim.version) - s = u'Copyright \xa9 2003-2005 Gajim Team' - dlg.set_copyright(s) -- text = open('../COPYING').read() -+ text = open('/usr/share/common-licenses/GPL-2').read() - dlg.set_license(text) +--- Makefile.am (revision 7202) ++++ Makefile.am (working copy) +@@ -9,7 +9,6 @@ + docfiles_DATA = README \ + README.html \ + ChangeLog \ +- COPYING \ + THANKS \ + AUTHORS + +--- Makefile.in ++++ Makefile.in +@@ -273,7 +273,6 @@ + docfiles_DATA = README \ + README.html \ + ChangeLog \ +- COPYING \ + THANKS \ + AUTHORS - dlg.set_comments(_('A GTK jabber client')) diff --git a/debian/patches/00_debian-xpm.patch b/debian/patches/00_debian-xpm.patch index 88a487556..e787f328e 100644 --- a/debian/patches/00_debian-xpm.patch +++ b/debian/patches/00_debian-xpm.patch @@ -333,14 +333,14 @@ +" @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@)@!@~@{@]@^@*. ", +" *.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*. ", +" "} ---- Makefile -+++ Makefile -@@ -91,7 +91,7 @@ - done - cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/"; - mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps"; -- cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/"; -+ cp data/pixmaps/gajim.xpm "$(DESTDIR)$(PREFIX)/share/pixmaps/"; - cp data/pixmaps/gajim_about.png "$(DESTDIR)$(PREFIX)/share/pixmaps/"; - mkdir -p "$(DESTDIR)$(PREFIX)/share/applications"; - cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/"; +--- data/pixmaps/Makefile.am (revision 7199) ++++ data/pixmaps/Makefile.am (working copy) +@@ -6,7 +6,7 @@ + EXTRA_DIST = $(pixmaps_DATA) + + gajimpixmapdir = $(datadir)/pixmaps +-gajimpixmap_DATA = gajim.png \ ++gajimpixmap_DATA = gajim.xpm \ + gajim_about.png + + MAINTAINERCLEANFILES = Makefile.in |