r21199 - in /packages/unstable/libgda4/debian: changelog control control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Aug 31 22:07:59 2009
New Revision: 21199

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21199
Log:
* Remove DM-Upload-Allowed field.
* debian/rules:
  - Don't install the trml python modules, they are optional
    and we should use the standalone packages in any case.

Modified:
    packages/unstable/libgda4/debian/changelog
    packages/unstable/libgda4/debian/control
    packages/unstable/libgda4/debian/control.in
    packages/unstable/libgda4/debian/rules

Modified: packages/unstable/libgda4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/changelog?rev=21199&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/changelog [utf-8] (original)
+++ packages/unstable/libgda4/debian/changelog [utf-8] Mon Aug 31 22:07:59 2009
@@ -1,4 +1,4 @@
-libgda4 (4.0.4-1) UNRELEASED; urgency=low
+libgda4 (4.0.4-1) unstable; urgency=low
 
   * New upstream release.
   * Bump libglib2.0-dev build dependency and remove libgnomevfs-dev,
@@ -6,10 +6,12 @@
   * debian/patches/01_manpage.patch:
     - Removed, fixed upstream.
   * Standards-Version is 3.8.3, no changes needed.
-
-  * DONT UPLOAD, GNOME #579458
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 31 Aug 2009 20:57:23 +0200
+  * Remove DM-Upload-Allowed field.
+  * debian/rules:
+    - Don't install the trml python modules, they are optional
+      and we should use the standalone packages in any case.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 01 Sep 2009 00:01:06 +0200
 
 libgda4 (4.0.2-1) unstable; urgency=low
 

Modified: packages/unstable/libgda4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/control?rev=21199&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/control [utf-8] (original)
+++ packages/unstable/libgda4/debian/control [utf-8] Mon Aug 31 22:07:59 2009
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
-DM-Upload-Allowed: yes
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libgda4/
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/libgda4/
 Build-Depends: cdbs (>= 0.4.41),

Modified: packages/unstable/libgda4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/control.in?rev=21199&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/control.in [utf-8] (original)
+++ packages/unstable/libgda4/debian/control.in [utf-8] Mon Aug 31 22:07:59 2009
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-DM-Upload-Allowed: yes
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libgda4/
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/libgda4/
 Build-Depends: cdbs (>= 0.4.41),

Modified: packages/unstable/libgda4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/rules?rev=21199&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/rules [utf-8] (original)
+++ packages/unstable/libgda4/debian/rules [utf-8] Mon Aug 31 22:07:59 2009
@@ -47,6 +47,10 @@
 	ln -s ../../javascript/jquery/jquery.js \
 		debian/libgda-4.0-common/usr/share/libgda-4.0/web/
 
+binary-install/libgda-4.0-bin::
+	# Remove gda_trml2{html,pdf} from /usr/bin, see GNOME #579458
+	rm -r debian/libgda-4.0-bin/usr/bin/gda_trml2*
+
 common-binary-post-install-arch::
 	for i in libgda-4.0-common libgda-4.0-bin libgda-4.0-dev libgda-4.0-$(SONAME)-dbg \
 	  libgda-4.0-mysql libgda-4.0-postgres libgda-4.0-sqlite; \