r21148 - in /packages/unstable/mergeant/debian: changelog control mergeant-doc.install mergeant.dirs mergeant.install rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Aug 30 10:46:14 2009
New Revision: 21148

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21148
Log:
* debian/rules, debian/mergeant.install, debian/mergeant-doc.install:
  - Install mergeant.xpm from mergeant.install.
* debian/mergeant.dirs:
  - Removed, not needed.

Removed:
    packages/unstable/mergeant/debian/mergeant.dirs
Modified:
    packages/unstable/mergeant/debian/changelog
    packages/unstable/mergeant/debian/control
    packages/unstable/mergeant/debian/mergeant-doc.install
    packages/unstable/mergeant/debian/mergeant.install
    packages/unstable/mergeant/debian/rules

Modified: packages/unstable/mergeant/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mergeant/debian/changelog?rev=21148&op=diff
==============================================================================
--- packages/unstable/mergeant/debian/changelog [utf-8] (original)
+++ packages/unstable/mergeant/debian/changelog [utf-8] Sun Aug 30 10:46:14 2009
@@ -1,4 +1,4 @@
-mergeant (0.67-4) UNRELEASED; urgency=low
+mergeant (0.67-4) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Stop mentioning GNOME 2.
@@ -13,8 +13,12 @@
   * debian/mergeant.menu:
     - Section is Applications/Data Management.
   * debian/copyright: Update, add copyright holders.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 30 Aug 2009 11:24:33 +0200
+  * debian/rules, debian/mergeant.install, debian/mergeant-doc.install:
+    - Install mergeant.xpm from mergeant.install.
+  * debian/mergeant.dirs:
+    - Removed, not needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 30 Aug 2009 12:13:32 +0200
 
 mergeant (0.67-3) unstable; urgency=low
 

Modified: packages/unstable/mergeant/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mergeant/debian/control?rev=21148&op=diff
==============================================================================
--- packages/unstable/mergeant/debian/control [utf-8] (original)
+++ packages/unstable/mergeant/debian/control [utf-8] Sun Aug 30 10:46:14 2009
@@ -16,7 +16,7 @@
                libxml-parser-perl
 Build-Depends-Indep: docbook-utils,
                      scrollkeeper
-Standards-Version: 3.7.2
+Standards-Version: 3.8.3
 Homepage: http://www.gnome-db.org/
 
 Package: mergeant

Modified: packages/unstable/mergeant/debian/mergeant-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mergeant/debian/mergeant-doc.install?rev=21148&op=diff
==============================================================================
--- packages/unstable/mergeant/debian/mergeant-doc.install [utf-8] (original)
+++ packages/unstable/mergeant/debian/mergeant-doc.install [utf-8] Sun Aug 30 10:46:14 2009
@@ -1,2 +1,2 @@
-usr/share/omf
-usr/share/gnome/help
+debian/tmp/usr/share/omf
+debian/tmp/usr/share/gnome/help

Modified: packages/unstable/mergeant/debian/mergeant.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mergeant/debian/mergeant.install?rev=21148&op=diff
==============================================================================
--- packages/unstable/mergeant/debian/mergeant.install [utf-8] (original)
+++ packages/unstable/mergeant/debian/mergeant.install [utf-8] Sun Aug 30 10:46:14 2009
@@ -1,7 +1,9 @@
-usr/bin
-usr/lib/bonobo
-usr/share/locale
-usr/share/pixmaps
-usr/share/applications
-usr/share/icons
-usr/share/mime
+debian/tmp/usr/bin
+debian/tmp/usr/lib/bonobo
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/pixmaps
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/mime
+
+debian/mergeant.xpm usr/share/pixmaps

Modified: packages/unstable/mergeant/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mergeant/debian/rules?rev=21148&op=diff
==============================================================================
--- packages/unstable/mergeant/debian/rules [utf-8] (original)
+++ packages/unstable/mergeant/debian/rules [utf-8] Sun Aug 30 10:46:14 2009
@@ -7,10 +7,4 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-binreloc --disable-update-mimedb
-
-binary-install/mergeant::
-	install -m 644 debian/mergeant.xpm debian/mergeant/usr/share/pixmaps
-
-.PHONY: binary-install/mergeant