]> git.sur5r.net Git - glabels/commitdiff
Update debian/* for 3.0.0-1
authorJakob Haufe <sur5r@sur5r.net>
Sun, 11 Mar 2012 23:18:12 +0000 (00:18 +0100)
committerJakob Haufe <sur5r@sur5r.net>
Wed, 28 Mar 2012 17:20:37 +0000 (19:20 +0200)
- 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
debian/control
debian/control.in [deleted file]
debian/glabels-data.install
debian/glabels-dev.install
debian/menu
debian/rules

index 364e5ccb5202a41f372d1401f572f1893a9cf815..d121823a4493187f4074fd32d6ca3e6827b3ee33 100644 (file)
@@ -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 <sur5r@sur5r.net>  Mon, 12 Mar 2012 00:11:13 +0100
+
 glabels (2.2.8-3) unstable; urgency=low
 
   * QA upload.
index c2f345d9b82c292894635ca783ffdee051f84b28..6c9248e0d22049fcc0803f644433039e429c1673 100644 (file)
@@ -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 <packages@qa.debian.org>
+Maintainer: Jakob Haufe <sur5r@sur5r.net>
 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 (file)
index ed14777..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-Source: glabels
-Section: gnome
-Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-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.
index d66aed878488447a87d0423458b774b322bae0c3..15c05e363b0f5643deafe8bc0d33291336c9655b 100644 (file)
@@ -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
index c5b7a846f037beaa9972adcbc17f4bc8ac302762..27faeba3f7b7eb1592e2a7c57c5517211af91f31 100644 (file)
@@ -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
index ce180e33b46da6e26dc2bcb9b34c17cfde8c8b7d..7c7574824616ab3b7b3cff89520b4921da1c2861 100644 (file)
@@ -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"      \
index 44a72039ceac2f48a1e257230bc11770ce08b020..27c5486165838eed1455af62da139c6664717f9f 100755 (executable)
@@ -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