[med-svn] [Git][med-team/acedb][master] 4 commits: Drop transitional package acedb-other-belvu
Andreas Tille (@tille)
gitlab at salsa.debian.org
Tue Aug 15 14:33:06 BST 2023
Andreas Tille pushed to branch master at Debian Med / acedb
Commits:
4c03a35c by Andreas Tille at 2023-08-15T14:43:44+02:00
Drop transitional package acedb-other-belvu
- - - - -
eeaf1d71 by Andreas Tille at 2023-08-15T14:44:49+02:00
Drop transitional package acedb-other-dotter
- - - - -
063c15be by Andreas Tille at 2023-08-15T15:31:14+02:00
Build only efetch which does not depend on GTK+2 which will be removed from Debian (NOT WORKING YET - hopefully half way down the road)
- - - - -
9f6ff0d9 by Andreas Tille at 2023-08-15T15:32:27+02:00
Drop some README.Debian files which are only useful for the just removed transitional packages
- - - - -
7 changed files:
- − debian/acedb-other-belvu.README.Debian
- − debian/acedb-other-dotter.README.Debian
- − debian/acedb-other.README.Debian
- debian/changelog
- debian/control
- + debian/patches/just_build_efetch.patch
- debian/patches/series
Changes:
=====================================
debian/acedb-other-belvu.README.Debian deleted
=====================================
@@ -1 +0,0 @@
-acedb-other.README.Debian
\ No newline at end of file
=====================================
debian/acedb-other-dotter.README.Debian deleted
=====================================
@@ -1 +0,0 @@
-acedb-other.README.Debian
\ No newline at end of file
=====================================
debian/acedb-other.README.Debian deleted
=====================================
@@ -1,9 +0,0 @@
-acedb for Debian
-----------------
-
-Some major components of this package, dotter and belvu, are now
-provided by the accordingly named packages created from seqtools
-source package. This source package also builds blixem which is
-part of ACEDB as well but was never provided as a separate package.
-
- -- Andreas Tille <tille at debian.org> Tue, 19 Dec 2017 13:00:46 +0100
=====================================
debian/changelog
=====================================
@@ -5,7 +5,13 @@ acedb (4.9.39+dfsg.02-8) UNRELEASED; urgency=medium
* Refresh no_dotter_and_belvu.patch accordingly.
[ Andreas Tille ]
- * Weak attempt to get rid of GTK2 to address bug #967243
+ * Drop transitional package acedb-other-belvu
+ Closes: #1032625
+ * Drop transitional package acedb-other-dotter
+ Closes: #1032626
+ * Build only efetch which does not depend on GTK+2 which will be removed
+ from Debian
+ Closes: #967243
-- Étienne Mollier <emollier at debian.org> Mon, 25 Oct 2021 22:53:22 +0200
=====================================
debian/control
=====================================
@@ -19,28 +19,6 @@ Vcs-Git: https://salsa.debian.org/med-team/acedb.git
Homepage: http://www.acedb.org/
Rules-Requires-Root: no
-Package: acedb-other-dotter
-Architecture: all
-Section: oldlibs
-Depends: ${misc:Depends},
- dotter
-Description: transitional package for dotter
- This is a transitional package to ease upgrades to the new dotter
- executable now maintained in the seqtools source package. The
- dotter executable in the acedb package was unmaintained for years
- and seqtools contains the maintained code.
-
-Package: acedb-other-belvu
-Architecture: all
-Section: oldlibs
-Depends: ${misc:Depends},
- belvu
-Description: transitional package for belvu
- This is a transitional package to ease upgrades to the new belvu
- executable now maintained in the seqtools source package. The
- belvu executable in the acedb package was unmaintained for years
- and seqtools contains the maintained code.
-
Package: acedb-other
Architecture: any
Depends: ${shlibs:Depends},
=====================================
debian/patches/just_build_efetch.patch
=====================================
@@ -0,0 +1,54 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 15 Aug 2023 15:26:11 +0200
+Bug-Debian: https://bugs.debian.org/967243
+Description: Build only efetch which does not depend on GTK+2 which will be removed from Debian
+
+--- a/wmake/makefile
++++ b/wmake/makefile
+@@ -16,7 +16,7 @@ SHELL = /bin/sh
+
+ # Make sure this is ALWAYS the first target in this makefile, the overnight and release
+ # build systems all rely on this.
+-all : libs ace other tools
++all : other
+
+ #all_static : clean gnulibs libs ace other tools
+
+--- a/wmake/LINUX_4_DEF
++++ b/wmake/LINUX_4_DEF
+@@ -21,14 +21,14 @@ NAME = LINUX
+ LIBCC = gcc
+
+ COPT = -g
+-GTKVER = glib-2.0 gtk+-2.0
++GTKVER = glib-2.0
+
+ COMPILER = gcc $(CPPFLAGS) $(COPT) -Wall -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
+
+ LINKER = gcc $(COPT)
+
+ # The arg to libs-config is used if our private copy not installed.
+-LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` $(LDFLAGS) -lm -lreadline -lX11
++LIBS = -L/usr/X11R6/lib `pkg-config --libs $(GTKVER)` $(LDFLAGS) -lm -lreadline -lX11
+
+ ### Linux uses flex to emulate the standard 'lex' program
+ LEX_LIBS = -lfl
+--- a/wmake/LINUX_64_DEF
++++ b/wmake/LINUX_64_DEF
+@@ -21,14 +21,14 @@ NAME = OPTERON
+ LIBCC = gcc
+
+ COPT = -g
+-GTKVER = glib-2.0 gtk+-2.0
++GTKVER = glib-2.0
+
+ COMPILER = gcc $(COPT) $(CPPFLAGS) -Wall -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
+
+ LINKER = gcc $(COPT)
+
+ # The arg to libs-config is used if our private copy not installed.
+-LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` $(LDFLAGS) -lm -lreadline -lX11
++LIBS = -L/usr/X11R6/lib `pkg-config --libs $(GTKVER)` $(LDFLAGS) -lm -lreadline -lX11
+
+ ### Linux uses flex to emulate the standard 'lex' program
+ LEX_LIBS = -lfl
=====================================
debian/patches/series
=====================================
@@ -11,4 +11,5 @@ spelling.patch
no_dotter_and_belvu.patch
libfl.patch
glibc2.32.patch
-drop_gtk2.patch
+# drop_gtk2.patch
+just_build_efetch.patch
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/compare/cfd57532861517bad753f07506dfc189ee107c4c...9f6ff0d96d2487e77b0ca584090d2aee24e1ad0f
--
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/compare/cfd57532861517bad753f07506dfc189ee107c4c...9f6ff0d96d2487e77b0ca584090d2aee24e1ad0f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230815/38b521df/attachment-0001.htm>
More information about the debian-med-commit
mailing list