Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (fedaa6467e3742fc84df1c7542e5801dd23df871)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (fedaa6467e3742fc84df1c7542e5801dd23df871)
  • Date: Tue, 6 Apr 2010 14:28:38 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

dev/null
|binary
disk/brasero/CONFLICTS
| 1
disk/brasero/HISTORY
| 3 +
gnome2-libs/nautilus-cd-burner/BUILD
| 5 --
gnome2-libs/nautilus-cd-burner/DEPENDS
| 17 ----------
gnome2-libs/nautilus-cd-burner/DETAILS
| 9 ++---
gnome2-libs/nautilus-cd-burner/G_SCHEMAS
| 1
gnome2-libs/nautilus-cd-burner/HISTORY
| 3 +
gnome2-libs/nautilus-cd-burner/INSTALL
| 1
gnome2-libs/nautilus-cd-burner/PRE_BUILD
| 1

gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
| 15 --------
gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
| 15 --------
gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig
| 0
13 files changed, 17 insertions(+), 54 deletions(-)

New commits:
commit fedaa6467e3742fc84df1c7542e5801dd23df871
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

nautilus-cd-burner: deprecated for brasero

diff --git a/disk/brasero/CONFLICTS b/disk/brasero/CONFLICTS
new file mode 100755
index 0000000..d387200
--- /dev/null
+++ b/disk/brasero/CONFLICTS
@@ -0,0 +1 @@
+conflicts nautilus-cd-burner y
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index 0f22e46..15b50ab 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict nautilus-cd-burner for deprecation
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/nautilus-cd-burner/BUILD
b/gnome2-libs/nautilus-cd-burner/BUILD
index 8ab6bc8..27ba77d 100755
--- a/gnome2-libs/nautilus-cd-burner/BUILD
+++ b/gnome2-libs/nautilus-cd-burner/BUILD
@@ -1,4 +1 @@
-# don't know why but 2.10.2 doesn't seem to find pkg-config could be removed
-# could be removed when 2.12 shows up
-export PKG_CONFIG=$(which pkg-config) &&
-default_build
+true
diff --git a/gnome2-libs/nautilus-cd-burner/DEPENDS
b/gnome2-libs/nautilus-cd-burner/DEPENDS
index 527ba42..66a38ff 100755
--- a/gnome2-libs/nautilus-cd-burner/DEPENDS
+++ b/gnome2-libs/nautilus-cd-burner/DEPENDS
@@ -1,16 +1 @@
-depends CD-BURN-UTILITY &&
-depends glib2 &&
-depends gtk+2 &&
-depends gconf2 &&
-depends eel2 &&
-depends libglade2 &&
-depends libgnome &&
-depends libgnomeui &&
-depends nautilus2 &&
-depends dbus &&
-depends hal &&
-
-optional_depends gnome-mount \
- "--enable-gnome-mount" \
- "--disable-gnome-mount" \
- "Use gnome-mount?"
\ No newline at end of file
+depends brasero
diff --git a/gnome2-libs/nautilus-cd-burner/DETAILS
b/gnome2-libs/nautilus-cd-burner/DETAILS
index 1f9e212..85f8ee0 100755
--- a/gnome2-libs/nautilus-cd-burner/DETAILS
+++ b/gnome2-libs/nautilus-cd-burner/DETAILS
@@ -1,12 +1,13 @@
SPELL=nautilus-cd-burner
VERSION=2.24.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE=$SPELL-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
LICENSE[1]=LGPL
+PATCHLEVEL=1
WEB_SITE=http://developer.gnome.org
ENTERED=20020509
KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
b/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
deleted file mode 100644
index 4268b72..0000000
--- a/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
+++ /dev/null
@@ -1 +0,0 @@
-nautilus-cd-burner.schemas
diff --git a/gnome2-libs/nautilus-cd-burner/HISTORY
b/gnome2-libs/nautilus-cd-burner/HISTORY
index 0a53d60..1a286ed 100644
--- a/gnome2-libs/nautilus-cd-burner/HISTORY
+++ b/gnome2-libs/nautilus-cd-burner/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of brasero
+
2008-10-03 Robin Cook <rcook AT wyrms.net>
* DEPENDS: removed gnome-vfs2
added explicit gnome depends
diff --git a/gnome2-libs/nautilus-cd-burner/INSTALL
b/gnome2-libs/nautilus-cd-burner/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/nautilus-cd-burner/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/nautilus-cd-burner/PRE_BUILD
b/gnome2-libs/nautilus-cd-burner/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/nautilus-cd-burner/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git
a/gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS

b/gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
deleted file mode 100755
index deb98f7..0000000
---
a/gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
+++ /dev/null
@@ -1,15 +0,0 @@
-#---------------------------------------------------------------------
-## Replaces sorcerys default_pre-remove with a custom version
-#---------------------------------------------------------------------
-function default_pre_remove() {
- debug "libapi" "$FUNCNAME - $*"
- real_default_pre_remove "$@"
- if [[ -f "${SCRIPT_DIRECTORY}/G_SCHEMAS" && -e "/usr/bin/gconftool-2"
]]; then
- local G_FILE
- export
GCONF_CONFIG_SOURCE="xml:readwrite:${INSTALL_ROOT}/etc/gconf/gconf.xml.defaults"
- for G_FILE in `cat ${SCRIPT_DIRECTORY}/G_SCHEMAS`
- do
- gconftool-2 --makefile-uninstall-rule
"${INSTALL_ROOT}/etc/gconf/schemas/${G_FILE}" > /dev/null || true
- done
- fi
-}
diff --git a/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
b/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
index 871ba35..4a0a628 100755
--- a/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
+++ b/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
@@ -1,14 +1 @@
-local OLD_SPELL_VERSION=""
-if spell_ok $SPELL; then
- OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
- message "This is a possibly incompatible update of libnautilus-burn..."
- message "Figuring out what spells need to be recast."
- for each in $(show_up_depends $SPELL 1); do
- if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libnautilus-burn.so.2"; then
- up_trigger $each cast_self
- fi
- done
- fi
-fi
+up_trigger nautilus-cd-burner dispel_self
diff --git
a/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig
b/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig
deleted file mode 100644
index 094c576..0000000
Binary files
a/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (fedaa6467e3742fc84df1c7542e5801dd23df871), Arwed von Merkatz, 04/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page