[Pkg-ocaml-maint-commits] r1279 - in trunk/packages/demexp/trunk/debian: . patches

Thomas Petazzoni tpetazzo-guest@costa.debian.org
Sun, 17 Apr 2005 13:53:18 +0000


Author: tpetazzo-guest
Date: 2005-04-17 13:53:18 +0000 (Sun, 17 Apr 2005)
New Revision: 1279

Added:
   trunk/packages/demexp/trunk/debian/demexp-client-gtk2.menu
   trunk/packages/demexp/trunk/debian/demexp.xpm
   trunk/packages/demexp/trunk/debian/patches/xdr-conformance.dpatch
Modified:
   trunk/packages/demexp/trunk/debian/changelog
   trunk/packages/demexp/trunk/debian/demexp-client-gtk2.dirs
   trunk/packages/demexp/trunk/debian/patches/00list
   trunk/packages/demexp/trunk/debian/rules
Log:
Icon and menu for GTK2 client. XDR-conformance dpatch, submitted upstream

Modified: trunk/packages/demexp/trunk/debian/changelog
===================================================================
--- trunk/packages/demexp/trunk/debian/changelog	2005-04-16 14:54:24 UTC (rev 1278)
+++ trunk/packages/demexp/trunk/debian/changelog	2005-04-17 13:53:18 UTC (rev 1279)
@@ -1,3 +1,9 @@
+demexp (0.4-3) unstable; urgency=low
+
+  * Added icon and menu for DemExp client
+
+ -- Thomas Petazzoni <thomas.petazzoni@enix.org>  Fri, 15 Apr 2005 23:31:56 +0200
+
 demexp (0.4-2) unstable; urgency=low
 
   * Migration to CDuce 0.3.2. A dpatch new-cduce-version has been written
@@ -2,4 +8,4 @@
     and sent upstream.
-  * Global cleanup of the Makefile. Instead of using «ocamlfind query», we
-    directly use «ocamlfind ocamlopt». This allows a smarter depency
+  * Global cleanup of the Makefile. Instead of using "ocamlfind query", we
+    directly use "ocamlfind ocamlopt". This allows a smarter depency
     handling. For example, while CDuce depends on Curl, there is no need

Modified: trunk/packages/demexp/trunk/debian/demexp-client-gtk2.dirs
===================================================================
--- trunk/packages/demexp/trunk/debian/demexp-client-gtk2.dirs	2005-04-16 14:54:24 UTC (rev 1278)
+++ trunk/packages/demexp/trunk/debian/demexp-client-gtk2.dirs	2005-04-17 13:53:18 UTC (rev 1279)
@@ -1 +1,2 @@
 usr/bin
+usr/share/pixmaps

Added: trunk/packages/demexp/trunk/debian/demexp-client-gtk2.menu
===================================================================
--- trunk/packages/demexp/trunk/debian/demexp-client-gtk2.menu	2005-04-16 14:54:24 UTC (rev 1278)
+++ trunk/packages/demexp/trunk/debian/demexp-client-gtk2.menu	2005-04-17 13:53:18 UTC (rev 1279)
@@ -0,0 +1,4 @@
+?package(demexp-client-gtk2):command="/usr/bin/demexp-client-gtk2" \
+  icon="/usr/share/pixmaps/demexp.xpm" \
+  needs="X11" \
+  section="Apps/Net" title="DemExp Client"

