[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9bbc07563ce19d4b9050846eb73824c11bbe2bf0)

Vlad Glagolev scm at sourcemage.org
Tue Jun 3 04:05:47 EDT 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 disk/brasero/FINAL       |    2 +-
 disk/cdrkit/CONFLICTS    |    2 +-
 disk/cdrkit/HISTORY      |    5 ++++-
 disk/cdrtools/CONFLICTS  |    2 +-
 disk/cdrtools/HISTORY    |    9 ++++++---
 disk/dvdrtools/CONFLICTS |    2 +-
 disk/dvdrtools/HISTORY   |    5 ++++-
 disk/libisoburn/DEPENDS  |    2 +-
 disk/libisofs/DEPENDS    |   15 ++++++++-------
 disk/libisofs/HISTORY    |    1 +
 10 files changed, 28 insertions(+), 17 deletions(-)

New commits:
commit 9bbc07563ce19d4b9050846eb73824c11bbe2bf0
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    brasero: we all <3 pygi

commit 14ac090c0f4aefab1b1189a7b15e7823ef41d8ca
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    cdrtools: we all <3 pygi

commit f5eee9dd40c85b4eb96ae17a91ef6a3f41da0ad8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    dvdrtools: we all <3 pygi

commit 37ab93176a34c76b4184bee956564042afa76de5
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    cdrkit: lol

commit 6fdb21223162fb78321e66dbfec8e042a5b03504
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    cdrkit: we all <3 pygi

commit c2362557b8a1f9609c04009078b06285c4a5fcb3
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libisofs: we all <3 pygi

commit 8d09a6b1757d487b20cbdedea4b6c4e2691c49a9
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libisoburn: we all <3 pygi

diff --git a/disk/brasero/FINAL b/disk/brasero/FINAL
index 03abb47..bed21d0 100755
--- a/disk/brasero/FINAL
+++ b/disk/brasero/FINAL
@@ -1,7 +1,7 @@
 $INSTALL_ROOT/usr/bin/update-mime-database $INSTALL_ROOT/usr/share/mime  &&
 $INSTALL_ROOT/usr/bin/update-desktop-database $INSTALL_ROOT/usr/share/applications  &&
 message "${MESSAGE_COLOR}"
-message "If you want to try libburn-pykix support, you need to activate the"
+message "If you want to try libburn support, you need to activate the"
 message "backend through GConf editor at /apps/brasero/config/libburn_burn and"
 message "/apps/brasero/config/libburn_iso. Note that GConf might need to be"
 message "restarted after installing to display these keys."
diff --git a/disk/cdrkit/CONFLICTS b/disk/cdrkit/CONFLICTS
index 1e4f4de..b0bda0b 100755
--- a/disk/cdrkit/CONFLICTS
+++ b/disk/cdrkit/CONFLICTS
@@ -2,4 +2,4 @@ conflicts  dvdrtools      &&
 conflicts  cdrtools       &&
 conflicts  mkisofs        &&
 conflicts  genisoimage    &&
-conflicts  libburn-pykix
+conflicts  libburn
diff --git a/disk/cdrkit/HISTORY b/disk/cdrkit/HISTORY
index f6afb9d..a7b8759 100644
--- a/disk/cdrkit/HISTORY
+++ b/disk/cdrkit/HISTORY
@@ -1,3 +1,6 @@
+2008-06-03 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: corrected conflicts for libburn
+
 2008-05-27 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.1.8
 
@@ -30,7 +33,7 @@
 	* CONFLICTS: Fixed typo.
 
 2006-12-06 Flavien Bridault <vlaaad at sourcemage.org>
-	* CONFLICTS: added genisoimage 
+	* CONFLICTS: added genisoimage
 
 2006-12-03 Flavien Bridault <vlaaad at sourcemage.org>
 	* DETAILS: Updated to 1.1.0
diff --git a/disk/cdrtools/CONFLICTS b/disk/cdrtools/CONFLICTS
index 88582fa..974a556 100755
--- a/disk/cdrtools/CONFLICTS
+++ b/disk/cdrtools/CONFLICTS
@@ -2,4 +2,4 @@ conflicts  dvdrtools  &&
 conflicts  cdrkit  &&
 conflicts  mkisofs  &&
 conflicts  genisoimage  &&
