[Pkg-ocaml-maint-commits] r2851 - in /trunk/packages/mldonkey: trunk/debian/ upstream/

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Thu Jun 22 08:55:51 UTC 2006


Author: smimram
Date: Thu Jun 22 08:55:43 2006
New Revision: 2851

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2851
Log:
Started to update the package.

Added:
    trunk/packages/mldonkey/trunk/debian/mldonkey-gui.desktop
    trunk/packages/mldonkey/trunk/debian/mldonkey-gui.dirs
    trunk/packages/mldonkey/upstream/mldonkey_2.7.7.orig.tar.gz   (with props)
Removed:
    trunk/packages/mldonkey/trunk/debian/control.in
    trunk/packages/mldonkey/upstream/mldonkey_2.7.3.orig.tar.gz
Modified:
    trunk/packages/mldonkey/trunk/debian/FASTTRACK
    trunk/packages/mldonkey/trunk/debian/NEWS.Debian
    trunk/packages/mldonkey/trunk/debian/README.Maintainers
    trunk/packages/mldonkey/trunk/debian/TODO
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/control
    trunk/packages/mldonkey/trunk/debian/copyright
    trunk/packages/mldonkey/trunk/debian/mldonkey-gui.install
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
    trunk/packages/mldonkey/trunk/debian/rules

Modified: trunk/packages/mldonkey/trunk/debian/FASTTRACK
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/FASTTRACK?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/FASTTRACK (original)
+++ trunk/packages/mldonkey/trunk/debian/FASTTRACK Thu Jun 22 08:55:43 2006
@@ -1,17 +1,13 @@
+The Fasttrack affair
+--------------------
 
-Fasttrack affair
+This source is a slighty modified version of a snapshot from Mldonkey
+repository.
 
+Fasttrack directory (src/networks/fasttrack) has been removed. This is due to
+the fact that there is a suspicion over the code that is coming with it.
 
-This source is a slighty modified version of a snapshot
-from Mldonkey repository.
-
-Fasttrack directory ( ./src/networks/fasttrack ) has been
-removed. This is due to the fact that there is a suspicion 
-over the code that is coming with it.
-
-I am very sorry of the situation, but since debian cannot 
-afford to contains problematic code, i modify the upstream
-source.
+I am very sorry of the situation, but since debian cannot afford to contains
+problematic code, i modify the upstream source.
 
 Sylvain LE GALL 06/09/2003
-

Modified: trunk/packages/mldonkey/trunk/debian/NEWS.Debian
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/NEWS.Debian?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/NEWS.Debian (original)
+++ trunk/packages/mldonkey/trunk/debian/NEWS.Debian Thu Jun 22 08:55:43 2006
@@ -9,4 +9,3 @@
  goes wrong.
 
  -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Tue, 28 Jun 2005 00:22:20 +0200
-

Modified: trunk/packages/mldonkey/trunk/debian/README.Maintainers
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/README.Maintainers?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/README.Maintainers (original)
+++ trunk/packages/mldonkey/trunk/debian/README.Maintainers Thu Jun 22 08:55:43 2006
@@ -4,7 +4,7 @@
 
 The purpose of this file is to define how the MLDonkey package should be
 handled. This document if not a reference, it is just a way to write down the
-way different maintainer of this package should work to have the best
+way different maintainers of this package should work to have the best
 efficiency.
 
 1. Notational convention
@@ -32,9 +32,9 @@
   address)
 
 For the sake of simplicity, MLDonkey should stay close to uptream source. For
-example, SpiralVoice provides a lot of good patch. Most of the time i take a
-look at it, but i don't apply it. Reasons for this are : SpiralVoice is a
-member of MLDonkey project -- his modification will be included in the next
+example, SpiralVoice provides a lot of good patches. Most of the time I take a
+look at them, but don't apply them. Reasons for this are: SpiralVoice is a
+member of MLDonkey project -- his modifications will be included in the next
 release --, it is difficult to report bugs when the original upstream source has
 been heavily modified. Trying to stay close to official release, lets report bug
 in a more simple manner, because you are dealing with the official version.
