summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2010-04-06 21:28:16 +0200
committerArwed von Merkatz2010-04-07 18:02:44 +0200
commit7c2028ac26773339a249996f82cd9ad0da3d97ce (patch)
tree0e0c978ace46bc807d5de405ab3f42cb00e199fb
parentf3252cdada18a5d21b872ca5215b4d668bffd4c8 (diff)
nautilus-cd-burner: deprecated for brasero
(cherry picked from commit fedaa6467e3742fc84df1c7542e5801dd23df871)
-rwxr-xr-xdisk/brasero/CONFLICTS1
-rw-r--r--disk/brasero/HISTORY3
-rwxr-xr-xgnome2-libs/nautilus-cd-burner/BUILD5
-rwxr-xr-xgnome2-libs/nautilus-cd-burner/DEPENDS17
-rwxr-xr-xgnome2-libs/nautilus-cd-burner/DETAILS9
-rw-r--r--gnome2-libs/nautilus-cd-burner/G_SCHEMAS1
-rw-r--r--gnome2-libs/nautilus-cd-burner/HISTORY3
-rwxr-xr-xgnome2-libs/nautilus-cd-burner/INSTALL1
-rwxr-xr-xgnome2-libs/nautilus-cd-burner/PRE_BUILD1
-rwxr-xr-xgnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS15
-rwxr-xr-xgnome2-libs/nautilus-cd-burner/UP_TRIGGERS15
-rw-r--r--gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sigbin543 -> 0 bytes
12 files changed, 17 insertions, 54 deletions
diff --git a/disk/brasero/CONFLICTS b/disk/brasero/CONFLICTS
new file mode 100755
index 0000000000..d3872001f9
--- /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 0f22e462ef..15b50ab279 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * CONFLICTS: added conflict nautilus-cd-burner for deprecation
+
2010-03-30 Vasil Yonkov <spirtbrat@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 8ab6bc814d..27ba77ddaf 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 527ba42c44..66a38ffc3f 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 1f9e212f13..85f8ee016c 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 4268b724d8..0000000000
--- 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 0a53d60fe4..1a286ed78f 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@gmx.net>
+ * all: deprecated in favor of brasero
+
2008-10-03 Robin Cook <rcook@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 0000000000..27ba77ddaf
--- /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 0000000000..27ba77ddaf
--- /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 deb98f76bd..0000000000
--- 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 871ba35f45..4a0a62846e 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 094c57693e..0000000000
--- a/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig
+++ /dev/null
Binary files differ