r21369 - in /desktop/experimental/devhelp/debian: changelog devhelp.preinst rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Fri Sep 18 17:47:04 2009
New Revision: 21369

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21369
Log:
* debian/devhelp.preinst: Removed, oldstable has a greater version than
  0.6.0.
* debian/rules:
  - Stop symlinking devhelp-bin.1 to devhelp.1, there's not a devhelp-bin
    binary anymore.
  - rm -f ignores non-existent files, no need to tell make to ignore errors.
  - Stop creating a debian/shlibs.local file to have stricter dependencies,
    the dependencies are fine without it and it was added to workaround
    another bug.

Removed:
    desktop/experimental/devhelp/debian/devhelp.preinst
Modified:
    desktop/experimental/devhelp/debian/changelog
    desktop/experimental/devhelp/debian/rules

Modified: desktop/experimental/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/changelog?rev=21369&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/changelog [utf-8] (original)
+++ desktop/experimental/devhelp/debian/changelog [utf-8] Fri Sep 18 17:47:04 2009
@@ -1,11 +1,11 @@
-devhelp (2.27.92-1) experimental; urgency=low
-  
+devhelp (2.27.92-1) UNRELEASED; urgency=low
+
   [ Emilio Pozuelo Monfort ]
   * debian/devhelp.postrm: Removed, it only rmdirs the /etc directories
     on purge, but that was to workaround a bug in dpkg. See e.g. #198128.
   * Standards-Version is 3.8.3, no changes needed.
   * debian/control.in: Remove old Conflicts/Replaces no longer needed.
-  
+
   [ Andrea Veri ]
   * New upstream release. Devhelp gonna use a completely new
     versioning to follow GNOME's way.
@@ -41,6 +41,17 @@
     - added missing copyright holders.
     - added missing LGPL header.
 
+  [ Emilio Pozuelo Monfort ]
+  * debian/devhelp.preinst: Removed, oldstable has a greater version than
+    0.6.0.
+  * debian/rules:
+    - Stop symlinking devhelp-bin.1 to devhelp.1, there's not a devhelp-bin
+      binary anymore.
+    - rm -f ignores non-existent files, no need to tell make to ignore errors.
+    - Stop creating a debian/shlibs.local file to have stricter dependencies,
+      the dependencies are fine without it and it was added to workaround
+      another bug.
+
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 27 Aug 2009 11:56:08 +0200
 
 devhelp (0.23.1-1) unstable; urgency=low

Modified: desktop/experimental/devhelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/rules?rev=21369&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/rules [utf-8] (original)
+++ desktop/experimental/devhelp/debian/rules [utf-8] Fri Sep 18 17:47:04 2009
@@ -18,23 +18,13 @@
 	misc/man2xml.py
 
 clean::
-	-rm -f debian/devhelp.emacsen-startup
-	-rm -f src/dh-marshal.h
-	-rm -f debian/shlibs.local
+	rm -f debian/devhelp.emacsen-startup
+	rm -f src/dh-marshal.h
 
 binary-install/devhelp-common::
 	dh_pysupport -p$(cdbs_curpkg) /usr/lib/gedit-2/plugins/devhelp
 
-# this creates a debian/shlibs.local forcing very strict interdependencies
-binary-post-install/$(libdevhelp-1-N)::
-	dh_makeshlibs -p$(cdbs_curpkg) -n \
-		-V "$(libdevhelp-1-N) (= $(DEB_VERSION))"
-	mv debian/$(cdbs_curpkg)/DEBIAN/shlibs \
-		debian/shlibs.local
-
 binary-post-install/devhelp::
-	dh_link -pdevhelp usr/share/man/man1/devhelp.1.gz \
-		usr/share/man/man1/devhelp-bin.1.gz
 	install -d `pwd`/debian/devhelp/usr/share/pixmaps/
 	install -m 644 debian/devhelp-debian.xpm \
 		`pwd`/debian/devhelp/usr/share/pixmaps/