[Python-apps-commits] r893 - in packages/mercurial/trunk/debian (6 files)

gerardo-guest at users.alioth.debian.org gerardo-guest at users.alioth.debian.org
Tue Apr 1 08:07:18 UTC 2008 

    Date: Tuesday, April 1, 2008 @ 08:07:16
  Author: gerardo-guest
Revision: 893

* Added patches/proposed_upstream__fix_man_warnings.patch
* Delete obsolete link_hgit target from the debian/rules file

Added:
  packages/mercurial/trunk/debian/patches/proposed_upstream__fix_man_warnings.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/control
  packages/mercurial/trunk/debian/examples
  packages/mercurial/trunk/debian/patches/series
  packages/mercurial/trunk/debian/rules

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2008-04-01 00:48:05 UTC (rev 892)
+++ packages/mercurial/trunk/debian/changelog	2008-04-01 08:07:16 UTC (rev 893)
@@ -1,4 +1,4 @@
-mercurial (1.0-1) UNRELEASED; urgency=low
+mercurial (1.0-1) unstable; urgency=low
 
   * new upstream version
     General:
@@ -48,10 +48,10 @@
        checking
      * keyword: new extension for filewise RCS-keyword expansion in working
        directory
-     * mq: new --currentdate, --date, --currentuser, and --user options
+     * mq: new --currentdate, --date, --currentuser, and 
+       --user options
      * record: add "qrecord" command when used with mq
-     * win32mbcs: new extension dealing with problematic MBCS behavior on Windows 
-    
+     
     Web interface:
      * improved WSGI integration and compatibility
      * follow symlinks in hgwebdir collections
@@ -62,44 +62,41 @@
     Hooks:
      * standard hook to reject text files with CRLF in win32text extension
      * redirect stdout to stderr for ssh and http servers
-    
-    Windows support:
-     * "hg" script output set to binary mode for redirecting diff, export,
-       annotate, etc.
-     * also search for .hgrc if mercurial.ini cannot be found
-     * major speedup of "clone --pull"
-
+      
      [Gerardo Curiel]
      * Fix clean target
      * Dropped patches:
        patches/proposed_upstream__check_hgmerge_args.patch
        patches/proposed_upstream__type_is_not_posix.patch
      * patches/deb_specific__use_sensible-editor.patch:
-        Rediff against 1.0 branch
+       Rediff against 1.0 branch
+     * Added patch:
+       patches/proposed_upstream__fix_man_warnings.patch
+     * The hgmerge manpage doesn't exist anymore
+     * contrib/favicon.ico doesn't exist anymore
+     * Delete obsolete link_hgit target from the debian/rules file
+     * Add logo-droplets.svg and mergetools.hgrc to the examples
+       directory
 
- -- Vincent Danjean <vdanjean at debian.org>  Thu, 27 Mar 2008 15:06:09 +0100
+     [Vincent Danjean ]
+     * import mercurial in the Python Application Packaging Team project
+     * debian/control:
+       + add PAPT in the Uploaders field
+       + add Vcs-* fields
+                     
+     [ Piotr Ożarowski ]
+     * New recommended packages:
+       + python-mysqldb (hgext/bugzilla.py)
+       + python-openssl (hgweb/server.py)
+     * New suggested packages:
+       + python-flup (contrib/hgwebdir.fcgi)
+    
+     [ William Pitcock ]
+     * patches/deb_specific__use_sensible-editor.patch:
+       +Rediff against 1.0 branch.
+              
+ -- Gerardo Curiel <gcuriel at debian.org.ve>  Thu, 31 Mar 2008 15:06:09 +0100
 
