r45233 - in /packages/libgtkdatabox/trunk/debian: changelog libgtkdatabox-0.9.1-3-dev.links libgtkdatabox-0.9.1-3-glade.install libgtkdatabox-0.9.1-3-libglade.install rules

tille at users.alioth.debian.org tille at users.alioth.debian.org
Thu Jul 12 08:39:55 UTC 2012


Author: tille
Date: Thu Jul 12 08:39:54 2012
New Revision: 45233

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45233
Log:
implement some dh_install, dh_link calls directly in rules instead of helper files to reduce the number of cases where you need to change the package name due to version number changes

Removed:
    packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-3-dev.links
    packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-3-glade.install
    packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-3-libglade.install
Modified:
    packages/libgtkdatabox/trunk/debian/changelog
    packages/libgtkdatabox/trunk/debian/rules

Modified: packages/libgtkdatabox/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/changelog?rev=45233&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/changelog (original)
+++ packages/libgtkdatabox/trunk/debian/changelog Thu Jul 12 08:39:54 2012
@@ -17,6 +17,10 @@
      - enable building twice in a row by creating a copy of original
        docs/reference which differs drastically from the doc created
        in the build process
+     - implement some dh_install, dh_link calls directly in rules
+       instead of helper files to reduce the number of cases where
+       you need to change the package name due to version number
+       changes
 
  -- Andreas Tille <tille at debian.org>  Wed, 11 Jul 2012 15:02:19 +0200
 

Modified: packages/libgtkdatabox/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/rules?rev=45233&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/rules (original)
+++ packages/libgtkdatabox/trunk/debian/rules Thu Jul 12 08:39:54 2012
@@ -6,9 +6,10 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-pkg=$(shell grep -v -- "-dev" debian/control | sed -n 's/^Package: \+\([^-]\+\)-.*/\1/p' | head -n 1)
-devpkg=$(shell grep -- "-dev" debian/control | sed -n 's/^Package: //p' | head -n 1)
-
+pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+devpkg := $(shell grep -- "-dev" debian/control | sed -n 's/^Package: //p' | head -n 1)
+gladepkg := $(shell grep -- "-libglade" debian/control | sed -n 's/^Package: //p' | head -n 1)
+libglade := $(shell grep -- "-glade" debian/control | sed -n 's/^Package: //p' | head -n 1)
 ver  := $(shell dpkg-parsechangelog | grep '^Version:' | sed 's/^Version: [0-9]\+:\(.*\)/\1/')
 
 %:
@@ -30,20 +31,25 @@
 
 override_dh_install:
 	dh_install
-	# Call d-shlibmove to comply with library packaging guide
-	d-devlibdeps debian/$(devpkg).substvars \
-	             debian/tmp/usr/lib/*/$(pkg).so
-
 	# Do not use debian/$(devpkg).examples as debhelper input because
 	# you always have to adapt the file name when a new version pops up
 	mkdir -p debian/$(devpkg)/usr/share/doc/$(devpkg)/examples
 	cp -a examples/*.[ch] examples/*.glade debian/$(devpkg)/usr/share/doc/$(devpkg)/examples
 	cp -a debian/Makefile.testdatabox debian/$(devpkg)/usr/share/doc/$(devpkg)/examples/Makefile
+	# Same here for the other binary packages to avoid renaming
+	dh_install -p$(gladepkg) usr/share/glade3/catalogs/gtkdatabox.xml
+	dh_install -p$(gladepkg) usr/lib/glade3/modules/libgladedatabox.*
+	dh_install -p$(libglade) usr/lib/libglade/2.0/libdatabox.*
+
+	# Call d-shlibmove to comply with library packaging guide
+	d-devlibdeps debian/$(devpkg).substvars \
+	             debian/tmp/usr/lib/*/$(pkg).so
+
 
 	d-shlibmove --commit \
 		    --movedev "debian/tmp/usr/include" usr \
 		    --movedev "debian/tmp/usr/lib/*/pkgconfig" usr/share \
-		    --movedev "debian/tmp/usr/share/gtk-doc/html/gtkdatabox/*" usr/share/doc/libgtkdatabox-$(ver)-dev/html \
+		    --movedev "debian/tmp/usr/share/gtk-doc/html/gtkdatabox/*" usr/share/doc/$(devpkg)/html \
 		    debian/tmp/usr/lib/*/$(pkg).so
 	rm `find debian -name '*.la'`
 
@@ -57,5 +63,9 @@
 	    mv docs/reference.orig docs/reference ; \
 	fi
 
+override_dh_link:
+	dh_link
+	dh_link -p$(devpkg) usr/share/doc/$(devpkg)/html usr/share/gtk-doc/html/gtkdatabox
+
 get-orig-source:
 	uscan --verbose --force-download




More information about the debian-science-commits mailing list