--- Begin Message ---
Package: abook
Version: 0.6.0~pre2-1
Severity: wishlist
Tags: patch
A little patch that adds an icon for abook (taken from xfmail), and a
desktop entry. There is also a little patch to make things compile with
gcc-2.95, I guess you don't need that anymore, but it doesn't hurt
anyway.
Regards
Simon
diff -Naur abook-0.6.0~pre2~/debian/abook.desktop
abook-0.6.0~pre2/debian/abook.desktop
--- abook-0.6.0~pre2~/debian/abook.desktop Thu Jan 1 01:00:00 1970
+++ abook-0.6.0~pre2/debian/abook.desktop Sun Feb 4 15:07:22 2007
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=abook48.xpm
+Name=Abook
+Comment=Stores your email addresses for mutt
+Comment[fr]=Répertorie vos adresses pour mutt
+Comment[ja]=muttのためのアドレス帳
+Comment[ru]=Записная книжка для mutt
+GenericName=Email addressbook
+GenericName[fr]=Carnet d'adresses pour logiciel de courriel
+Type=Application
+Exec=/usr/bin/abook
+Terminal=true
diff -Naur abook-0.6.0~pre2~/debian/abook48.xpm
abook-0.6.0~pre2/debian/abook48.xpm
--- abook-0.6.0~pre2~/debian/abook48.xpm Thu Jan 1 01:00:00 1970
+++ abook-0.6.0~pre2/debian/abook48.xpm Sun Feb 4 15:07:22 2007
@@ -0,0 +1,67 @@
+/* XPM */
+static char *abook_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 34 27 1",
+" c #090a12",
+". c #0d1025",
+"X c #20182f",
+"o c #302018",
+"O c #382f30",
+"+ c #202441",
+"@ c #4a3a2c",
+"# c #55484d",
+"$ c #696151",
+"% c #71726d",
+"& c #937371",
+"* c #918974",
+"= c #ae8e79",
+"- c #9a9490",
+"; c #aa9895",
+": c #b59da6",
+"> c #aaa696",
+", c #b7bbb5",
+"< c #c7aa9e",
+"1 c #ceb4b1",
+"2 c #d9c8b6",
+"3 c #f7d7be",
+"4 c #ddcdd2",
+"5 c #eadbcf",
+"6 c #f7dbe7",
+"7 c #f2e6da",
+"8 c #fdf2ee",
+/* pixels */
+",,,,,,,,##$%$$$#$###,,,,,,,,####$#$$$##O%,,,,,,,",
+",,,,..O@@*:,4774,:*%.$,,,, $%->,22,,:-$@@ %,,,,",
+",,,$=<158677422211<--@$,,$$>15888677866851-$@ ,,",
+">;4<7755524542221,:>*&@ #;11577475545557338$.,,",
+"+ 2-25454575535222:--*$@o&<22478688866535527OO ",
+"+X8;2755552>-*&*-1<=-&$@O*<1285:----,4557317O@X.",
+"+X8>3752>-->2,1,;-%-*&*#X&<2:&::4444,;->27588 X.",
+"+.8;5:%-245534342::*%&&#O%<&-44688666442-%*2 oX ",
+"+X8-277542,-&%%*%>:-**%@o*>,484-&%%*;,275347O@X ",
+"+X8;352>&;;,75221&$&*&&@O=<1;&;476882>;->217OO. ",
+"+X8>7>&,76551,,,>1,;%&*#@=<*,88444244666,%&8OOX.",
+"+.8;26831>>--**%&;&==&$@@=<221,----;;:,23737O@X.",
+"+.8;21,:>>,48834,>%&%*$@@=:---,4888844:::-:8O@X.",
+"+X8>31:46741>-;--21=%&*@@=<-288,:;->14762>>8OOX.",
+"+.8;3764--;;,<<:;*%%=&$#@=<2>---,111,--;4737OOX ",
+"+X8-5:*-244565522>>-%**@@-:&;47888887442-%&8O@X ",
+"+.8;2323541:%%%%*11=*&&@@=:1264-*%%*;1733217OO. ",
+"+X8>524,**-,7551>&%&*&*@@=<2-%-248744-**1428OOX ",
+"+.8;3:&-57541111111*%&&@@=:&:88544445775-%*7OOX ",
+"+.8-48852,>--***&--=;*%@@-:3422;***-;>,25838@@X.",
+"+X8;31>-->,488722-%&%&&@@=<:-->7888841,;:::7OOX.",
+"+.8>3,:18842>-;->11-%&$#@=<>188,:;::,3781-:8OOX.",
+"+.8;2882:->>,>:--&%%=**#o&<3,-:,,,,,,-->5857O@X.",
+"+.8;5>*-12245322,>-%%&$#O=<&;14787675422:%*7OO. ",
+"+X8>322455455221,1<=*&*$X-114877775446574228@OX ",
+"+.8;2522242421111::-*&&#O=<14444554553524215OOX ",
+"+X8-2742445545222,1;***#X&<24888788874852527O@X ",
+"+X8;375675512<<:;>>--&&#O=142442411244557448OO. ",
+"+X8:651,-$#oo o#%-$o--%Oo .O@%%-,8#OX.",
+"+.8;$#o oooo@@oOoo. ##o$O ooooOOOOXo . O@ @X.",
+"+X1o.ooo@O@@@@@@@@@@ooXOoOoO@O@@OoO@@@O@OXoo @X.",
+"+.. ..... . ........ X. ......... .......... ...",
+"+ .",
+" ..XXX.O++##XX. . .XOO#OOOOXXXX. "
+};
diff -Naur abook-0.6.0~pre2~/debian/changelog abook-0.6.0~pre2/debian/changelog
--- abook-0.6.0~pre2~/debian/changelog Sun Feb 4 15:07:51 2007
+++ abook-0.6.0~pre2/debian/changelog Sun Feb 4 15:07:22 2007
@@ -1,3 +1,20 @@
+abook (0.6.0~pre2-1simwoody2) simstable; urgency=low
+
+ * patch gcc2.95
+ * change menu entry
+
+ -- Simon Adda-Reyss <[email protected]> Sun, 4 Feb 2007
14:52:17 +0100
+
+abook (0.6.0~pre2-1simwoody1) simstable; urgency=low
+
+ * simstable
+ * changé control : libreadline4-dev au lieu 5
+ * ajouté abook.xpm (paquet xfmail)
+ * ajouté abook.desktop
+ * adapté rules pour installer abook.xpm et abook.desktop
+
+ -- Simon Adda-Reyss <[email protected]> Sun, 4 Feb 2007
14:24:45 +0100
+
abook (0.6.0~pre2-1) experimental; urgency=low
* New upstream release
diff -Naur abook-0.6.0~pre2~/debian/menu abook-0.6.0~pre2/debian/menu
--- abook-0.6.0~pre2~/debian/menu Sun Feb 4 15:07:51 2007
+++ abook-0.6.0~pre2/debian/menu Sun Feb 4 15:07:22 2007
@@ -1,2 +1,3 @@
?package(abook):needs="text" section="Apps/Tools" title="Abook" \
- command="/usr/bin/abook" longtitle="Address Book"
+ command="/usr/bin/abook" \
+ icon="/usr/share/pixmaps/abook48.xpm" longtitle="Address Book"
diff -Naur abook-0.6.0~pre2~/debian/patches/gcc2.95.patch
abook-0.6.0~pre2/debian/patches/gcc2.95.patch
--- abook-0.6.0~pre2~/debian/patches/gcc2.95.patch Thu Jan 1 01:00:00 1970
+++ abook-0.6.0~pre2/debian/patches/gcc2.95.patch Sun Feb 4 15:07:22 2007
@@ -0,0 +1,54 @@
+diff -Naur abook-0.6.0~pre2~/edit.c abook-0.6.0~pre2/edit.c
+--- abook-0.6.0~pre2~/edit.c Wed Sep 6 07:26:10 2006
++++ abook-0.6.0~pre2/edit.c Sun Feb 4 14:46:12 2007
+@@ -40,12 +40,13 @@
+ int i, j;
+ int x_pos = 2; /* current x pos */
+ char *tab_name;
++ int width;
+
+ mvwhline(editw, TABLINE + 1, 0, UI_HLINE_CHAR, EDITW_COLS);
+
+ for(i = 0; i < views_count; i++) {
+ view_info(i, &tab_name, NULL);
+- int width = strwidth(tab_name) + 5;
++ width = strwidth(tab_name) + 5;
+
+ if(x_pos + width + 1 > EDITW_COLS) {
+ statusline_addstr(_("Tab name too wide for screen"));
+diff -Naur abook-0.6.0~pre2~/views.c abook-0.6.0~pre2/views.c
+--- abook-0.6.0~pre2~/views.c Tue Aug 8 08:19:05 2006
++++ abook-0.6.0~pre2/views.c Sun Feb 4 14:48:16 2007
+@@ -124,14 +124,6 @@
+ char *str;
+ int i, j, add_custom_fields, add_custom_view = 0;
+
+- add_custom_fields =
+- !strcasecmp(opt_get_str(STR_PRESERVE_FIELDS), "standard");
+-
+- /* if the user has configured views, no need to provide defaults */
+- if(abook_views)
+- goto out;
+- add_custom_view = 1;
+-
+ struct {
+ char *name;
+ int fields[MAX_DEFAULT_FIELDS_PER_VIEW + 1];
+@@ -144,7 +136,16 @@
+ { 0 }
+ };
+
+- for(i = 0; default_views[i].name; i++) {
++
++ add_custom_fields =
++ !strcasecmp(opt_get_str(STR_PRESERVE_FIELDS), "standard");
++
++ /* if the user has configured views, no need to provide defaults */
++ if(abook_views)
++ goto out;
++ add_custom_view = 1;
++
++ for(i = 0; default_views[i].name; i++) {
+ for(j = 0; j < MAX_DEFAULT_FIELDS_PER_VIEW; j++) {
+ if(default_views[i].fields[j] == -1)
+ break;
diff -Naur abook-0.6.0~pre2~/debian/rules abook-0.6.0~pre2/debian/rules
--- abook-0.6.0~pre2~/debian/rules Sun Feb 4 15:07:51 2007
+++ abook-0.6.0~pre2/debian/rules Sun Feb 4 15:07:22 2007
@@ -23,16 +23,24 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-clean:
+clean: unpatch
$(checkdir)
$(checkroot)
- rm -rf build-stamp $(TMP) debian/files debian/substvars
+ rm -rf build-stamp $(TMP) debian/files debian/substvars patch-stamp
-$(MAKE) distclean
+unpatch: patch
+ cat debian/patches/*.patch | patch -p1 -R
+
+
+patch: patch-stamp
+patch-stamp:
+ cat debian/patches/*.patch | patch -p1
+ touch patch-stamp
+
build: build-stamp
-build-stamp:
+build-stamp: patch
$(checkdir)
./configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info
@@ -54,6 +62,10 @@
$(TMP)/usr/share/doc/$(PACKAGE)/examples
cd $(TMP)/usr/share && gzip -9 man/man1/abook.1 man/man5/abookrc.5 \
doc/$(PACKAGE)/changelog
+ $(INSTALL_DIR) $(TMP)/usr/share/pixmaps
+ $(INSTALL_FILE) debian/abook48.xpm $(TMP)/usr/share/pixmaps
+ $(INSTALL_DIR) $(TMP)/usr/share/applications
+ $(INSTALL_FILE) debian/abook.desktop $(TMP)/usr/share/applications
# Build architecture-independent files here.
@@ -93,4 +105,4 @@
test root = "`whoami`"
endef
-.PHONY: clean build install binary-indep binary-arch binary
+.PHONY: clean build install binary-indep binary-arch binary patch unpatch
--- End Message ---
signature.asc