-mercurial (0.9.5-4) UNRELEASED; urgency=low
-
-  [ Vincent Danjean ]
-  * import mercurial in the Python Application Packaging Team project
-    debian/control:
-    + add PAPT in the Uploaders field
-    + add Vcs-* fields
-
-  [ Piotr Ożarowski ]
-  * New recommended packages:
-    + python-mysqldb (hgext/bugzilla.py)
-    + python-openssl (hgweb/server.py)
-  * New suggested packages:
-    + python-flup (contrib/hgwebdir.fcgi)
-
-  [ William Pitcock ]
-  * patches/deb_specific__use_sensible-editor.patch:
-    Rediff against 1.0 branch.
-
- -- William Pitcock <nenolod at sacredspiral.co.uk>  Tue, 26 Feb 2008 09:00:52 -0600
-
 mercurial (0.9.5-3) unstable; urgency=low
 
   * [debian/control]

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2008-04-01 00:48:05 UTC (rev 892)
+++ packages/mercurial/trunk/debian/control	2008-04-01 08:07:16 UTC (rev 893)
@@ -4,7 +4,7 @@
 Maintainer: Vincent Danjean <vdanjean at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), quilt, patchutils (>= 0.2.25), 
- cdbs (>= 0.4.27-1), python-support (>= 0.4.3), python-all-dev, xmlto, asciidoc
+ cdbs (>= 0.4.27), python-support (>= 0.4.3), python-all-dev, xmlto, asciidoc
 Standards-Version: 3.7.3
 Homepage: http://www.selenic.com/mercurial/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk

Modified: packages/mercurial/trunk/debian/examples
===================================================================
--- packages/mercurial/trunk/debian/examples	2008-04-01 00:48:05 UTC (rev 892)
+++ packages/mercurial/trunk/debian/examples	2008-04-01 08:07:16 UTC (rev 893)
@@ -1,12 +1,13 @@
 hgeditor
-contrib/favicon.ico
 contrib/git-viz
 contrib/hgdiff
 contrib/hg-relink
 contrib/hgsh
 contrib/hg-ssh
 contrib/hgwebdir.fcgi
+contrib/logo-droplets.svg
 contrib/rewrite-log
+contrib/mergetools.hgrc
 contrib/sample.hgrc
 contrib/simplemerge
 contrib/tcsh_completion

Added: packages/mercurial/trunk/debian/patches/proposed_upstream__fix_man_warnings.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__fix_man_warnings.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__fix_man_warnings.patch	2008-04-01 08:07:16 UTC (rev 893)
@@ -0,0 +1,20 @@
+Index: mercurial-1.0/doc/hgignore.5.txt
+===================================================================
+--- mercurial-1.0.orig/doc/hgignore.5.txt	2008-04-01 03:15:26.000000000 -0430
++++ mercurial-1.0/doc/hgignore.5.txt	2008-04-01 03:15:45.000000000 -0430
+@@ -64,6 +64,7 @@
+ 
+   # use glob syntax.
+   syntax: glob
++.................................
+ 
+   *.elc
+   *.pyc
+@@ -73,6 +74,7 @@
+   # switch to regexp syntax.
+   syntax: regexp
+   ^\.pc/
++................................
+ 
+ AUTHOR
+ ------

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2008-04-01 00:48:05 UTC (rev 892)
+++ packages/mercurial/trunk/debian/patches/series	2008-04-01 08:07:16 UTC (rev 893)
@@ -1,3 +1,4 @@
+proposed_upstream__fix_man_warnings.patch
 proposed_upstream__extension_syntax.patch
 deb_specific__FAQ_subst.patch
 deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2008-04-01 00:48:05 UTC (rev 892)
+++ packages/mercurial/trunk/debian/rules	2008-04-01 08:07:16 UTC (rev 893)
@@ -12,7 +12,7 @@
 
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-DEB_INSTALL_MANPAGES_mercurial=doc/hg.1 doc/hgmerge.1 doc/hgrc.5 doc/hgignore.5
+DEB_INSTALL_MANPAGES_mercurial=doc/hg.1 doc/hgrc.5 doc/hgignore.5
 
 binary-install/mercurial::
 	# Install bash autocompletion.
@@ -50,11 +50,7 @@
 	  $(DEB_DESTDIR)/usr/share/python-support/mercurial/mercurial/templates
 
 build: build-doc
-update-config:: link_hgit
 
-link_hgit:
-	ln -fs ../contrib/churn.py hgext/churn.py
-
 build-doc:
 	$(MAKE) -C doc man

More information about the Python-apps-commits mailing list