r52160 - in /desktop/experimental/glib2.0/debian: changelog control.in rules
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Fri Mar 3 23:39:26 UTC 2017
Author: smcv
Date: Fri Mar 3 23:39:26 2017
New Revision: 52160
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52160
Log:
Remove indirection via $(SHARED_PKG), etc. variables
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/control.in
desktop/experimental/glib2.0/debian/rules
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=52160&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Mar 3 23:39:26 2017
@@ -29,6 +29,7 @@
* Build with dh instead of cdbs
* Install some missing files detected by dh_install --list-missing
* Move to debhelper compat level 10
+ * Remove indirection via $(SHARED_PKG), etc. variables
-- Simon McVittie <smcv at debian.org> Thu, 02 Mar 2017 09:15:48 +0000
Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=52160&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Fri Mar 3 23:39:26 2017
@@ -1,4 +1,4 @@
-Source: glib at APIVER@
+Source: glib2.0
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
@@ -37,11 +37,11 @@
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/glib2.0/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/glib2.0/
-Package: @SHARED_PKG@
+Package: libglib2.0-0
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Recommends: @DATA_PKG@,
+Recommends: libglib2.0-data,
shared-mime-info,
xdg-user-dirs
Breaks: glib-networking (<< 2.33.12),
@@ -56,7 +56,7 @@
.
This package contains the shared libraries.
-Package: libglib at APIVER@-tests
+Package: libglib2.0-tests
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
@@ -70,7 +70,7 @@
This package contains test programs, designed to be run as part of a
regression testsuite.
-Package: libglib at APIVER@-udeb
+Package: libglib2.0-udeb
Section: debian-installer
Package-Type: udeb
Architecture: any
@@ -86,14 +86,14 @@
This package contains the minimal runtime library needed by the Debian
installer.
-Package: @BIN_PKG@
+Package: libglib2.0-bin
Section: misc
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
- @SHARED_PKG@ (= ${binary:Version}),
- @DATA_PKG@
+ libglib2.0-0 (= ${binary:Version}),
+ libglib2.0-data
Multi-Arch: foreign
Description: Programs for the GLib library
GLib is a library containing many useful C routines for things such
@@ -103,32 +103,32 @@
This package contains the program files which is used for the libraries
and others.
-Package: @DEV_PKG@
+Package: libglib2.0-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
${python3:Depends},
- @SHARED_PKG@ (= ${binary:Version}),
- @BIN_PKG@ (= ${binary:Version}),
- @DEVBIN_PKG@ (= ${binary:Version}),
+ libglib2.0-0 (= ${binary:Version}),
+ libglib2.0-bin (= ${binary:Version}),
+ libglib2.0-dev-bin (= ${binary:Version}),
libpcre3-dev (>= 1:8.31),
pkg-config,
zlib1g-dev
Breaks: libglib2.0-0-dbg (<< 2.51.4-1~)
Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
-Suggests: @DOC_PKG@
+Suggests: libglib2.0-doc
Description: Development files for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
C library used by projects such as GTK+, GIMP, and GNOME.
.
- This package is needed to compile programs against @SHARED_PKG@,
+ This package is needed to compile programs against libglib2.0-0,
as only it includes the header files and static libraries (optionally)
needed for compiling.
-Package: @DEVBIN_PKG@
+Package: libglib2.0-dev-bin
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
@@ -146,7 +146,7 @@
development utilities typically run during compilation and should not be
installed directly. Use libglib2.0-dev instead.
-Package: @DATA_PKG@
+Package: libglib2.0-data
Architecture: all
Depends: ${misc:Depends}
Multi-Arch: foreign
@@ -158,7 +158,7 @@
This package is needed for the runtime libraries to display messages in
languages other than English.
-Package: @DOC_PKG@
+Package: libglib2.0-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
@@ -170,7 +170,7 @@
C library used by projects such as GTK+, GIMP, and GNOME.
.
This package contains the HTML documentation for the GLib library
- in /usr/share/doc/@DOC_PKG@/ .
+ in /usr/share/doc/libglib2.0-doc/ .
Package: libgio-fam
Architecture: hurd-any kfreebsd-any
Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=52160&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Fri Mar 3 23:39:26 2017
@@ -18,19 +18,6 @@
# Make the linker work a bit harder so dynamic loading can be done faster
LDFLAGS += -Wl,-O1
-
-APIVER := 2.0
-SONAME := 0
-
-# package names
-SHARED_PKG := libglib$(APIVER)-$(SONAME)
-DATA_PKG := libglib$(APIVER)-data
-TEST_PKG := libglib$(APIVER)-tests
-DEV_PKG := libglib$(APIVER)-dev
-DEVBIN_PKG := libglib$(APIVER)-dev-bin
-BIN_PKG := libglib$(APIVER)-bin
-UDEB_PKG := libglib$(APIVER)-udeb
-DOC_PKG := libglib$(APIVER)-doc
%:
dh $@ --with gnome,python3
@@ -53,7 +40,7 @@
dh_clean -Xorg.gtk.test.gschema.xml.orig
override_dh_makeshlibs:
- dh_makeshlibs -V --add-udeb=$(UDEB_PKG) -- -c4
+ dh_makeshlibs -V --add-udeb=libglib2.0-udeb -- -c4
override_dh_strip:
dh_strip --dbgsym-migration='libglib2.0-0-dbg (<< 2.51.4-1~)'
@@ -98,7 +85,7 @@
# configure flags
DEB_CONFIGURE_EXTRA_FLAGS := \
- --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
+ --with-html-dir=\$${prefix}/share/doc/libglib2.0-doc \
--libexecdir=\$${prefix}/lib/glib2.0 \
--with-python=/usr/bin/python3 \
--with-pcre=system
@@ -139,11 +126,11 @@
set -e; for script in postinst postrm triggers; do \
sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
-e"s/#ARCH#/$(DEB_HOST_ARCH)/g" \
- debian/$(SHARED_PKG).$$script.in \
- > debian/$(SHARED_PKG).$$script ; \
+ debian/libglib2.0-0.$$script.in \
+ > debian/libglib2.0-0.$$script ; \
done
- dh_auto_install -p$(TEST_PKG) --sourcedir=debian/build/deb -X.la
- dh_auto_install -p$(UDEB_PKG) --builddirectory=debian/build/udeb --destdir=debian/install/udeb
+ dh_auto_install -plibglib2.0-tests --sourcedir=debian/build/deb -X.la
+ dh_auto_install -plibglib2.0-udeb --builddirectory=debian/build/udeb --destdir=debian/install/udeb
dh_auto_install --remaining-packages --builddirectory=debian/build/deb --destdir=debian/install/deb
override_dh_python3:
@@ -155,16 +142,6 @@
clean:
sed \
- -e "s#@SONAME@#$(SONAME)#g" \
- -e "s#@APIVER@#$(APIVER)#g" \
- -e "s#@VERSION@#$(DEB_UPSTREAM_VERSION)#g" \
- -e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
- -e "s#@BIN_PKG@#$(BIN_PKG)#g" \
- -e "s#@DATA_PKG@#$(DATA_PKG)#g" \
- -e "s#@DEV_PKG@#$(DEV_PKG)#g" \
- -e "s#@DEVBIN_PKG@#$(DEVBIN_PKG)#g" \
- -e "s#@UDEB_PKG@#$(UDEB_PKG)#g" \
- -e "s#@DOC_PKG@#$(DOC_PKG)#g" \
-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
debian/control.in > debian/control
rm -rf $(CURDIR)/debian/build \
@@ -191,5 +168,5 @@
rm -fr debian/install/udeb/usr/share/glib-2.0/gdb
rm -fr debian/install/udeb/usr/share/glib-2.0/valgrind
rm -fr debian/install/udeb/usr/share/man
- dh_install -p$(UDEB_PKG) --sourcedir=debian/install/udeb --list-missing
+ dh_install -plibglib2.0-udeb --sourcedir=debian/install/udeb --list-missing
dh_install --remaining-packages --sourcedir=debian/install/deb --list-missing
More information about the pkg-gnome-commits
mailing list