r11012 - in /packages/unstable/libgnomedb/debian: changelog patches/001_menu_icon.patch rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed May 16 14:08:59 2007
New Revision: 11012

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11012
Log:
* Remove control-center/database-properties.desktop.in in clean:: instead of
  using the patch 001_menu_icon to remove the file; fixes FTBFS on double
  build; closes: #424515.

Modified:
    packages/unstable/libgnomedb/debian/changelog
    packages/unstable/libgnomedb/debian/patches/001_menu_icon.patch
    packages/unstable/libgnomedb/debian/rules

Modified: packages/unstable/libgnomedb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomedb/debian/changelog?rev=11012&op=diff
==============================================================================
--- packages/unstable/libgnomedb/debian/changelog (original)
+++ packages/unstable/libgnomedb/debian/changelog Wed May 16 14:08:59 2007
@@ -1,4 +1,4 @@
-libgnomedb (1.2.2-4) UNRELEASED; urgency=low
+libgnomedb (1.2.2-4) unstable; urgency=low
 
   * Fix typo in package description; thanks Julian Gilbey; closes: #392050.
   * Add a get-orig-source target to retrieve the upstream tarball.
@@ -12,8 +12,11 @@
   * Fix description of dbg package.
   * Use http://ftp.gnome.org/pub/GNOME/sources/libgnomedb in copyright.
   * Use HTTP in watch file.
-
- -- Loic Minier <lool at dooz.org>  Mon, 30 Apr 2007 12:05:45 +0200
+  * Remove control-center/database-properties.desktop.in in clean:: instead of
+    using the patch 001_menu_icon to remove the file; fixes FTBFS on double
+    build; closes: #424515.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 16 May 2007 16:07:56 +0200
 
 libgnomedb (1.2.2-3) unstable; urgency=low
 

Modified: packages/unstable/libgnomedb/debian/patches/001_menu_icon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomedb/debian/patches/001_menu_icon.patch?rev=11012&op=diff
==============================================================================
--- packages/unstable/libgnomedb/debian/patches/001_menu_icon.patch (original)
+++ packages/unstable/libgnomedb/debian/patches/001_menu_icon.patch Wed May 16 14:08:59 2007
@@ -9,19 +9,6 @@
  stamp.h
  ])
  
-diff -urN libgnomedb-1.2.2.orig/control-center/database-properties.desktop.in libgnomedb-1.2.2/control-center/database-properties.desktop.in
---- libgnomedb-1.2.2.orig/control-center/database-properties.desktop.in	2005-10-23 16:10:45.000000000 -0200
-+++ libgnomedb-1.2.2/control-center/database-properties.desktop.in	1969-12-31 21:00:00.000000000 -0300
-@@ -1,9 +0,0 @@
--[Desktop Entry]
--_Name=Database Access Properties 
--_Comment=Configure your database environment
--Icon=libgnomedb/gnome-db.png
--Exec=gnome-database-properties
--Terminal=0
--Type=Application
--Categories=Application;Settings;AdvancedSettings;
--StartupNotify=true
 diff -urN libgnomedb-1.2.2.orig/control-center/database-properties.desktop.in.in libgnomedb-1.2.2/control-center/database-properties.desktop.in.in
 --- libgnomedb-1.2.2.orig/control-center/database-properties.desktop.in.in	1969-12-31 21:00:00.000000000 -0300
 +++ libgnomedb-1.2.2/control-center/database-properties.desktop.in.in	2005-10-29 13:28:27.000000000 -0200

Modified: packages/unstable/libgnomedb/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomedb/debian/rules?rev=11012&op=diff
==============================================================================
--- packages/unstable/libgnomedb/debian/rules (original)
+++ packages/unstable/libgnomedb/debian/rules Wed May 16 14:08:59 2007
@@ -20,6 +20,11 @@
 DEB_DH_STRIP_ARGS += --dbg-package=$(DBG_PKG)
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+# see debian/patches/001_menu_icon.patch: Show a icon in GNOME preferences menu
+#Â (closes: #314781)
+clean::
+	rm -f control-center/database-properties.desktop.in
 
 clean::
 	sed -e 's#@SONAME@#$(SONAME)#g' \