From 087020da573f07b54a9d6f62ff67f73567efb18f Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Mon, 12 Mar 2012 00:18:12 +0100 Subject: [PATCH] Update debian/* for 3.0.0-1 - Move control.in to control as this is not maintained by the Gnome team anymore. - Update menu to point to new binary. - Update install files --- debian/changelog | 12 +++++++ debian/control | 32 +++++++---------- debian/control.in | 68 ------------------------------------- debian/glabels-data.install | 12 ++++--- debian/glabels-dev.install | 4 ++- debian/menu | 2 +- debian/rules | 4 +-- 7 files changed, 38 insertions(+), 96 deletions(-) delete mode 100644 debian/control.in diff --git a/debian/changelog b/debian/changelog index 364e5ccb..d121823a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +glabels (3.0.0-1) unstable; urgency=low + + * New upstream release + * Recreate debian/patches/* for 3.0.0 + - Names changed due to use of gbp-pq + - Drop 30_Werror-format-security.patch as glables now uses + external barcode + - Drop 40_linker.patch (Change adopted upstream) + * Adopt package (Closes: #569335) + + -- Jakob Haufe Mon, 12 Mar 2012 00:11:13 +0100 + glabels (2.2.8-3) unstable; urgency=low * QA upload. diff --git a/debian/control b/debian/control index c2f345d9..6c9248e0 100644 --- a/debian/control +++ b/debian/control @@ -1,32 +1,26 @@ -# This file is autogenerated. DO NOT EDIT! -# -# Modifications should be made to debian/control.in instead. -# This file is regenerated automatically in the clean target. - Source: glabels Section: gnome Priority: optional -Maintainer: Debian QA Group +Maintainer: Jakob Haufe Build-Depends: autotools-dev, cdbs, debhelper (>= 5.0), intltool (>= 0.21), - gnome-pkg-tools, gnome-doc-utils (>= 0.3.2), - libglib2.0-dev (>= 2.12), - libgtk2.0-dev (>= 2.10), - libgnome2-dev (>= 2.16), - libgnomeui-dev (>= 2.16), - libxml2-dev (>= 2.7.0), - libglade2-dev (>= 2.6), - libebook1.2-dev (>= 1.8), - libxml-parser-perl, - scrollkeeper, - dpkg-dev (>= 1.13.19) + libglib2.0-dev (>= 2.28.2), + libgtk-3-dev (>= 3.0.9), + libxml2-dev (>= 2.7.8), + librsvg2-dev (>= 2.32.0), + libcairo2-dev (>= 1.10.0), + libpango1.0-dev (>= 1.28.1), + libebook1.2-dev (>= 2.30.3), + barcode (>= 0.98), + libqrencode-dev (>= 3.1.0), + libiec16022-dev (>= 0.2.4) Standards-Version: 3.9.2 Homepage: http://glabels.sourceforge.net/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/glabels/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/glabels/ +Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/glabels/trunk +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/glabels/trunk/?op=log Package: glabels Architecture: any diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index ed147771..00000000 --- a/debian/control.in +++ /dev/null @@ -1,68 +0,0 @@ -Source: glabels -Section: gnome -Priority: optional -Maintainer: Debian QA Group -Build-Depends: autotools-dev, - cdbs, - debhelper (>= 5.0), - intltool (>= 0.21), - gnome-pkg-tools, - gnome-doc-utils (>= 0.3.2), - libglib2.0-dev (>= 2.12), - libgtk2.0-dev (>= 2.10), - libgnome2-dev (>= 2.16), - libgnomeui-dev (>= 2.16), - libxml2-dev (>= 2.7.0), - libglade2-dev (>= 2.6), - libebook1.2-dev (>= 1.8), - libxml-parser-perl, - scrollkeeper, - dpkg-dev (>= 1.13.19) -Standards-Version: 3.9.2 -Homepage: http://glabels.sourceforge.net/ -Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/glabels/trunk -Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/glabels/trunk/?op=log - -Package: glabels -Architecture: any -Depends: glabels-data (= ${source:Version}), - ${shlibs:Depends}, - ${misc:Depends} -Suggests: evolution-data-server -Replaces: glabels-data (<< 2.2.5-1) -Provides: libglabels5 -Description: label, business card and media cover creation program for GNOME - gLabels is a lightweight program for creating labels, barcodes, business - cards and media covers for the GNOME desktop environment. It is designed to - work with various laser/ink-jet peel-off label and business card sheets that - you'll find at most office supply stores. - . - gLabels also supports mail merge from sources such as CSV files, vCards and - Evolution data servers. - -Package: glabels-data -Architecture: all -Depends: ${misc:Depends} -Replaces: glabels (<< 2.0.2) -Description: data files for gLabels - gLabels is a lightweight program for creating labels, barcodes, business - cards and media covers for the GNOME desktop environment. - . - This package contains gLabel's default set of label, business card and media - cover templates. - -Package: glabels-dev -Section: devel -Architecture: any -Depends: glabels (= ${binary:Version}), - glabels-data (= ${source:Version}), - libglib2.0-dev, - libxml2-dev, - ${misc:Depends} -Replaces: glabels (<< 2.0.2) -Description: development documentation and library files for gLabels - gLabels is a lightweight program for creating labels, barcodes, business - cards and media covers for the GNOME desktop environment. - . - This package provides the development environment for libglabels, - which is meant to facilitate 3rd party use of glabels templates. diff --git a/debian/glabels-data.install b/debian/glabels-data.install index d66aed87..15c05e36 100644 --- a/debian/glabels-data.install +++ b/debian/glabels-data.install @@ -1,8 +1,10 @@ -usr/share/application-registry -usr/share/glabels usr/share/gnome usr/share/locale usr/share/mime -usr/share/mime-info -usr/share/omf -usr/share/pixmaps +usr/share/icons/hicolor +usr/share/glabels-3.0/icons/hicolor /usr/share/icons +usr/share/glabels-3.0/pixmaps/ +usr/share/glabels-3.0/ui +usr/share/libglabels-3.0/templates +usr/share/libglabels-3.0/dtd +usr/share/glib-2.0/schemas diff --git a/debian/glabels-dev.install b/debian/glabels-dev.install index c5b7a846..27faeba3 100644 --- a/debian/glabels-dev.install +++ b/debian/glabels-dev.install @@ -1,5 +1,7 @@ -usr/include/libglabels +usr/include/libglbarcode-3.0/ /usr/include/ +usr/include/libglabels-3.0/ /usr/include/ usr/lib/*.a +usr/lib/*.la usr/lib/pkgconfig usr/lib/*.so usr/share/gtk-doc diff --git a/debian/menu b/debian/menu index ce180e33..7c757482 100644 --- a/debian/menu +++ b/debian/menu @@ -2,7 +2,7 @@ needs="X11" \ section="Applications/Graphics" \ title="gLabels" \ - command="/usr/bin/glabels" \ + command="/usr/bin/glabels-3" \ hints="Desktop Publishing" \ icon="/usr/share/pixmaps/glabels.xpm" \ longtitle="gLabels Label Designer" \ diff --git a/debian/rules b/debian/rules index 44a72039..27c54861 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/utils.mk #include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk --include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk +#include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk # Compilation options DEB_CONFIGURE_EXTRA_FLAGS := --disable-update-desktopdb \ @@ -23,4 +23,4 @@ DEB_CONFIGURE_EXTRA_FLAGS := --disable-update-desktopdb \ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=-Wl,--as-needed # Debhelper arguments -DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp +DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp --list-missing -- 2.39.5