Tags: patch

the attached patch fixes setup.py to install htdocs and cgi-bin files
in /usr/share/trac
diff --git a/debian/changelog b/debian/changelog
index c36b387..83481c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 trac (0.11-2) unstable; urgency=low
 
+  [ Luis Matos ]
   * Re-added python-setup-tools to build dependences. Closes: #490320 #468705
   * New upstream release Closes: 489727
   * Added sugests other vcs support available in debian: git, bazaar and mercurial.
   * Added spamfilter plugin to sugests
 
- -- Luis Matos <[EMAIL PROTECTED]>  Sun, 13 Jul 2008 18:58:59 +0100
+  [ Jan Dittberner ]
+  * fix setuptools dependency
+  * patch setup.py
+
+ -- Jan Dittberner <[EMAIL PROTECTED]>  Sun, 13 Jul 2008 20:20:52 +0200
 
 trac (0.11-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 388fb2d..69c2a51 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: trac
 Section: web
 Priority: optional
-Build-Depends-Indep: python-setuptools (=>0.6)
+Build-Depends-Indep: python-setuptools (>= 0.6)
 Build-Depends: cdbs (>= 0.4.43), python-all-dev, python-support (>= 0.3), debhelper (>= 4.1.0), dpatch 
 Maintainer: Debian Trac Team <[EMAIL PROTECTED]>
 Uploaders: Otavio Salvador <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL PROTECTED]>, Jesus Climent <[EMAIL PROTECTED]>
diff --git a/debian/patches/00list b/debian/patches/00list
index c9847d6..8893c7f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 10_remove_trac_suffix_from_title.dpatch
+20_setuptools_data-patch.dpatch
diff --git a/debian/patches/20_setuptools_data-patch.dpatch b/debian/patches/20_setuptools_data-patch.dpatch
new file mode 100755
index 0000000..515257f
--- /dev/null
+++ b/debian/patches/20_setuptools_data-patch.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_setuptools_data-patch.dpatch by Jan Dittberner <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: install htdocs in /usr/share/trac/htdocs
+
[EMAIL PROTECTED]@
+diff -urNad trac~/setup.py trac/setup.py
+--- trac~/setup.py	2008-07-13 20:59:26.000000000 +0200
++++ trac/setup.py	2008-07-13 21:00:42.000000000 +0200
+@@ -13,6 +13,7 @@
+ # history and logs, available at http://trac.edgewall.org/log/.
+ 
+ from setuptools import setup, find_packages
++from glob import glob
+ 
+ setup(
+     name = 'Trac',
+@@ -43,12 +44,19 @@
+     packages = find_packages(exclude=['*.tests']),
+     package_data = {
+         '': ['templates/*'],
+-        'trac': ['htdocs/*.*', 'htdocs/README', 'htdocs/js/*', 'htdocs/css/*',
+-                 'htdocs/guide/*'],
+         'trac.wiki': ['default-pages/*'],
+         'trac.ticket': ['workflows/*.ini'],
+     },
+ 
++    data_files = [
++        ('/usr/share/trac/htdocs', glob('trac/htdocs/*.*')),
++        ('/usr/share/trac/htdocs', ['trac/htdocs/README']),
++        ('/usr/share/trac/htdocs/js', glob('trac/htdocs/js/*')),
++        ('/usr/share/trac/htdocs/css', glob('trac/htdocs/css/*')),
++        ('/usr/share/trac/htdocs/guide', glob('trac/htdocs/guide/*')),
++	('/usr/share/trac/cgi-bin', glob('cgi-bin/*')),
++    ],
++
+     test_suite = 'trac.test.suite',
+     zip_safe = False,
+ 

Attachment: signature.asc
Description: Digital signature



Reply via email to