tags 414847 + patch
thanks

Heya,

please find attached a patch which is a suggestion from me how to solve
the problem.
I think the python module of antlr doesn't depend on the java part of
antlr (or did I miss something?), same for the cpp part (which is
allready packaged on its own. Because of that I've packaged antlr.py
into python-antlr (using pysupport). Also I've split the documentation
into a package on it's own, as you should be able to read the docs
without having to install the parts you don't need.

The packages work for me this way, but I neither tested to build them on
pbuilder, but I hope the Depends/Conflicts are ok. antlr.py don't import
any other py packages, so that's not a problem.

Cheers,

-- 
Bernd Zeimetz
<[EMAIL PROTECTED]>                         <http://bzed.de/>

diff -Ncr debian~/antlr.dirs debian/antlr.dirs
*** debian~/antlr.dirs  2007-03-23 17:21:33.000000000 +0100
--- debian/antlr.dirs   2007-03-23 17:38:56.000000000 +0100
***************
*** 1,4 ****
  usr/bin
- usr/lib/python2.3/site-packages
- usr/lib/python2.4/site-packages
  usr/share/java
--- 1,2 ----
diff -Ncr debian~/antlr-doc.docs debian/antlr-doc.docs
*** debian~/antlr-doc.docs      1970-01-01 01:00:00.000000000 +0100
--- debian/antlr-doc.docs       2007-03-23 17:38:40.000000000 +0100
***************
*** 0 ****
--- 1 ----
+ doc/*
diff -Ncr debian~/antlr-doc.examples debian/antlr-doc.examples
*** debian~/antlr-doc.examples  1970-01-01 01:00:00.000000000 +0100
--- debian/antlr-doc.examples   2007-03-23 17:38:40.000000000 +0100
***************
*** 0 ****
--- 1 ----
+ examples/*
diff -Ncr debian~/changelog debian/changelog
*** debian~/changelog   2007-03-23 17:21:33.000000000 +0100
--- debian/changelog    2007-03-23 19:31:44.000000000 +0100
***************
*** 1,3 ****
--- 1,9 ----
+ antlr (2.7.6-8) unstable; urgency=low
+ 
+   * Splitting antlr-doc and python-antlr from antlr (Closes: #414847)
+ 
+  -- Bernd Zeimetz <[EMAIL PROTECTED]>  Fri, 23 Mar 2007 19:29:47 +0100
+ 
  antlr (2.7.6-7) unstable; urgency=high
  
    * Added Build-Conflict with mono-jit (Closes: #409726).
diff -Ncr debian~/control debian/control
*** debian~/control     2007-03-23 17:21:33.000000000 +0100
--- debian/control      2007-03-23 19:40:57.000000000 +0100
***************
*** 3,9 ****
  Priority: optional
  Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
  Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, John Leuner <[EMAIL 
PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, Barry Hawkins <[EMAIL PROTECTED]>
! Build-Depends: debhelper (>= 4), kaffe, fastjar, classpath, jikes-classpath 
(>= 2:0.12-1), autotools-dev, gcj, libgcj-dev, python, autotools-dev
  Build-Conflicts: mono-jit
  Standards-Version: 3.7.2
  
--- 3,10 ----
  Priority: optional
  Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
  Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, John Leuner <[EMAIL 
PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, Barry Hawkins <[EMAIL PROTECTED]>
! Build-Depends: debhelper (>= 4), kaffe, fastjar, classpath, jikes-classpath 
(>= 2:0.12-1), autotools-dev, gcj, libgcj-dev, autotools-dev, python-all-dev 
(>= 2.3.5-11)
! Build-Depends-Indep: python-support (>= 0.3)
  Build-Conflicts: mono-jit
  Standards-Version: 3.7.2
  
***************
*** 49,51 ****
--- 50,82 ----
   or Java actions [You can use PCCTS 1.xx to generate C-based parsers].
   .
   See antlr package for a complete description.
+ 
+ Package: python-antlr
+ Section: python
+ Architecture: any
+ Depends: ${python:Depends}
+ Provides: ${python:Provides}
+ Conflicts: antlr (<< 2.7.6-8)
+ Description: language tool for constructing recognizers, compilers etc
+  This package provides the python bindings for antlr.
+  ANTLR stands for ANother Tool for Language Recognition,
+  (formerly PCCTS). It is  a language tool that provides a framework
+  for constructing recognizers, compilers, and translators from
+  grammatical descriptions containing C++ or Java actions
+  [You can use PCCTS 1.xx to generate C-based parsers].
+  .
+  See antlr package for a complete description.
+ 
+ Package: antlr-doc
+ Section: doc
+ Architecture: all
+ Conflicts: antlr (<< 2.7.6-8)
+ Description: language tool for constructing recognizers, compilers etc
+  This package contains the documentation and examples for antlr.
+  ANTLR stands for ANother Tool for Language Recognition,
+  (formerly PCCTS). It is  a language tool that provides a framework
+  for constructing recognizers, compilers, and translators from
+  grammatical descriptions containing C++ or Java actions
+  [You can use PCCTS 1.xx to generate C-based parsers].
+  .
+  See antlr package for a complete description
diff -Ncr debian~/docs debian/docs
*** debian~/docs        2007-03-23 17:21:33.000000000 +0100
--- debian/docs 1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- doc/*
--- 0 ----
diff -Ncr debian~/examples debian/examples
*** debian~/examples    2007-03-23 17:21:33.000000000 +0100
--- debian/examples     1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- examples/*
--- 0 ----
diff -Ncr debian~/python-antlr.dirs debian/python-antlr.dirs
*** debian~/python-antlr.dirs   1970-01-01 01:00:00.000000000 +0100
--- debian/python-antlr.dirs    2007-03-23 19:10:43.000000000 +0100
***************
*** 0 ****
--- 1 ----
+ usr/share/python-support/python-antlr
diff -Ncr debian~/pyversions debian/pyversions
*** debian~/pyversions  1970-01-01 01:00:00.000000000 +0100
--- debian/pyversions   2007-03-23 17:43:48.000000000 +0100
***************
*** 0 ****
--- 1 ----
+ 2.3-
diff -Ncr debian~/rules debian/rules
*** debian~/rules       2007-03-23 17:21:33.000000000 +0100
--- debian/rules        2007-03-23 19:38:16.000000000 +0100
***************
*** 57,64 ****
        dh_clean -k
        dh_installdirs
        $(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/antlr
!       install -m644 lib/python/antlr/antlr.py 
debian/antlr/usr/lib/python2.3/site-packages
!       install -m644 lib/python/antlr/antlr.py 
debian/antlr/usr/lib/python2.4/site-packages
  
  install: build
        dh_testdir
--- 57,63 ----
        dh_clean -k
        dh_installdirs
        $(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/antlr
!       install -m644 lib/python/antlr/antlr.py 
debian/python-antlr/usr/share/python-support/python-antlr
  
  install: build
        dh_testdir
***************
*** 71,82 ****
        install -m755 cantlr debian/cantlr/usr/bin
  
  binary-indep: build-indep install-indep
!       dh_testdir -pantlr
!       dh_testroot -pantlr
!       dh_installdocs -pantlr
!       dh_installexamples -pantlr
!       rm -rf debian/antlr/usr/share/doc/antlr/examples/csharp
!       chmod -R a-x debian/antlr/usr/share/doc/antlr/examples
        dh_installman -pantlr
        dh_installchangelogs -pantlr
        dh_link -pantlr usr/share/java/antlr.jar usr/share/java/antlr.debug.jar 
usr/share/java/antlr.jar usr/share/java/antlrall.jar
--- 70,89 ----
        install -m755 cantlr debian/cantlr/usr/bin
  
  binary-indep: build-indep install-indep
!       dh_testdir 
!       dh_testroot
! #
! #   antlr-doc:
!       dh_installdocs -pantlr-doc
!       dh_installexamples -pantlr-doc
!       rm -rf debian/antlr-doc/usr/share/doc/antlr-doc/examples/csharp
!       chmod -R a-x debian/antlr-doc/usr/share/doc/antlr-doc/examples
!       dh_installdeb -pantlr-doc
!       dh_gencontrol -pantlr-doc
!       dh_md5sums -pantlr-doc
!       dh_builddeb -pantlr-doc
! #
! #   antlr:
        dh_installman -pantlr
        dh_installchangelogs -pantlr
        dh_link -pantlr usr/share/java/antlr.jar usr/share/java/antlr.debug.jar 
usr/share/java/antlr.jar usr/share/java/antlrall.jar
***************
*** 90,96 ****
        dh_gencontrol -pantlr
        dh_md5sums -pantlr
        dh_builddeb -pantlr
! 
  
  binary-arch: build install
        dh_testdir -plibantlr-dev -pcantlr
--- 97,110 ----
        dh_gencontrol -pantlr
        dh_md5sums -pantlr
        dh_builddeb -pantlr
! #
! #   python-antlr:
!       dh_installchangelogs -ppython-antlr
!       dh_pysupport -ppython-antlr
!       dh_installdeb -ppython-antlr
!       dh_gencontrol -ppython-antlr
!       dh_md5sums -ppython-antlr
!       dh_builddeb -ppython-antlr
  
  binary-arch: build install
        dh_testdir -plibantlr-dev -pcantlr
***************
*** 106,112 ****
        dh_makeshlibs -plibantlr-dev -pcantlr
        dh_installdeb -plibantlr-dev -pcantlr
  #     dh_perl
-       dh_python
        dh_shlibdeps -plibantlr-dev -pcantlr
        dh_gencontrol -plibantlr-dev -pcantlr
        dh_md5sums -plibantlr-dev -pcantlr
--- 120,125 ----

Reply via email to