@@ -46,17 +46,17 @@
 3. Utils
 
 There are a lot of utils program in debian/utils. They are all written using
-OCaml. Those utilies are made to manipulate different data structure of MLDonkey
-(password file creation, configuration file handling...).
+OCaml. Those utilies are made to manipulate different data structures of
+MLDonkey (password file creation, configuration file handling...).
 
-For now, i prefer to stay consistent with the rest of the package and not use
-other language than :
+For now, I prefer to stay consistent with the rest of the package and not use
+other language than:
 - ocaml, because it is already a "BuildDepends" of the package,
 - sh, because it is mandatory to have this interpreter.
 
 In particular, perl and python should not be used. Because it will cause a lot
-of dependency (and make it even more long to build in a chroot/uml pbuilder). It
-is also a question of personnal motivation.
+of dependencies (and make it even more long to build in a chroot/uml pbuilder).
+It is also a question of personnal motivation.
 
 4. Subversion
 
@@ -83,8 +83,8 @@
 To build the package, you should checkout 
 svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/tools/opkg-buildpackage.
 
-Modification to the package, should be done using dpatch, and once validated, the 
-patch should be submitted upstream.
+Modification to the package, should be done using dpatch, and once validated,
+the patch should be submitted upstream.
 
 6. People
 

Modified: trunk/packages/mldonkey/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/TODO?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/TODO (original)
+++ trunk/packages/mldonkey/trunk/debian/TODO Thu Jun 22 08:55:43 2006
@@ -1,13 +1,12 @@
-
 * Not assigned:
-  * Build packages for :
+  * Build packages for:
     * kde_applet
     * gnome_applet
     * mozilla plugin
 
   * Explore the possibility to build a package for KMLDonkey (Bug: #274460)
 
-  * Correct bugs : 
+  * Correct bugs: 
     Important bugs - outstanding
     #244406: mldonkey-server: A new problem of mldonkey_server
     #268690: 2.5.28 fails to properly connect to mlnet
@@ -27,4 +26,3 @@
   
 * Sylvain le Gall:
   * Integrate ca, cs, de PO translation
-

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Thu Jun 22 08:55:43 2006
@@ -1,3 +1,17 @@
+mldonkey (2.7.7-1) unstable; urgency=low
+
+  * New maintainter:
+    Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>.
+  * New upstream release, closes: #361173.
+    - the bus error should be gone on sparc, closes: #347465.
+  * Build-depend on ocaml-nox (>= 3.09.2), closes: #369770.
+  * init.d script of mldonkey-server called with stop now exits with 0 even
+    when the server was not running, closes: #368118, #338875.
+  * Added a .desktop file for mldonkey-gui.
+  * Updated standards version to 3.7.2, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 21 Jun 2006 23:15:23 +0000
+
 mldonkey (2.7.3-2) unstable; urgency=low
 
   * Fix the build on alpha by using a workaround when opt compilation

Modified: trunk/packages/mldonkey/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/control?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/control (original)
+++ trunk/packages/mldonkey/trunk/debian/control Thu Jun 22 08:55:43 2006
@@ -1,9 +1,10 @@
 Source: mldonkey
 Section: net
 Priority: optional
-Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org> 
-Build-Depends: ocaml-nox (>= 3.09.0), debhelper (>= 4.1.16), po-debconf, xsltproc, zlib1g-dev, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), chrpath, m4, dpatch (>= 1.11), debconf (>= 0.2.26), liblablgtk2-ocaml-dev, libgd2-noxpm-dev, liblablgtk2-gnome-ocaml-dev
-Standards-Version: 3.6.2.0
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+Build-Depends: ocaml-nox (>= 3.09.2), debhelper (>= 4.1.16), po-debconf, xsltproc, zlib1g-dev, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), chrpath, m4, dpatch (>= 1.11), debconf (>= 0.2.26), liblablgtk2-ocaml-dev, libgd2-noxpm-dev, liblablgtk2-gnome-ocaml-dev
+Standards-Version: 3.7.2
 
 Package: mldonkey-server
 Architecture: any
