[Commit-gnuradio] r9904 - gnuradio/branches/developers/jcorgan/deb-wip/debian

[jcorgan]

Author: jcorgan
Date: 2008-11-01 18:52:10 -0600 (Sat, 01 Nov 2008)
New Revision: 9904

Added:
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core-dev.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.install
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.dirs
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.install
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt-dev.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt.install
Removed:
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0-dev.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0c2a.dirs
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0c2a.install
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0-dev.dirs
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0-dev.install
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0c2a.dirs
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0c2a.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libgruel.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock0c2a.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock0c2a.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0-dev.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0-dev.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0c2a.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0c2a.install
Modified:
   gnuradio/branches/developers/jcorgan/deb-wip/debian/
   gnuradio/branches/developers/jcorgan/deb-wip/debian/control
   gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs
Log:
wip, moved to simple library names


Property changes on: gnuradio/branches/developers/jcorgan/deb-wip/debian
___________________________________________________________________
Name: svn:ignore
   - libmblock0-dev.install
libgnuradio-core0-dev.install
libusrp0-dev.install
libusrp-inband0-dev.install
python-gnuradio-core.install
python-gnuradio-audio-alsa.install
python-gnuradio-usrp.install
python-gnuradio-wxgui.install
python-gnuradio-atsc.install
python-gnuradio-gsm-fr-vocoder.install
python-gnuradio-comedi.install
python-gnuradio-audio-oss.install
python-gnuradio-audio-portaudio.install
python-gnuradio-audio-jack.install
python-gnuradio-trellis.install
python-gnuradio-video-sdl.install
python-gnuradio-cvsd-vocoder.install
python-usrp.install
python-gnuradio-utils.install
gnuradio-examples.install
gnuradio-radio-astronomy.install
gnuradio-pager.install
gnuradio-radar-mono.install
gnuradio-sounder.install

   + 


Modified: gnuradio/branches/developers/jcorgan/deb-wip/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/control 2008-11-01 
23:06:24 UTC (rev 9903)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/control 2008-11-02 
00:52:10 UTC (rev 9904)
@@ -25,56 +25,66 @@
  .
  This package contains header files needed by developers.
 
-Package: libgnuradio-omnithread0c2a
+Package: libgnuradio-omnithread
 Section: libs
 Architecture: any
+Replaces: libgnuradio-omnithread0c2a
+Conflicts: libgnuradio-omnithread0c2a
 Depends: ${shlibs:Depends}
 Description: GNU Radio Omnithreads Abstraction Library
  This package is a fork of the omniORB-4.0.1 threading library
  for use with GNU Radio.
 
-Package: libgnuradio-omnithread0-dev
+Package: libgnuradio-omnithread-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-omnithread0c2a (= ${binary:Version})
+Replaces: libgnuradio-omnithread0-dev
+Conflicts: libgnuradio-omnithread0-dev
+Depends: libgnuradio-omnithread (= ${binary:Version})
 Description: GNU Radio Omnithreads Abstraction Library
  This package is a fork of the omniORB-4.0.1 threading library
  for use with GNU Radio.
  .
  This package contains header files needed by developers.
 
-Package: libgnuradio-core0c2a
+Package: libgnuradio-core
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts:  libgnuradio-core0, libgnuradio-core0c2
-Replaces:  libgnuradio-core0, libgnuradio-core0c2
+Conflicts:  libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
+Replaces:  libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
 Suggests: gnuradio-doc
-Description: GNU Radio Core Library
+Description: The GNU Sofware Radio Core Library
  This package contains the core GNU Radio libraries.
 
-Package: libgnuradio-core0-dev
+Package: libgnuradio-core-dev
 Section: libdevel
-Architecture: any
-Depends: libgnuradio-core0c2a (= ${binary:Version}), 
libgnuradio-omnithread0-dev, libboost1.35-dev, libgruel-dev, libgsl0-dev, 
fftw3-dev | libfftw3-dev
-Description: Software Defined Radio
+Architecture: any 
+Replaces: libgnuradio-core0-dev
+Conflicts: libgnuradio-core0-dev
+Depends: libgnuradio-core (= ${binary:Version}), libgnuradio-omnithread-dev, 
libboost1.35-dev, libgruel-dev, libgsl0-dev, fftw3-dev | libfftw3-dev
+Description: The GNU Software Radio Core Library
  This package contains the core GNU Radio libraries.
  .
  This package contains header files needed by developers.
 
-Package: libpmt0c2a
+Package: libpmt
 Section: libs
 Architecture: any
+Replaces: libpmt0c2a
+Conflicts: libpmt0c2a
 Depends: ${shlibs:Depends}
 Description: GNU Radio Polymorphic Type Library
  This package implements polymorphic types.  These are similar 
  to lisp or Python data objects, and implement transparent
  reference counting using the boost shared_ptr templates.
 
-Package: libpmt0-dev
+Package: libpmt-dev
 Section: libdevel
 Architecture: any
-Depends: libpmt0c2a (= ${binary:Version}), libgnuradio-omnithread0-dev, 
libboost1.35-dev
+Replaces: libpmt0-dev
+Conflicts: libpmt0-dev
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread-dev, 
libboost1.35-dev
 Description: GNU Radio Polymorphic Type Library
  This package implements polymorphic types.  These are similar 
  to lisp or Python data objects, and implement transparent
