Package: magicdev Version: 1.1.6-2 Severity: normal Tags: patch Hi,
Attached is the diff for my magicdev 1.1.6-2.1 NMU. -- Julien Danjou // <[EMAIL PROTECTED]> http://julien.danjou.info // 9A0D 5FD9 EB42 22F6 8974 C95C A462 B51E C2FE E5CD // And thinking so much differently.
diff -u magicdev-1.1.6/debian/changelog magicdev-1.1.6/debian/changelog
--- magicdev-1.1.6/debian/changelog
+++ magicdev-1.1.6/debian/changelog
@@ -1,3 +1,11 @@
+magicdev (1.1.6-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Move gconf schema (Closes: #340516)
+ * Update FSF address
+
+ -- Julien Danjou <[EMAIL PROTECTED]> Fri, 2 Jun 2006 12:16:35 +0200
+
magicdev (1.1.6-2) unstable; urgency=low
* Rebuild in unstable and not experimental...duh! (Closes: #241868)
diff -u magicdev-1.1.6/debian/control magicdev-1.1.6/debian/control
--- magicdev-1.1.6/debian/control
+++ magicdev-1.1.6/debian/control
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Sean Harshbarger <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: cdbs (>= 0.4.21), libgnomeui-dev, libglade2-dev, debhelper (>=
4.2.7), libxml-parser-perl
+Build-Depends: cdbs (>= 0.4.21), libgnomeui-dev, libglade2-dev, debhelper (>=
4.2.13), libxml-parser-perl
Package: magicdev
Architecture: any
-Depends: ${shlibs:Depends}, gnome-mime-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-mime-data
Recommends: gnome-media, nautilus, nautilus-cd-burner, totem
Description: A GNOME daemon for automatically mounting/playing CDs
Magicdev is a daemon that runs within the GNOME environment and
reverted:
--- magicdev-1.1.6/debian/magicdev.postinst
+++ magicdev-1.1.6.orig/debian/magicdev.postinst
@@ -1,16 +0,0 @@
-#! /bin/sh
-# -*- coding: utf-8 -*-
-# Post-installation script for rhythmbox
-# Copyright © 2002,2003 Colin Walters <[EMAIL PROTECTED]>
-# Borrowed by Sean Harshbarger <[EMAIL PROTECTED]> for magicdev
-
-set -e
-
-if [ "$1" = configure ]; then
- HOME=/root GCONF_CONFIG_SOURCE=xml::/etc/gconf/gconf.xml.defaults
/usr/bin/gconftool-2 --makefile-install-rule
/etc/gconf/schemas/magicdev.schemas > /dev/null
-fi
-
-#DEBHELPER#
-
-exit 0
-
diff -u magicdev-1.1.6/debian/copyright magicdev-1.1.6/debian/copyright
--- magicdev-1.1.6/debian/copyright
+++ magicdev-1.1.6/debian/copyright
@@ -19,8 +19,7 @@
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
only in patch2:
unchanged:
--- magicdev-1.1.6.orig/Makefile.in
+++ magicdev-1.1.6/Makefile.in
@@ -110,21 +110,18 @@
bin_PROGRAMS = magicdev gnome-cd-properties
-pkgdata_DATA = \
- cd-capplet.glade
+pkgdata_DATA = cd-capplet.glade
-schemadir = $(sysconfdir)/gconf/schemas
+schemadir = $(datadir)/gconf/schemas
schema_DATA = magicdev.schemas
-magicdev_SOURCES = \
- daemon.c
+magicdev_SOURCES = daemon.c
magicdev_LDADD = $(MAGICDEV_LIBS)
-gnome_cd_properties_SOURCES = \
- capplet.c
+gnome_cd_properties_SOURCES = capplet.c
gnome_cd_properties_LDADD = $(CAPPLET_LIBS)
@@ -133,22 +130,10 @@
Capplet_in_files = gnome-cd-properties.desktop.in
Capplet_DATA = $(Capplet_in_files:.desktop.in=.desktop)
-INCLUDES = \
- $(CAPPLET_CFLAGS) \
- -DBINDIR=\"$(bindir)\" \
- -DMAGICDEVDIR=\"$(pkgdatadir)\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DDATADIR=\"$(datadir)\"
-
-
-EXTRA_DIST = \
- magicdev.spec \
- $(Capplet_in_files) \
- $(pkgdata_DATA) \
- $(schema_DATA) \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in
+INCLUDES = $(CAPPLET_CFLAGS)
-DBINDIR=\"$(bindir)\" -DMAGICDEVDIR=\"$(pkgdatadir)\"
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-DDATADIR=\"$(datadir)\"
+
+
+EXTRA_DIST = magicdev.spec $(Capplet_in_files)
$(pkgdata_DATA) $(schema_DATA)
intltool-extract.in intltool-merge.in
intltool-update.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -181,7 +166,7 @@
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
SOURCES = $(magicdev_SOURCES) $(gnome_cd_properties_SOURCES)
OBJECTS = $(magicdev_OBJECTS) $(gnome_cd_properties_OBJECTS)
@@ -355,7 +340,7 @@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -375,7 +360,7 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
@@ -421,7 +406,7 @@
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique
$(LISP) -o $$here/TAGS)
+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags
config.h.in $$unique $(LISP))
mostlyclean-tags:
@@ -490,9 +475,6 @@
|| exit 1; \
fi; \
done
-capplet.o: capplet.c config.h
-daemon.o: daemon.c config.h
-
info-am:
info: info-recursive
dvi-am:
only in patch2:
unchanged:
--- magicdev-1.1.6.orig/Makefile.am
+++ magicdev-1.1.6/Makefile.am
@@ -6,7 +6,7 @@
cd-capplet.glade
-schemadir = $(sysconfdir)/gconf/schemas
+schemadir = $(datadir)/gconf/schemas
schema_DATA = magicdev.schemas
magicdev_SOURCES = \
only in patch2:
unchanged:
--- magicdev-1.1.6.orig/debian/compat
+++ magicdev-1.1.6/debian/compat
@@ -0,0 +1 @@
+4
only in patch2:
unchanged:
--- magicdev-1.1.6.orig/gnome-cd-properties.desktop
+++ magicdev-1.1.6/gnome-cd-properties.desktop
@@ -0,0 +1,39 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=CD and DVD
+Name[ca]=CD i DVD
+Name[cs]=CD a DVD
+Name[da]=Cd og dvd
+Name[de]=CDs und DVDs
+Name[fr]=CD et DVD
+Name[hu]=CD és DVD
+Name[nl]=CD en DVD
+Name[pt]=CD e DVD
+Name[sq]=CD dhe DVD
+Name[sr]=ЦД и ДВД
[EMAIL PROTECTED] i DVD
+Comment=Configure handling of CD and DVD devices
+Comment[bn]=সিডি এবং ডিভিডি কিভাবে চালানো হবে তা স্থির করুন
+Comment[ca]=Configura la gestió dels dispositius de CD i DVD
+Comment[cs]=Nastavit obsluhu zařízení CD a DVD
+Comment[da]=Konfigurér håndteringen af cd- og dvd-enheder
+Comment[de]=Die Behandlung von CD-Geräten konfigurieren
+Comment[el]=Ρυθμίσεις χειρισμού συσκευών CD και DVD
+Comment[es]=Configura el manejo de dispositivos CD y DVD
+Comment[hu]=CD- és DVD-eszközök kezelésének beállítása
+Comment[id]=Atur penggunaan perangkat CD
+Comment[ja]=CD/DVD デバイスの動作設定
+Comment[nl]=Gedrag van CD- en DVD-apparaten instellen
+Comment[pt]=Configurar gestão de dispositivos CD e DVD
+Comment[sq]=Konfiguro manazhimin e dispozitivëve CD dhe DVD
+Comment[sr]=Подесите руковање ЦД и ДВД уређајима
[EMAIL PROTECTED] rukovanje CD i DVD uređajima
+Icon=gnome-dev-cdrom
+Exec=gnome-cd-properties
+Terminal=false
+Type=Application
+Categories=Application;Settings;X-Red-Hat-Base;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=magicdev
+X-GNOME-Bugzilla-Component=general
signature.asc
Description: Digital signature
