Update of /cvsroot/freevo/freevo/contrib/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv30296

Modified Files:
        changelog freevo.postinst rules 
Added Files:
        bsd-ioctl-remove.diff freevo-media.install freevo.install 
Log Message:
Lots of changes for Debian package... see changelog for details.


--- NEW FILE: bsd-ioctl-remove.diff ---
--- debian/tmp/usr/lib/python2.3/site-packages/freevo/plugins/rom_drives.py     
2004-01-08 10:42:40.000000000 -0500
+++ debian/tmp/usr/lib/python2.3/site-packages/freevo/plugins/rom_drives.py.new 
2004-01-08 10:48:40.000000000 -0500
@@ -66,16 +66,6 @@
     # (for some strange reason, this is missing sometimes)
     CDROM_DRIVE_STATUS
 except:
-    if os.uname()[0] == 'FreeBSD':
-        # FreeBSD ioctls - there is no CDROM.py...
-        CDIOCEJECT = 0x20006318
-        CDIOCCLOSE = 0x2000631c
-        CDIOREADTOCENTRYS = 0xc0086305
-        CD_LBA_FORMAT = 1
-        CD_MSF_FORMAT = 2
-        CDS_NO_DISC = 1
-        CDS_DISC_OK = 4
-    else:
         # strange ioctrls missing
         CDROMEJECT = 0x5309
         CDROMCLOSETRAY = 0x5319

--- NEW FILE: freevo-media.install ---
usr/share/freevo/fonts
usr/share/freevo/icons
usr/share/freevo/images
usr/share/freevo/skins


--- NEW FILE: freevo.install ---
usr/lib/python2.3/site-packages/freevo
usr/bin
usr/share/locale
usr/share/freevo/contrib
usr/share/freevo/htdocs


Index: changelog
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/debian/changelog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** changelog   9 Nov 2003 04:59:07 -0000       1.6
--- changelog   8 Jan 2004 16:05:21 -0000       1.7
***************
*** 1,2 ****
--- 1,13 ----
+ freevo (1.4.1cvs20030108-1) unstable; urgency=low
+ 
+   * New snapshot
+   * Replaced `pwd` with $(CURDIR)
+   * Fixed postinst
+   * Removed spurious warnings from BSD support
+   * Remove non-standard mixer, favour ossmixer instead
+   * Use dh_install instead of copying by hand.
+ 
+  -- Aubin Paul <[EMAIL PROTECTED]>  Thu,  8 Jan 2004 11:03:45 -0500
+ 
  freevo (1.4rc3-2) unstable; urgency=low
  

Index: freevo.postinst
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/debian/freevo.postinst,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** freevo.postinst     30 Dec 2003 01:36:11 -0000      1.6
--- freevo.postinst     8 Jan 2004 16:05:21 -0000       1.7
***************
*** 42,44 ****
--- 42,54 ----
          if [ "$RET" = "true" ]; then update-rc.d freevo defaults 99; fi
      ;;
+     *)
+     PYTHON=python2.3
+     if which $PYTHON >/dev/null 2>&1; then
+             DIRLIST="/usr/lib/python2.3/site-packages/freevo"
+             for i in $DIRLIST ; do
+                     $PYTHON -O /usr/lib/$PYTHON/compileall.py -q $i
+                     $PYTHON /usr/lib/$PYTHON/compileall.py -q $i
+             done
+     fi
+     ;;
  esac

Index: rules
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/debian/rules,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rules       2 Nov 2003 13:44:48 -0000       1.12
--- rules       8 Jan 2004 16:05:21 -0000       1.13
***************
*** 26,32 ****
        rm -f `find . | grep freevo.mo`
        rm -rf src/www/htdocs/help/wiki
!       rm -f `pwd`/src/util/distutils.pyc
!       rm -f `pwd`/src/util/__init__.pyc
!       rm -f `pwd`/src/version.pyc
        rm -f *.pyc
        rm -fr build
--- 26,32 ----
        rm -f `find . | grep freevo.mo`
        rm -rf src/www/htdocs/help/wiki
!       rm -f $(CURDIR)/src/util/distutils.pyc
!       rm -f $(CURDIR)/src/util/__init__.pyc
!       rm -f $(CURDIR)/src/version.pyc
        rm -f *.pyc
        rm -fr build
***************
*** 39,53 ****
        dh_clean -k
        dh_installdirs
!       ./autogen.sh nodocs
!       python2.3 setup.py install --no-compile --root=`pwd`/debian/freevo
        # Move the files in to the data package
!       mv `pwd`/debian/freevo/usr/share/freevo/fonts  
`pwd`/debian/freevo-media/usr/share/freevo/
!       mv `pwd`/debian/freevo/usr/share/freevo/icons  
`pwd`/debian/freevo-media/usr/share/freevo/
!       mv `pwd`/debian/freevo/usr/share/freevo/images 
`pwd`/debian/freevo-media/usr/share/freevo/
!       mv `pwd`/debian/freevo/usr/share/freevo/skins  
`pwd`/debian/freevo-media/usr/share/freevo/
!       mkdir -p `pwd`/debian/freevo/usr/share/freevo/init/ || true
!       cp `pwd`/boot/webserver_init                   
`pwd`/debian/freevo/usr/share/freevo/init/
!       cp `pwd`/boot/recordserver_init                
`pwd`/debian/freevo/usr/share/freevo/init/
!       echo 'FREEVO_HOME="/usr/bin"'   >       
`pwd`/debian/freevo/etc/freevo/boot_config
      
  # Build architecture-independent files here.
--- 39,53 ----
        dh_clean -k
        dh_installdirs
!       $(CURDIR)/autogen.sh nodocs
!       python2.3 setup.py install --no-compile --root=$(CURDIR)/debian/tmp
!       # Clean up warnings
!       rm $(CURDIR)/debian/tmp/usr/lib/python2.3/site-packages/freevo/plugins/mixer.py
! 
!       cat $(CURDIR)/debian/bsd-ioctl-remove.diff | patch -p0 -E
        # Move the files in to the data package
!       mkdir -p $(CURDIR)/debian/freevo/usr/share/freevo/init/ || true
!       cp $(CURDIR)/boot/webserver_init                       
$(CURDIR)/debian/freevo/usr/share/freevo/init/
!       cp $(CURDIR)/boot/recordserver_init                    
$(CURDIR)/debian/freevo/usr/share/freevo/init/
!       echo 'FREEVO_HOME="/usr/bin"'   >       
$(CURDIR)/debian/freevo/etc/freevo/boot_config
      
  # Build architecture-independent files here.
***************
*** 65,68 ****
--- 65,69 ----
        dh_testdir
        dh_testroot
+       dh_install --autodest --sourcedir=debian/tmp
        dh_installdocs $(doclist)
        dh_installmenu




-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to