@@ -82,17 +92,21 @@
  .
  This package contains header files needed by developers.
 
-Package: libmblock0c2a 
+Package: libmblock 
 Section: libs 
-Architecture: any 
+Architecture: any
+Replaces: libmblock0c2a
+Conflicts: libmblock0c2a
 Depends: ${shlibs:Depends} 
 Description: GNU Radio Message Block Library 
  This package provides the GNU Radio message block library. 
 
-Package: libmblock0-dev
+Package: libmblock-dev
 Section: libdevel
 Architecture: any
-Depends: libmblock0c2a (= ${binary:Version}), libgnuradio-omnithread0-dev, 
libpmt0-dev
+Replaces: libmblock0-dev
+Conflicts: libmblock0-dev
+Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev, 
libpmt-dev
 Description: GNU Radio Message Block Library
  This package provides the GNU Radio message block library.
  .
@@ -255,7 +269,7 @@
 Section: libdevel
 Architecture: all
 Recommends: libgnuradio-audio-alsa-dev
-Depends: libgnuradio-core0-dev, libmblock0-dev, libpmt0-dev
+Depends: libgnuradio-core-dev, libmblock-dev, libpmt-dev
 Description: Development headers for GNU Radio C++ development
  This is a virtual package that depends on all the development header packages
  for the various GNU Radio components.  It is only needed if you intend to 

Modified: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh    
2008-11-01 23:06:24 UTC (rev 9903)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh    
2008-11-02 00:52:10 UTC (rev 9904)
@@ -2,8 +2,8 @@
 
 EXTRACT=dtools/bin/extract_install_filenames
 
-# libgnuradio-core0-dev
-NAME=debian/libgnuradio-core0-dev.install
+# libgnuradio-core-dev
+NAME=debian/libgnuradio-core-dev.install
 rm -f $NAME
 touch $NAME
 $EXTRACT gnuradio-core/src/lib/filter/Makefile grinclude_HEADERS >>$NAME
@@ -23,8 +23,8 @@
 echo usr/lib/libgnuradio-core.so >>$NAME
 echo usr/lib/pkgconfig/gnuradio-core.pc >>$NAME
 
-# libmblock0-dev
-NAME=debian/libmblock0-dev.install
+# libmblock-dev
+NAME=debian/libmblock-dev.install
 rm -f $NAME
 touch $NAME
 $EXTRACT mblock/src/lib/Makefile include_HEADERS >>$NAME

Copied: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core-dev.dirs 
(from rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0-dev.dirs)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core-dev.dirs   
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core-dev.dirs   
    2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1,3 @@
+usr/lib/pkgconfig
+usr/include/gnuradio
+usr/include/gnuradio/swig


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core-dev.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.dirs (from 
rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0c2a.dirs)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.dirs   
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.dirs   
2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1 @@
+etc/gnuradio/conf.d


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.install 
(from rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0c2a.install)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.install    
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.install    
    2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1,3 @@
+etc/gnuradio/conf.d/gnuradio-core.conf
+usr/lib/libgnuradio-core.la
+usr/lib/libgnuradio-core.so.*


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0-dev.dirs

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0c2a.dirs

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core0c2a.install

Copied: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.dirs
 (from rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0-dev.dirs)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.dirs
                         (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.dirs
 2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1,2 @@
+usr/lib/pkgconfig
+usr/include/gnuradio


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.install
 (from rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0-dev.install)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.install
                              (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.install
      2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1,5 @@
+usr/include/gnuradio/omni_time.h
+usr/include/gnuradio/omnithread.h
+usr/include/gnuradio/ot_posix.h
+usr/lib/pkgconfig/gnuradio-omnithread.pc
+usr/lib/libgromnithread.so


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread.install
 (from rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0c2a.install)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread.install
                          (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread.install
  2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1,2 @@
+usr/lib/libgromnithread.la
+usr/lib/libgromnithread.so.*


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0-dev.dirs

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0-dev.install

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0c2a.dirs

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread0c2a.install

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libgruel.dirs

Copied: gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock.install 
(from rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock0c2a.install)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock.install       
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock.install       
2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1,3 @@
+usr/lib/libmblock.la
+usr/lib/libmblock.so.*
+


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock0c2a.dirs

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock0c2a.install

Copied: gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt-dev.install 
(from rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0-dev.install)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt-dev.install      
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt-dev.install      
2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1,5 @@
+usr/include/pmt.h
+usr/include/pmt_pool.h
+usr/include/pmt_serial_tags.h
+usr/lib/libpmt.so
+usr/lib/pkgconfig/pmt.pc


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt-dev.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt.install 
(from rev 9903, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0c2a.install)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt.install          
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt.install  
2008-11-02 00:52:10 UTC (rev 9904)
@@ -0,0 +1,2 @@
+usr/lib/libpmt.la
+usr/lib/libpmt.so.*


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0-dev.dirs

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0-dev.install

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0c2a.dirs

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt0c2a.install

Modified: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs    
2008-11-01 23:06:24 UTC (rev 9903)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs    
2008-11-02 00:52:10 UTC (rev 9904)
@@ -1,4 +1,3 @@
-usr/lib
 etc/udev/rules.d
 /usr/share/usrp/rev2
 /usr/share/usrp/rev4