Ticket #2078 (closed defect: fixed)
Debian Patches out of date again
| Reported by: | Weirdo | Owned by: | asterix |
|---|---|---|---|
| Priority: | normal | Milestone: | 0.10.1 |
| Component: | None | Version: | svn |
| Severity: | normal | Keywords: | debian patches 00_debian-copying.patch |
| Cc: | gajim.trac.debian.patches.bug.again@… | OS: |
Description
A new debian/patches/00_debian-copying.patch is needed again (almost time for me to write some scripts that automate this better, as the kind of patching it does, should be easy enough to script as a debian/rules makefile thing). I ran 'svn diff Makefile src/dialogs.py' after making the changes the patch makes.
Here is the replacement 'debian/patches/00_debian-copying.patch'
Index: Makefile
===================================================================
--- Makefile (revision 6485)
+++ Makefile (working copy)
@@ -90,7 +90,6 @@
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 © 2003-2006 Gajim Team'
dlg.set_copyright(s)
- text = open('../COPYING').read()
+ text = open('/usr/share/common-licenses/GPL-2').read()
dlg.set_license(text)
dlg.set_comments('%s\n%s %s\n%s %s'
Attachments
Change History
Note: See
TracTickets for help on using
tickets.
