r11597 - in packages/trunk/gamine/debian: . patches

[Gonéri Le Bouder]

Author: goneri
Date: 2011-01-02 17:19:38 +0000 (Sun, 02 Jan 2011)
New Revision: 11597

Removed:
   packages/trunk/gamine/debian/patches/no-gconftool.diff
Modified:
   packages/trunk/gamine/debian/changelog
   packages/trunk/gamine/debian/patches/series
Log:
remove no-gconftool.diff


Modified: packages/trunk/gamine/debian/changelog
===================================================================
--- packages/trunk/gamine/debian/changelog	2011-01-02 17:13:14 UTC (rev 11596)
+++ packages/trunk/gamine/debian/changelog	2011-01-02 17:19:38 UTC (rev 11597)
@@ -9,7 +9,6 @@
   * gamine-data depends on ${misc:Depends}
   * gamine has got a versionized dependency on gamine-data
     (= ${source:Version})
-  * add no-gconftool.diff and a quilt dependency
   * call dh_gconf, add postinst and prerm script
   * refresh debian/copyright
   * add a B-P on libgconf2-dev

Deleted: packages/trunk/gamine/debian/patches/no-gconftool.diff
===================================================================
--- packages/trunk/gamine/debian/patches/no-gconftool.diff	2011-01-02 17:13:14 UTC (rev 11596)
+++ packages/trunk/gamine/debian/patches/no-gconftool.diff	2011-01-02 17:19:38 UTC (rev 11597)
@@ -1,18 +0,0 @@
---- gamine-1.1.orig/Makefile
-+++ gamine-1.1/Makefile
-@@ -8,7 +8,6 @@
- icondir = $(datadir)/icons/hicolor/scalable/apps
- localedir = $(datadir)/locale
- 
--GCONFTOOL = /usr/bin/gconftool-2
- GCONF_SCHEMA_CONFIG_SOURCE = xml:merged:/etc/gconf/gconf.xml.defaults
- GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 0
-@@ -46,7 +45,6 @@
- 	install -m 644 README.pencil README.sounds README ChangeLog COPYING $(docdir)/
- 	install -m 644 gamine.schemas $(GCONF_SCHEMA_FILE_DIR)/
- 	install -m 644 locale/fr.mo $(localedir)/fr/LC_MESSAGES/gamine.mo
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
- 	install -m 644 gamine.desktop $(desktopdir)/
- 	install -m 644 gamine.svg $(icondir)/
- 

Modified: packages/trunk/gamine/debian/patches/series
===================================================================
--- packages/trunk/gamine/debian/patches/series	2011-01-02 17:13:14 UTC (rev 11596)
+++ packages/trunk/gamine/debian/patches/series	2011-01-02 17:19:38 UTC (rev 11597)
@@ -1,2 +1 @@
 makefile-DESTDIR.diff
-no-gconftool.diff