@@ -31,4 +32,3 @@
  all mldonkey operations. It gives details about connected servers,
  downloaded files, friends and lets one search for files in a pleasing
  way.
-

Modified: trunk/packages/mldonkey/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/copyright?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/copyright (original)
+++ trunk/packages/mldonkey/trunk/debian/copyright Thu Jun 22 08:55:43 2006
@@ -1,7 +1,5 @@
-This package was debianized by Goswin Brederlow <goswin.brederlow at student.uni-tuebingen.de> on
-Wed, 11 Sep 2002 10:59:39 +0200.
-The debianization is to be continued by Sylvain LE GALL <sylvain.le-gall at polytechnique.org> on
-Thu,  6 Mar 2003 16:38:59 +0100
+This package was debianized by Goswin Brederlow <goswin.brederlow at student.uni-tuebingen.de> on Wed, 11 Sep 2002 10:59:39 +0200.
+The debianization is to be continued by Sylvain LE GALL <sylvain.le-gall at polytechnique.org> on Thu,  6 Mar 2003 16:38:59 +0100
 
 It was downloaded from :
   http://savannah.nongnu.org/download/mldonkey/

Added: trunk/packages/mldonkey/trunk/debian/mldonkey-gui.desktop
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-gui.desktop?rev=2851&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-gui.desktop (added)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-gui.desktop Thu Jun 22 08:55:43 2006
@@ -1,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=MLDonkey
+Comment=Graphical frontend for mldonkey
+Comment[fr]=Interface graphique pour mldonkey
+TryExec=mlgui
+Exec=mlgui
+Icon=mlgui.xpm
+Categories=Application;Net;

Added: trunk/packages/mldonkey/trunk/debian/mldonkey-gui.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-gui.dirs?rev=2851&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-gui.dirs (added)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-gui.dirs Thu Jun 22 08:55:43 2006
@@ -1,0 +1,1 @@
+usr/share/applications

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-gui.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-gui.install?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-gui.install (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-gui.install Thu Jun 22 08:55:43 2006
@@ -1,3 +1,4 @@
-mlgui  usr/bin/
-mlguistarter  usr/bin/
-debian/images/mlgui.xpm	usr/share/pixmaps/
+mlgui				usr/bin/
+mlguistarter			usr/bin/
+debian/images/mlgui.xpm		usr/share/pixmaps/
+debian/mldonkey-gui.desktop	usr/share/applications/

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.init?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.init (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.init Thu Jun 22 08:55:43 2006
@@ -86,7 +86,7 @@
   ;;
   stop)
     echo -n "Stopping $DESC: $NAME"
-    start-stop-daemon --stop --pidfile $PIDFILE
+    start-stop-daemon --stop --oknodo --pidfile $PIDFILE
     echo "."
   ;;
   reload)

Modified: trunk/packages/mldonkey/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/rules?rev=2851&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/rules (original)
+++ trunk/packages/mldonkey/trunk/debian/rules Thu Jun 22 08:55:43 2006
@@ -132,6 +132,7 @@
 	dh_installdocs -i
 	dh_installexamples -i
 	dh_installmenu -i
+	dh_desktop -i
 	dh_installinit -i
 	dh_installman -i 
 	dh_installchangelogs distrib/ChangeLog -i
@@ -153,6 +154,7 @@
 	$(RM) $(CURDIR)/debian/mldonkey-server/usr/share/doc/mldonkey-server/distrib/GeoIP_LICENSE.txt
 	dh_installexamples -a
 	dh_installmenu -a
+	dh_desktop -a
 	dh_installinit -a -- start 98 2 3 4 5 . stop 20 0 1 6 .
 	dh_installcron -a
 	dh_installman -a

Added: trunk/packages/mldonkey/upstream/mldonkey_2.7.7.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/upstream/mldonkey_2.7.7.orig.tar.gz?rev=2851&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/mldonkey/upstream/mldonkey_2.7.7.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream




More information about the Pkg-ocaml-maint-commits mailing list