-conflicts  libburn-pykix
+conflicts  libburn
diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY
index ced1f47..fb3a24e 100644
--- a/disk/cdrtools/HISTORY
+++ b/disk/cdrtools/HISTORY
@@ -1,3 +1,6 @@
+2008-06-03 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: corrected conflicts for libburn
+
 2008-02-24 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* PROVIDES: Added READCD as xfburn requires this feature rather
 	  than a generic CD-BURN-UTILITY.
@@ -79,9 +82,9 @@
 
 2006-04-06 Flavien Bridault <disk at sourcemage.org>
 	* POST_REMOVE: call persistent_load to get $IDE_SCSI
-	  moved the main code in FUNCTIONS 
+	  moved the main code in FUNCTIONS
 	* FINAL: moved the main code in FUNCTIONS
-	* ide-scsi: moved at section level for sharing 
+	* ide-scsi: moved at section level for sharing
 
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
@@ -333,7 +336,7 @@
 	* DETAILS: Added SOURCE_DIRECTORY line for VERSION 1.11, thanks to day
 
 2002-04-05 Jean-Michel Smith <anonymous at sourcemage.org>
-	* PROVIDES: Added 'provides' which was erroneously excluded, thanks "Gabriel Devenyi" 
+	* PROVIDES: Added 'provides' which was erroneously excluded, thanks "Gabriel Devenyi"
 	  <ace118 at hotmail.com> for identifying the problem.
 
 2002-03-31 Jean-Michel Smith <jean at kcco.com>
diff --git a/disk/dvdrtools/CONFLICTS b/disk/dvdrtools/CONFLICTS
index 30c9899..996ed9d 100755
--- a/disk/dvdrtools/CONFLICTS
+++ b/disk/dvdrtools/CONFLICTS
@@ -2,4 +2,4 @@ conflicts  cdrtools  &&
 conflicts  cdrkit  &&
 conflicts  mkisofs  &&
 conflicts  genisoimage  &&
-conflicts  libburn-pykix
+conflicts  libburn
diff --git a/disk/dvdrtools/HISTORY b/disk/dvdrtools/HISTORY
index f09703f..c6ac487 100644
--- a/disk/dvdrtools/HISTORY
+++ b/disk/dvdrtools/HISTORY
@@ -1,9 +1,12 @@
+2008-06-03 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: corrected conflicts for libburn
+
 2008-02-24 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* PROVIDES: Added READCD as xfburn requires this feature rather
 	  than a generic CD-BURN-UTILITY.
 
 2006-12-06 Flavien Bridault <vlaaad at sourcemage.org>
-	* CONFLICTS: added genisoimage 
+	* CONFLICTS: added genisoimage
 
 2006-10-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* INSTALL: use TRACK_ROOT when linking #9163
diff --git a/disk/libisoburn/DEPENDS b/disk/libisoburn/DEPENDS
index d4c213f..d9d4844 100755
--- a/disk/libisoburn/DEPENDS
+++ b/disk/libisoburn/DEPENDS
@@ -1,2 +1,2 @@
-depends libburn-pykix &&
+depends libburn &&
 depends libisofs
diff --git a/disk/libisofs/DEPENDS b/disk/libisofs/DEPENDS
index e60558b..ae41d9d 100755
--- a/disk/libisofs/DEPENDS
+++ b/disk/libisofs/DEPENDS
@@ -1,8 +1,9 @@
-depends  pkgconfig  &&
+depends libburn &&
+depends pkgconfig &&
+
 if [[ $LIBISOFS_SVN == y ]]; then
-  depends  libtool  &&
-  depends  automake  &&
-  depends  autoconf  &&
-  depends  subversion
-fi  &&
-depends libburn-pykix
+  depends libtool &&
+  depends automake &&
+  depends autoconf &&
+  depends subversion
+fi
diff --git a/disk/libisofs/HISTORY b/disk/libisofs/HISTORY
index f251b1c..3bf518e 100644
--- a/disk/libisofs/HISTORY
+++ b/disk/libisofs/HISTORY
@@ -1,6 +1,7 @@
 2008-06-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.6.6, fixed long description wrap updated url
 	* PREPARE, PRE_BUILD, DETAILS: [ ] => [[ ]], removed useless quotes, "{", "}"
+	* DEPENDS: correct the deps
 
 2008-05-11 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.6.4



More information about the SM-Commit mailing list