[med-svn] [Git][med-team/beads][master] 7 commits: Fix clean target

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / beads


Commits:
145b09e8 by Andreas Tille at 2025-10-16T13:52:12+02:00
Fix clean target

- - - - -
5a02cff5 by Andreas Tille at 2025-10-16T13:54:53+02:00
Drop copy of CImg.h from package source

- - - - -
a5388523 by Andreas Tille at 2025-10-16T13:55:42+02:00
New upstream version 1.1.22+ds
- - - - -
638f9cc6 by Andreas Tille at 2025-10-16T13:55:54+02:00
Update upstream source from tag 'upstream/1.1.22+ds'

Update to upstream version '1.1.22+ds'
with Debian dir 2b73a46ada6ddc4b5b92fccbaaaf1d28179cf9c8
- - - - -
e04f93ba by Andreas Tille at 2025-10-16T13:59:10+02:00
Adapt to removed CImg.h copy

- - - - -
6ef755a9 by Andreas Tille at 2025-10-16T14:18:12+02:00
Remove trailing whitespace in debian/changelog (routine-update)

- - - - -
d7208f75 by Andreas Tille at 2025-10-16T14:22:55+02:00
routine-update: Ready to upload to unstable

- - - - -


7 changed files:

- debian/changelog
- .gitignore → debian/clean
- debian/control
- debian/copyright
- debian/rules
- debian/watch
- − src/cimg/CImg.h


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,14 @@
-beads (1.1.22-3) UNRELEASED; urgency=medium
+beads (1.1.22+ds-1) unstable; urgency=medium
 
   * d/watch:
      - version=5
      - Do not report new or old versions
+  * Fix clean target
+    Closes: #1043686
+  * Drop copy of CImg.h from package source
+  * Remove trailing whitespace in debian/changelog (routine-update)
 
- -- Andreas Tille <tille at debian.org>  Thu, 16 Oct 2025 13:40:07 +0200
+ -- Andreas Tille <tille at debian.org>  Thu, 16 Oct 2025 14:18:16 +0200
 
 beads (1.1.22-2) unstable; urgency=medium
 
@@ -30,7 +34,7 @@ beads (1.1.22-1) unstable; urgency=low
 
 beads (1.1.21-1) unstable; urgency=low
 
-  * Port to Qt6. 
+  * Port to Qt6.
   * Update version of libodsstream-dev build-dep package.
   * Fixes in the CMake-based system.
   * Standards-Version: 4.6.1 (routine update).


=====================================
.gitignore → debian/clean
=====================================
@@ -1,3 +1 @@
-.project
-build
 src/config.h


=====================================
debian/control
=====================================
@@ -1,22 +1,25 @@
 Source: beads
+Standards-Version: 4.7.2
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>,
-           Filippo Rusconi <lopippo at debian.org>
+Uploaders:
+ Andreas Tille <tille at debian.org>,
+ Filippo Rusconi <lopippo at debian.org>,
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends:
+ debhelper-compat (= 13),
  cmake,
  qtbase5-dev,
  cimg-dev,
- libodsstream-dev (>= 0.9.1),
-Standards-Version: 4.7.2
+ libodsstream-dev,
 Vcs-Browser: https://salsa.debian.org/med-team/beads
 Vcs-Git: https://salsa.debian.org/med-team/beads.git
 Homepage: http://pappso.inrae.fr/bioinfo/beads
 
 Package: beads
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
+ ${shlibs:Depends},
  ${misc:Depends},
  imagemagick,
 Description: 2-DE electrophoresis gel image spot detection


=====================================
debian/copyright
=====================================
@@ -2,6 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Beads
 Upstream-Contact: Olivier Langella <olivier.langella at universite-paris-saclay.fr>
 Source: http://pappso.inrae.fr/bioinfo/beads/index.php
+Files-Excluded: src/cimg/CImg.h
 
 Files: *
 Copyright: 2008-2010 Michel Zivy <zivy at moulon.inra.fr>, Olivier Langella <olivier.langella at moulon.inra.fr>


=====================================
debian/rules
=====================================
@@ -8,7 +8,3 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
-
-override_dh_auto_build:
-	sed -i 's/assignement/assignment/' src/cimg/CImg.h
-	dh_auto_build


=====================================
debian/watch
=====================================
@@ -3,7 +3,7 @@ Version: 5
 Source: https://forgemia.inra.fr/pappso/@PACKAGE@/-/tags?sort=updated_desc
 Matching-Pattern: .*/tags/upstream%2F(\d[\d.]+)
 # Matching-Pattern: (?:.*?/)?(beads_)?(\d[\d.]+)@ARCHIVE_EXT@
-Dversion-Mangle: s/1\.1\.2[12]/1.1.20/
+Dversion-Mangle: s/1\.1\.2[12]\+ds/1.1.20/
 
 # The following page has all the tags.
 # https://forgemia.inra.fr/pappso/beads/-/tags


=====================================
src/cimg/CImg.h deleted
=====================================
The diff for this file was not included because it is too large.


View it on GitLab: https://salsa.debian.org/med-team/beads/-/compare/6c9588c699896b08ffbcc4216d853e5a9513cbe7...d7208f751b26d2756e37b162647f7eaffb518d8b

-- 
View it on GitLab: https://salsa.debian.org/med-team/beads/-/compare/6c9588c699896b08ffbcc4216d853e5a9513cbe7...d7208f751b26d2756e37b162647f7eaffb518d8b
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/20251016/e6c56fe9/attachment-0001.htm>