from:"Eddy Mulyono"

Bug#446027: git-core: please install emacs modes properly so they are readily available

2008-10-24 Thread Eddy Mulyono

Hi Jari.

I've incorporated your improved configuration file into the deb.diff.

-Eddy
diff -u git-core-1.5.6.5/debian/changelog git-core-1.5.6.5/debian/changelog
--- git-core-1.5.6.5/debian/changelog
+++ git-core-1.5.6.5/debian/changelog
@@ -1,3 +1,9 @@
+git-core (1:1.5.6.5-2) unstable; urgency=low
+
+  * emacs
+
+ -- Eddy Mulyono [EMAIL PROTECTED]  Thu, 23 Oct 2008 17:30:21 -0700
+
 git-core (1:1.5.6.5-1) unstable; urgency=high
 
   * new upstream point release.
diff -u git-core-1.5.6.5/debian/rules git-core-1.5.6.5/debian/rules
--- git-core-1.5.6.5/debian/rules
+++ git-core-1.5.6.5/debian/rules
@@ -205,6 +205,7 @@
 binary: binary-arch binary-indep
 binary-arch: install-arch git-core.deb
 	rm -f debian/substvars
+	install -m0644 -D debian/git-core.emacsen-startup '$(GIT)'-core/etc/emacs/site-start.d/50git-core.el
 	dpkg-shlibdeps '$(GIT)'-core/usr/bin/*
 	dpkg-gencontrol -isp -pgit-core -P'$(GIT)'-core
 	dpkg -b '$(GIT)'-core ..
only in patch2:
unchanged:
--- git-core-1.5.6.5.orig/debian/git-core.emacsen-startup
+++ git-core-1.5.6.5/debian/git-core.emacsen-startup
@@ -0,0 +1,165 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50git-core.el
+;; for the Debian git-core package
+
+(if (and (not (featurep 'xemacs))
+	 (string emacs-version 23))
+;; Do not load or activate these under Emacs 23.x which already
+;; contains git support
+(progn
+  ;; From http://www.emacswiki.org/cgi-bin/wiki/Git
+  (add-to-list
+   'load-path
+   /usr/share/doc/git-core/contrib/emacs
+   'append)
+
+  (autoload 'vc-git--run-command-string   vc-git  nil)
+  (autoload 'vc-git--run-command  vc-git  nil)
+  (autoload 'vc-git-registeredvc-git  nil)
+  (autoload 'vc-git-state vc-git  nil)
+  (autoload 'vc-git-workfile-version  vc-git  nil)
+  (autoload 'vc-git-symbolic-commit   vc-git  nil)
+  (autoload 'vc-git-previous-version  vc-git  nil)
+  (autoload 'vc-git-next-version  vc-git  nil)
+  (autoload 'vc-git-revertvc-git  nil)
+  (autoload 'vc-git-checkout-modelvc-git  nil)
+  (autoload 'vc-git-workfile-unchanged-p  vc-git  nil)
+  (autoload 'vc-git-register  vc-git  nil)
+  (autoload 'vc-git-print-log vc-git  nil)
+  (autoload 'vc-git-diff  vc-git  nil)
+  (autoload 'vc-git-checkin   vc-git  nil)
+  (autoload 'vc-git-checkout  vc-git  nil)
+  (autoload 'vc-git-annotate-command  vc-git  nil)
+  (autoload 'vc-git-annotate-time vc-git  nil)
+
+  (add-to-list 'vc-handled-backends 'git)
+
+  (autoload 'git-get-env-strings  git  nil)
+  (autoload 'git-call-process-env git  nil)
+  (autoload 'git-call-process-display-error   git  nil)
+  (autoload 'git-call-process-env-string  git  nil)
+  (autoload 'git-run-process-region   git  nil)
+  (autoload 'git-run-command-buffer   git  nil)
+  (autoload 'git-run-command-region   git  nil)
+  (autoload 'git-run-hook git  nil)
+  (autoload 'git-get-string-sha1  git  nil)
+  (autoload 'git-get-committer-name   git  nil)
+  (autoload 'git-get-committer-email  git  nil)
+  (autoload 'git-get-commits-coding-systemgit  nil)
+  (autoload 'git-get-logoutput-coding-system  git  nil)
+  (autoload 'git-escape-file-name git  nil)
+  (autoload 'git-success-message  git  nil)
+  (autoload 'git-get-top-dir  git  nil)
+  (autoload 'git-append-to-ignore git  nil)
+  (autoload 'git-rev-parsegit  nil)
+  (autoload 'git-config   git  nil)
+  (autoload 'git-symbolic-ref git  nil)
+  (autoload 'git-update-ref   git  nil)
+  (autoload 'git-read-treegit  nil)
+  (autoload 'git-write-tree   git  nil)
+  (autoload 'git-commit-tree  git  nil)
+  (autoload 'git-empty-db-p   git  nil)
+  (autoload 'git-get-merge-heads  git  nil)
+  (autoload 'git-get-commit-description   git  nil)
+  (autoload 'git-clear-status git  nil)
+  (autoload 'git-set-fileinfo-state   git  nil)
+  (autoload 'git-status-filenames-map git  nil)
+  (autoload 'git-set-filenames-state  git  nil)
+  (autoload 'git-state-code   git  nil)
+  (autoload 'git-status-code-as-stringgit  nil

Bug#495622: python-django: does not build HTML documentation

2008-08-18 Thread Eddy Mulyono

Package: python-django
Severity: wishlist

It would be nice to include HTML documentation locally.

Steps to reproduce:
1. Look for local HTML documentation

Expected behavior:
HTML documentation found somewhere under /usr/share/doc/

Buggy behavior:
TXT documentation was found, but ReST is not as hypermedia as HTML.

I included a (rough) debdiff against python-django_1.0~beta1-1 (in
experimental) that works for me.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.25-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -u python-django-1.0~beta1/debian/docs python-django-1.0~beta1/debian/docs
--- python-django-1.0~beta1/debian/docs
+++ python-django-1.0~beta1/debian/docs
@@ -3,0 +4 @@
+docs/_build/html/
diff -u python-django-1.0~beta1/debian/changelog python-django-1.0~beta1/debian/changelog
--- python-django-1.0~beta1/debian/changelog
+++ python-django-1.0~beta1/debian/changelog
@@ -1,3 +1,9 @@
+python-django (1.0~beta1-2) experimental; urgency=low
+
+  * docs
+
+ -- Eddy Mulyono [EMAIL PROTECTED]  Mon, 18 Aug 2008 18:24:25 -0700
+
 python-django (1.0~beta1-1) experimental; urgency=low
 
   [ David Spreen ]
diff -u python-django-1.0~beta1/debian/control python-django-1.0~beta1/debian/control
--- python-django-1.0~beta1/debian/control
+++ python-django-1.0~beta1/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Brett Parker [EMAIL PROTECTED]
 Uploaders: Raphael Hertzog [EMAIL PROTECTED], Gustavo Noronha Silva [EMAIL PROTECTED], David Spreen [EMAIL PROTECTED], Debian Python Modules Team [EMAIL PROTECTED]
 Standards-Version: 3.7.3
-Build-Depends: debhelper (= 5.0.37.2), python-dev, cdbs (= 0.4.42), python-setuptools (= 0.6b3), python-support (= 0.3)
+Build-Depends: debhelper (= 5.0.37.2), python-dev, cdbs (= 0.4.42), python-setuptools (= 0.6b3), python-support (= 0.3), python-sphinx
 Homepage: http://www.djangoproject.com/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-django/trunk/?op=log
diff -u python-django-1.0~beta1/debian/rules python-django-1.0~beta1/debian/rules
--- python-django-1.0~beta1/debian/rules
+++ python-django-1.0~beta1/debian/rules
@@ -7,6 +7,11 @@
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+build/python-django::
+	# build docs
+	make -C docs/ html
+	rm -rf docs/_build/html/_sources/
+
 binary-post-install/python-django::
 	# Use default python shebang
 	perl -pi -e 's|^#!/usr/bin/env python.*$$|#!/usr/bin/python|' debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py

Bug#492956: python-django: New SVN snapshot

2008-07-30 Thread Eddy Mulyono

Package: python-django
Severity: wishlist

I updated python-django_0.97~svn7534-1 to Django SVN r8138.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.25-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru /tmp/XoQpKToVpE/python-django-0.97~svn7534/debian/changelog /tmp/l6u6xkN6PC/python-django-1.0~beta~svn8138/debian/changelog
--- python-django-0.97~svn7534/debian/changelog	2008-07-30 00:04:57.0 -0700
+++ python-django-1.0~beta~svn8138/debian/changelog	2008-07-30 00:04:57.0 -0700
@@ -1,3 +1,13 @@
+python-django (1.0~beta~svn8138-1) experimental; urgency=low
+
+  * debian/patches/01_add_shebang.diff: Removed.
+Upstream fixed bug #7268 in r7658.
+  * debian/patches/02_bash_completion.diff: Removed.
+Upstream fixed bug #7268 in r7690.
+  * debian/patches/03_manpage.diff: Updated.
+
+ -- Eddy Mulyono [EMAIL PROTECTED]  Tue, 29 Jul 2008 21:57:00 -0700
+
 python-django (0.97~svn7534-1) experimental; urgency=low
 
   * New upstream snapshot. Closes: #409565, #481051
diff -Nru /tmp/XoQpKToVpE/python-django-0.97~svn7534/debian/patches/01_add_shebang.diff /tmp/l6u6xkN6PC/python-django-1.0~beta~svn8138/debian/patches/01_add_shebang.diff
--- python-django-0.97~svn7534/debian/patches/01_add_shebang.diff	2008-07-30 00:04:57.0 -0700
+++ python-django-1.0~beta~svn8138/debian/patches/01_add_shebang.diff	1969-12-31 16:00:00.0 -0800
@@ -1,20 +0,0 @@
-Forwarded-Upstream: not yet
-Author: Raphael Hertzog [EMAIL PROTECTED]
-Comment:
- Since django/bin/profiling/gather_profile_stats.py is installed as an
- executable, it must have a shebang line to really be a working executable.
- .
- It's the only file matching django/bin/*.py that lacks the shebang line.
- .
- Without this patch lintian complains:
- W: python-django: executable-not-elf-or-script ./usr/share/python-support/python-django/django/bin/profiling/gather_profile_stats.py
- .
- The problem has been mentioned upstream in http://code.djangoproject.com/ticket/7268
-
 django/bin/profiling/gather_profile_stats.py.orig	2006-12-16 11:15:38.0 +0100
-+++ django/bin/profiling/gather_profile_stats.py	2006-12-16 11:15:55.0 +0100
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python
- 
- gather_profile_stats.py /path/to/dir/of/profiles
- 
diff -Nru /tmp/XoQpKToVpE/python-django-0.97~svn7534/debian/patches/02_bash_completion.diff /tmp/l6u6xkN6PC/python-django-1.0~beta~svn8138/debian/patches/02_bash_completion.diff
--- python-django-0.97~svn7534/debian/patches/02_bash_completion.diff	2008-07-30 00:04:57.0 -0700
+++ python-django-1.0~beta~svn8138/debian/patches/02_bash_completion.diff	1969-12-31 16:00:00.0 -0800
@@ -1,45 +0,0 @@
-Forwarded-Upstream: http://code.djangoproject.com/ticket/7268
-Author: Brett Parker [EMAIL PROTECTED]
-Comment: 
- This change is required to make command line completion work for the
- django-admin command. Upstream only recognizes django-admin.py and not
- the variant without extension.
- .
- It's a Debian-specific modification to install django-admin.py as
- /usr/bin/django-admin so this makes this patch also Debian specific.
-
 extras/django_bash_completion_orig
-+++ extras/django_bash_completion
-@@ -53,9 +53,10 @@ _django_completion()
- action_shell_opts=--plain
- action_runfcgi_opts=host port socket method maxspare minspare maxchildren daemonize pidfile workdir
- 
--if [[ # django-admin.py, ./manage, manage.py
-+if [[ # django-admin.py, django-admin, ./manage, manage.py
-   ( ${COMP_CWORD} -eq 1 
- ( ${COMP_WORDS[0]} == django-admin.py ||
-+  ${COMP_WORDS[0]} == django-admin ||
-   ${COMP_WORDS[0]} == ./manage.py ||
-   ${COMP_WORDS[0]} == manage.py ) )
-   ||
-@@ -68,6 +69,11 @@ _django_completion()
-   ( ${COMP_CWORD} -eq 2 
- ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) 
- ( $( basename -- ${COMP_WORDS[1]} ) == django-admin.py) 
-+( -r ${COMP_WORDS[1]} ) ) 
-+  ||
-+  ( ${COMP_CWORD} -eq 2 
-+( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) 
-+( $( basename -- ${COMP_WORDS[1]} ) == django-admin) 
- ( -r ${COMP_WORDS[1]} ) ) ]] ; then
- 
- case ${cur} in
-@@ -142,7 +148,7 @@ _django_completion()
- fi
- }
- 
--complete -F _django_completion django-admin.py manage.py
-+complete -F _django_completion django-admin.py manage.py django-admin
- 
- # Support for multiple interpreters.
- unset pythons
diff -Nru /tmp/XoQpKToVpE/python-django-0.97~svn7534/debian/patches/03_manpage.diff /tmp/l6u6xkN6PC/python-django-1.0~beta~svn8138/debian/patches/03_manpage.diff
--- python-django-0.97~svn7534/debian/patches/03_manpage.diff	2008-07-30 00:04:57.0 -0700

Bug#446027: git-core: please install emacs modes properly so they are readily available

2008-07-29 Thread Eddy Mulyono

I added one line to debian/rules and got it to work.

Test (in sid):
1. `apt-get install git-core emacs22-nox`
2. `emacs`
3. In emacs, M-x git-status

Expected:
git-status macro loads, and prompts for a repo directory

Hope that helps,

-Eddy
diff -u git-core-1.5.6.3/debian/rules git-core-1.5.6.3/debian/rules
--- git-core-1.5.6.3/debian/rules
+++ git-core-1.5.6.3/debian/rules
@@ -205,6 +205,7 @@
 binary: binary-arch binary-indep
 binary-arch: install-arch git-core.deb
 	rm -f debian/substvars
+	install -m0644 -D debian/git-core.emacsen-startup '$(GIT)'-core/etc/emacs/site-start.d/50git-core.el
 	dpkg-shlibdeps '$(GIT)'-core/usr/bin/*
 	dpkg-gencontrol -isp -pgit-core -P'$(GIT)'-core
 	dpkg -b '$(GIT)'-core ..

Bug#446027: git-core: please install emacs modes properly so they are readily available

2008-07-29 Thread Eddy Mulyono

Oops. Here's the debian/git-core.emacsen-startup file

-Eddy


git-core.emacsen-startup
Description: Binary data

Bug#446027: git-core: please install emacs modes properly so they are readily available

Bug#495622: python-django: does not build HTML documentation

Bug#492956: python-django: New SVN snapshot

Bug#446027: git-core: please install emacs modes properly so they are readily available

Bug#446027: git-core: please install emacs modes properly so they are readily available

5 matches

Site Navigation

Mail list logo

Footer information