r23322 - in /packages/unstable/glabels/debian: changelog control control.in glabels-dev.links glabels-dev.postinst glabels-dev.preinst glabels.links glabels.postinst glabels.preinst rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Wed Mar 17 23:26:57 2010
New Revision: 23322

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23322
Log:
* debian/control.in,
  debian/rules:
  - Stop calling dh_buildinfo, nobody has ever looked at it.
* debian/glabels.postinst,
  debian/glabels-dev.postinst,
  debian/glabels.preinst,
  debian/glabels-dev.preinst,
  debian/glabels.links,
  debian/glabels-dev.links,
  debian/rules:
  - Stop symlinking the doc directories. Closes: #574305.

Added:
    packages/unstable/glabels/debian/glabels-dev.preinst
    packages/unstable/glabels/debian/glabels.preinst
Removed:
    packages/unstable/glabels/debian/glabels-dev.links
    packages/unstable/glabels/debian/glabels-dev.postinst
    packages/unstable/glabels/debian/glabels.postinst
Modified:
    packages/unstable/glabels/debian/changelog
    packages/unstable/glabels/debian/control
    packages/unstable/glabels/debian/control.in
    packages/unstable/glabels/debian/glabels.links
    packages/unstable/glabels/debian/rules

Modified: packages/unstable/glabels/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/glabels/debian/changelog?rev=23322&op=diff
==============================================================================
--- packages/unstable/glabels/debian/changelog [utf-8] (original)
+++ packages/unstable/glabels/debian/changelog [utf-8] Wed Mar 17 23:26:57 2010
@@ -1,3 +1,19 @@
+glabels (2.2.7-2) unstable; urgency=low
+
+  * debian/control.in,
+    debian/rules:
+    - Stop calling dh_buildinfo, nobody has ever looked at it.
+  * debian/glabels.postinst,
+    debian/glabels-dev.postinst,
+    debian/glabels.preinst,
+    debian/glabels-dev.preinst,
+    debian/glabels.links,
+    debian/glabels-dev.links,
+    debian/rules:
+    - Stop symlinking the doc directories. Closes: #574305.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 18 Mar 2010 00:26:34 +0100
+
 glabels (2.2.7-1) unstable; urgency=low
 
   * 2.2.7-1 New upstream release.

Modified: packages/unstable/glabels/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/glabels/debian/control?rev=23322&op=diff
==============================================================================
--- packages/unstable/glabels/debian/control [utf-8] (original)
+++ packages/unstable/glabels/debian/control [utf-8] Wed Mar 17 23:26:57 2010
@@ -10,7 +10,6 @@
 Build-Depends: autotools-dev,
                cdbs,
                debhelper (>= 5.0),
-               dh-buildinfo,
                intltool (>= 0.21),
                gnome-pkg-tools,
                gnome-doc-utils (>= 0.3.2),

Modified: packages/unstable/glabels/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/glabels/debian/control.in?rev=23322&op=diff
==============================================================================
--- packages/unstable/glabels/debian/control.in [utf-8] (original)
+++ packages/unstable/glabels/debian/control.in [utf-8] Wed Mar 17 23:26:57 2010
@@ -5,7 +5,6 @@
 Build-Depends: autotools-dev,
                cdbs,
                debhelper (>= 5.0),
-               dh-buildinfo,
                intltool (>= 0.21),
                gnome-pkg-tools,
                gnome-doc-utils (>= 0.3.2),

Added: packages/unstable/glabels/debian/glabels-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/glabels/debian/glabels-dev.preinst?rev=23322&op=file
==============================================================================
--- packages/unstable/glabels/debian/glabels-dev.preinst (added)
+++ packages/unstable/glabels/debian/glabels-dev.preinst [utf-8] Wed Mar 17 23:26:57 2010
@@ -1,0 +1,15 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl "2.2.7-2"
+then
+    # Remove fucking symlink
+    if [ -L /usr/share/doc/glabels-dev ]
+    then
+        rm /usr/share/doc/glabels-dev
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: packages/unstable/glabels/debian/glabels.links
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/glabels/debian/glabels.links?rev=23322&op=diff
==============================================================================
--- packages/unstable/glabels/debian/glabels.links [utf-8] (original)
+++ packages/unstable/glabels/debian/glabels.links [utf-8] Wed Mar 17 23:26:57 2010
@@ -1,2 +1,1 @@
-usr/share/doc/glabels-data	usr/share/doc/glabels
 usr/share/man/man1/glabels.1.gz	usr/share/man/man1/glabels-batch.1.gz

Added: packages/unstable/glabels/debian/glabels.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/glabels/debian/glabels.preinst?rev=23322&op=file
==============================================================================
--- packages/unstable/glabels/debian/glabels.preinst (added)
+++ packages/unstable/glabels/debian/glabels.preinst [utf-8] Wed Mar 17 23:26:57 2010
@@ -1,0 +1,15 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl "2.2.7-2"
+then
+    # Remove fucking symlink
+    if [ -L /usr/share/doc/glabels ]
+    then
+        rm /usr/share/doc/glabels
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: packages/unstable/glabels/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/glabels/debian/rules?rev=23322&op=diff
==============================================================================
--- packages/unstable/glabels/debian/rules [utf-8] (original)
+++ packages/unstable/glabels/debian/rules [utf-8] Wed Mar 17 23:26:57 2010
@@ -25,13 +25,3 @@
 
 # Debhelper arguments
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-
-# Disable redundant documentation copies
-DEB_INSTALL_DOCS_glabels := --no-act
-DEB_INSTALL_CHANGELOGS_glabels := --no-act
-DEB_INSTALL_DOCS_glabels-dev := --no-act
-DEB_INSTALL_CHANGELOGS_glabels-dev := --no-act
-
-# Record build-time version information
-binary-post-install/glabels-data::
-	dh_buildinfo -p glabels-data