r13805 - in /desktop/unstable/gnome-mag/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Dec 10 12:51:20 2007
New Revision: 13805

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13805
Log:
* Move gnome-mag to the end of the control file and extra libgnome-mag2
  package name from the first Package: line in the control file.

Modified:
    desktop/unstable/gnome-mag/debian/changelog
    desktop/unstable/gnome-mag/debian/control
    desktop/unstable/gnome-mag/debian/control.in
    desktop/unstable/gnome-mag/debian/rules

Modified: desktop/unstable/gnome-mag/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-mag/debian/changelog?rev=13805&op=diff
==============================================================================
--- desktop/unstable/gnome-mag/debian/changelog (original)
+++ desktop/unstable/gnome-mag/debian/changelog Mon Dec 10 12:51:20 2007
@@ -2,8 +2,10 @@
 
   * Don't hardcode the Python version.
   * Don't override GCONF dir; rely on dh_gconf instead.
-
- -- Loic Minier <lool at dooz.org>  Mon, 10 Dec 2007 13:44:26 +0100
+  * Move gnome-mag to the end of the control file and extra libgnome-mag2
+    package name from the first Package: line in the control file.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 10 Dec 2007 13:51:06 +0100
 
 gnome-mag (1:0.14.10-3) unstable; urgency=low
 

Modified: desktop/unstable/gnome-mag/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-mag/debian/control?rev=13805&op=diff
==============================================================================
--- desktop/unstable/gnome-mag/debian/control (original)
+++ desktop/unstable/gnome-mag/debian/control Mon Dec 10 12:51:20 2007
@@ -33,16 +33,6 @@
                libcolorblind-dev
 Standards-Version: 3.7.2
 
-Package: gnome-mag
-Section: x11
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: a screen magnifier for the GNOME desktop
- This package includes a screen magnifier, which allows you to zoom in
- on portions of the desktop.  It is expressly designed for users with
- low vision who wish to use the GNOME desktop.
-
 Package: libgnome-mag2
 Section: libs
 Architecture: any
@@ -67,3 +57,14 @@
  controlling a screen magnifier.
  .
  This package provides the development headers.
+
+Package: gnome-mag
+Section: x11
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: a screen magnifier for the GNOME desktop
+ This package includes a screen magnifier, which allows you to zoom in
+ on portions of the desktop.  It is expressly designed for users with
+ low vision who wish to use the GNOME desktop.
+

Modified: desktop/unstable/gnome-mag/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-mag/debian/control.in?rev=13805&op=diff
==============================================================================
--- desktop/unstable/gnome-mag/debian/control.in (original)
+++ desktop/unstable/gnome-mag/debian/control.in Mon Dec 10 12:51:20 2007
@@ -33,16 +33,6 @@
                libcolorblind-dev
 Standards-Version: 3.7.2
 
-Package: gnome-mag
-Section: x11
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: a screen magnifier for the GNOME desktop
- This package includes a screen magnifier, which allows you to zoom in
- on portions of the desktop.  It is expressly designed for users with
- low vision who wish to use the GNOME desktop.
-
 Package: libgnome-mag2
 Section: libs
 Architecture: any
@@ -67,3 +57,14 @@
  controlling a screen magnifier.
  .
  This package provides the development headers.
+
+Package: gnome-mag
+Section: x11
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: a screen magnifier for the GNOME desktop
+ This package includes a screen magnifier, which allows you to zoom in
+ on portions of the desktop.  It is expressly designed for users with
+ low vision who wish to use the GNOME desktop.
+

Modified: desktop/unstable/gnome-mag/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-mag/debian/rules?rev=13805&op=diff
==============================================================================
--- desktop/unstable/gnome-mag/debian/rules (original)
+++ desktop/unstable/gnome-mag/debian/rules Mon Dec 10 12:51:20 2007
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters at verbum.org>
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -10,11 +8,13 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# This ensures the gnome-mag package is built after libgnome-mag2
-binary-gnome-mag :: binary-libgnome-mag2
+libgnome-magN := $(shell sed -n 's/Package:[[:space:]]*\(libgnome-mag[1-9]\)[[:space:]]*$$/\1/p' debian/control)
 
-DEB_DH_MAKESHLIBS_ARGS_libgnome-mag2 += -V 'libgnome-mag2 (>= 1:0.14.0)'
+# This ensures the gnome-mag package is built after libgnome-mag
+binary-gnome-mag :: binary-$(libgnome-magN)
 
-DEB_SHLIBDEPS_LIBRARY_gnome-mag := libgnome-mag2
-DEB_SHLIBDEPS_INCLUDE_gnome-mag += debian/libgnome-mag2/usr/lib/
+DEB_DH_MAKESHLIBS_ARGS_libgnome-mag2 += -V '$(libgnome-magN) (>= 1:0.14.0)'
 
+DEB_SHLIBDEPS_LIBRARY_gnome-mag := $(libgnome-magN)
+DEB_SHLIBDEPS_INCLUDE_gnome-mag += debian/$(libgnome-magN)/usr/lib/
+