Added: trunk/packages/demexp/trunk/debian/demexp.xpm
===================================================================
--- trunk/packages/demexp/trunk/debian/demexp.xpm	2005-04-16 14:54:24 UTC (rev 1278)
+++ trunk/packages/demexp/trunk/debian/demexp.xpm	2005-04-17 13:53:18 UTC (rev 1279)
@@ -0,0 +1,171 @@
+/* XPM */
+static char * demexp2_xpm[] = {
+"32 32 136 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #E4E4E4",
+"@ 	c #8F8F8F",
+"# 	c #000000",
+"$ 	c #C0C0C0",
+"% 	c #BCBCBC",
+"& 	c #8D8D8D",
+"* 	c #7F7F7F",
+"= 	c #969696",
+"- 	c #CFCFCF",
+"; 	c #D0D0D0",
+"> 	c #A5A5A5",
+", 	c #B5B5B5",
+"' 	c #C2C2C2",
+") 	c #F1F1F1",
+"! 	c #B1B1B1",
+"~ 	c #2A2A2A",
+"{ 	c #040404",
+"] 	c #080808",
+"^ 	c #101010",
+"/ 	c #070707",
+"( 	c #4D4D4D",
+"_ 	c #DCDCDC",
+": 	c #3D3D3D",
+"< 	c #626262",
+"[ 	c #6C6C6C",
+"} 	c #525252",
+"| 	c #949494",
+"1 	c #6D6D6D",
+"2 	c #D5D5D5",
+"3 	c #EAEAEA",
+"4 	c #989898",
+"5 	c #151515",
+"6 	c #848484",
+"7 	c #CBCBCB",
+"8 	c #DADADA",
+"9 	c #CDCDCD",
+"0 	c #1B1B1B",
+"a 	c #252525",
+"b 	c #6F6F6F",
+"c 	c #828282",
+"d 	c #222222",
+"e 	c #A2A2A2",
+"f 	c #B6B6B6",
+"g 	c #E7E7E7",
+"h 	c #D9D9D9",
+"i 	c #D1D1D1",
+"j 	c #8E8E8E",
+"k 	c #4F4F4F",
+"l 	c #E8E8E8",
+"m 	c #BABABA",
+"n 	c #0B0B0B",
+"o 	c #2C2C2C",
+"p 	c #DFDFDF",
+"q 	c #363636",
+"r 	c #ABABAB",
+"s 	c #C3C3C3",
+"t 	c #666666",
+"u 	c #6A6A6A",
+"v 	c #3E3E3E",
+"w 	c #C8C8C8",
+"x 	c #D7D7D7",
+"y 	c #3A3A3A",
+"z 	c #9F9F9F",
+"A 	c #929292",
+"B 	c #A7A7A7",
+"C 	c #D6D6D6",
+"D 	c #010101",
+"E 	c #4E4E4E",
+"F 	c #5E5E5E",
+"G 	c #B8B8B8",
+"H 	c #787878",
+"I 	c #ACACAC",
+"J 	c #E6E6E6",
+"K 	c #E2E2E2",
+"L 	c #DBDBDB",
+"M 	c #F0F0F0",
+"N 	c #818181",
+"O 	c #5A5A5A",
+"P 	c #B7B7B7",
+"Q 	c #898989",
+"R 	c #CCCCCC",
+"S 	c #5C5C5C",
+"T 	c #676767",
+"U 	c #8C8C8C",
+"V 	c #909090",
+"W 	c #141414",
+"X 	c #555555",
+"Y 	c #181818",
+"Z 	c #474747",
+"` 	c #B2B2B2",
+" .	c #939393",
+"..	c #9E9E9E",
+"+.	c #747474",
+"@.	c #CECECE",
+"#.	c #D2D2D2",
+"$.	c #EEEEEE",
+"%.	c #C1C1C1",
+"&.	c #B9B9B9",
+"*.	c #DEDEDE",
+"=.	c #BFBFBF",
+"-.	c #7C7C7C",
+";.	c #1E1E1E",
+">.	c #171717",
+",.	c #EBEBEB",
+"'.	c #282828",
+").	c #8B8B8B",
+"!.	c #888888",
+"~.	c #9A9A9A",
+"{.	c #EFEFEF",
+"].	c #020202",
+"^.	c #636363",
+"/.	c #B0B0B0",
+"(.	c #434343",
+"_.	c #303030",
+":.	c #545454",
+"<.	c #DDDDDD",
+"[.	c #656565",
+"}.	c #323232",
+"|.	c #5F5F5F",
+"1.	c #3B3B3B",
+"2.	c #AFAFAF",
+"3.	c #606060",
+"4.	c #0F0F0F",
+"5.	c #383838",
+"6.	c #515151",
+"7.	c #111111",
+"8.	c #595959",
+"9.	c #808080",
+"0.	c #313131",
+"a.	c #444444",
+"b.	c #BEBEBE",
+"c.	c #585858",
+"d.	c #464646",
+"e.	c #919191",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                          . +                                   ",
+"                          @ # $                                 ",
+"                          @ # $                                 ",
+"                          @ # $                                 ",
+"                          @ # $                                 ",
+"            % & * = -     @ # $           + ; > , ' )           ",
+"        ! ~ { ] ^ ] / ( _ @ # $         @ : < [ } | 1 2 3       ",
+"      4 ] 5 6 7 8 9 @ 0 a b # $       c d e f g + h i j k l     ",
+"    m n o 8           p q { # $     r d s             s t u     ",
+"    v / w               x n # $   l y z                 A B C   ",
+"  p D E                   F # $   G H I J g K   L C M h ) N O   ",
+"  P # Q                   A # $   R S H t T U V W X F X G Y Z   ",
+"  ` #  .                  ..# $   ..+.' @.#.$.%.&.*.=.l - f 8   ",
+"  ; # u                   -.# $   R u #.                        ",
+"    ;.>.,.                '.# $   h ).!.                C ~.{.  ",
+"    & ].^.              * D # $     )./.w             $.(._.#.  ",
+"      :.D X x       <.[./ }.# $       |.1.2.        + 3.~ |     ",
+"      ) 3./ 4.5.6.y 7.W 4 U # $       #.8.8.9.u [.( 9.0.~.      ",
+"          $ t y 0.a.* <.  ' +.<.          b.@ c.d.r e.K         ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

Modified: trunk/packages/demexp/trunk/debian/patches/00list
===================================================================
--- trunk/packages/demexp/trunk/debian/patches/00list	2005-04-16 14:54:24 UTC (rev 1278)
+++ trunk/packages/demexp/trunk/debian/patches/00list	2005-04-17 13:53:18 UTC (rev 1279)
@@ -1,2 +1,3 @@
 makefile
 cduce-new-format
+xdr-conformance

Added: trunk/packages/demexp/trunk/debian/patches/xdr-conformance.dpatch
===================================================================
--- trunk/packages/demexp/trunk/debian/patches/xdr-conformance.dpatch	2005-04-16 14:54:24 UTC (rev 1278)
+++ trunk/packages/demexp/trunk/debian/patches/xdr-conformance.dpatch	2005-04-17 13:53:18 UTC (rev 1279)
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xdr-conformance.dpatch by  <thomas@crazy.kos.nx>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad demexp-0.4/net/messages.xdr.nw /tmp/dpep.D5zgjm/demexp-0.4/net/messages.xdr.nw
+--- demexp-0.4/net/messages.xdr.nw	2005-03-15 18:50:27.000000000 +0100
++++ /tmp/dpep.D5zgjm/demexp-0.4/net/messages.xdr.nw	2005-04-17 15:49:05.376700178 +0200
+@@ -155,7 +155,7 @@
+   question_desc_t q_desc;
+   login_t q_info_author;
+   date_t q_info_limit_date;
+-  enum question_status_e q_info_status;
++  question_status_e q_info_status;
+   response_t q_info_responses<MAX_NUMBER_RESPONSES>;
+   int q_info_elected_responses<MAX_NUMBER_RESPONSES>;
+ };
+@@ -199,7 +199,7 @@
+ 
+ struct participant_info_return_t {
+   return_code_t participant_info_rc;
+-  struct info_on_participant_t participant_info<MAX_NUMBER_IDS>;
++  info_on_participant_t participant_info<MAX_NUMBER_IDS>;
+ };
+ @ 
+ 
+@@ -227,7 +227,7 @@
+ 
+ struct tag_info_return_t {
+   return_code_t tag_info_rc;
+-  struct info_on_tag_t tag_info<MAX_NUMBER_IDS>;
++  info_on_tag_t tag_info<MAX_NUMBER_IDS>;
+ };
+ @ 
+ 
+@@ -241,7 +241,7 @@
+ 
+ struct tag_set_group_t {
+   return_code_t tag_set_group_rc;
+-  struct question_tag_set_t tag_set_group<MAX_NUMBER_IDS>;
++  question_tag_set_t tag_set_group<MAX_NUMBER_IDS>;
+ };
+ @ 
+ 
+@@ -339,7 +339,7 @@
+ 
+ <<messages.xdr>>=
+     return_code_t set_question_status(cookie_t, question_id_t,
+-                                      enum question_status_e) = 7;
++                                      question_status_e) = 7;
+ @ 
+ 
+ Method [[vote]] registers on server the vote on question of identifier


Property changes on: trunk/packages/demexp/trunk/debian/patches/xdr-conformance.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/demexp/trunk/debian/rules
===================================================================
--- trunk/packages/demexp/trunk/debian/rules	2005-04-16 14:54:24 UTC (rev 1278)
+++ trunk/packages/demexp/trunk/debian/rules	2005-04-17 13:53:18 UTC (rev 1279)
@@ -50,6 +50,7 @@
 	dh_installdirs
 	mv lablgtk2-clnt/demexp-lablgtk2-client lablgtk2-clnt/demexp-client-gtk2
 	mv lablgtk2-clnt/demexp-lablgtk2-client-book.pdf lablgtk2-clnt/demexp-client-gtk2-book.pdf
+	cp debian/demexp.xpm debian/demexp-client-gtk2/usr/share/pixmaps/
 	dh_install
 
 # Build architecture-independent files here.
@@ -63,24 +64,12 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
+	dh_installmenu
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol