[Git][java-team/pkg-java-scripts][master] 7 commits: Renamed the dh update script

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Fri Sep 17 08:47:44 BST 2021



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / pkg-java-scripts


Commits:
6b4aaae9 by Emmanuel Bourg at 2021-09-17T09:35:01+02:00
Renamed the dh update script

- - - - -
324cf5d4 by Emmanuel Bourg at 2021-09-17T09:37:15+02:00
Update to Standards-Version 4.6.0.1

- - - - -
3057d84f by Emmanuel Bourg at 2021-09-17T09:38:35+02:00
Update to DH level 11

- - - - -
763a169c by Emmanuel Bourg at 2021-09-17T09:40:10+02:00
salsavcs.sh: support the debian-science repositories

- - - - -
da4ad3bb by Emmanuel Bourg at 2021-09-17T09:40:57+02:00
Remove the debian/compat file when updating the dh level

- - - - -
0a59df5b by Emmanuel Bourg at 2021-09-17T09:43:00+02:00
Filter out more files from the upstream repositories

- - - - -
7c5d140e by Emmanuel Bourg at 2021-09-17T09:45:13+02:00
Added a confirmation step before erasing the current repository

- - - - -


5 changed files:

- README.txt
- dh11.sh → dh-update
- salsavcs.sh
- setup-packaging-repository.sh
- stdver.sh


Changes:

=====================================
README.txt
=====================================
@@ -19,7 +19,7 @@ Here are the scripts available:
  * setup-salsa-repository
         Setup a new Git repository on Salsa
 
- * dh11.sh
+ * dh-update
         Update the debhelper compatibility level. The script updates
         debian/control, debian/compat, debian/rules and debian/changelog..
         The changes are reviewed before being committed to Git.


=====================================
dh11.sh → dh-update
=====================================
@@ -3,7 +3,7 @@
 # Update the debhelper compatibility level
 #
 
-DH_LEVEL=11
+DH_LEVEL=13
 
 echo "Upgrading package to DH level $DH_LEVEL..."
 echo ""
@@ -15,11 +15,11 @@ if [ $DH_LEVEL == $CURRENT_LEVEL ]; then
     exit
 fi
 
-# Update debian/compat
-echo $DH_LEVEL > debian/compat
+# Remove debian/compat
+git rm debian/compat
 
 # Update debian/control
-sed -i -e "s/debhelper[^,]*/debhelper (>= $DH_LEVEL)/g" debian/control
+sed -i -e "s/debhelper[^,]*/debhelper-compat (= ${DH_LEVEL})/g" debian/control
 
 # Remove the --buildsystem option from debian/rules
 # (Maven builds are detected automaticaly by DH >= 10)
@@ -35,7 +35,7 @@ MSG="Switch to debhelper level $DH_LEVEL"
 dch $MSG
 
 # Prepare to commit and review the changes
-git add debian/control debian/changelog debian/compat debian/rules
+git add debian/control debian/changelog debian/rules
 git diff --staged
 
 echo ""


=====================================
salsavcs.sh
=====================================
@@ -16,14 +16,16 @@ if [ $? -eq 0 ]; then
     VCS_UPDATED=1
 fi
 
-TEAMS="pkg-java pkg-clojure debian-med collab-maint"
+TEAMS="pkg-java pkg-clojure debian-med debian-science collab-maint"
 
 for TEAM in $TEAMS; do
+    sed -i "s#git://anonscm.debian.org/$TEAM/packages/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\1#g" debian/control
     sed -i "s#git://anonscm.debian.org/$TEAM/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\1#g" debian/control
     sed -i "s#git://git.debian.org/$TEAM/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\1#g" debian/control
     sed -i "s#git://git.debian.org/git/$TEAM/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\1#g" debian/control
     sed -i "s#http\(s\)\?://anonscm.debian.org/git/$TEAM/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\2#g" debian/control
     sed -i "s#http\(s\)\?://anonscm.debian.org/cgit/$TEAM/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\2#g" debian/control
+    sed -i "s#http\(s\)\?://anonscm.debian.org/gitweb/?p=$TEAM/packages/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\2#g" debian/control
     sed -i "s#http\(s\)\?://anonscm.debian.org/gitweb/?p=$TEAM/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\2#g" debian/control
     sed -i "s#http\(s\)\?://git.debian.org/?p=$TEAM/\([^/]*\)/\?#https://salsa.debian.org/$TEAM/\2#g" debian/control
 done
@@ -35,6 +37,7 @@ sed -i "s#\(Vcs-Browser: .*\).git#\1#" debian/control
 sed -i "s#/pkg-java/#/java-team/#" debian/control
 sed -i "s#/pkg-clojure/#/clojure-team/#" debian/control
 sed -i "s#/debian-med/#/med-team/#" debian/control
+sed -i "s#/debian-science/#/science-team/#" debian/control
 sed -i "s#/collab-maint/#/debian/#" debian/control
 
 # Add an entry to debian/changelog


=====================================
setup-packaging-repository.sh
=====================================
@@ -5,6 +5,14 @@
 # Please see also https://wiki.debian.org/Java/JavaVcs
 #
 
+while true; do
+    read -p "Do you want to erase the current repository and recreate it from the upstream tarball and the debian directory? [yN] " choice
+    case $choice in
+        [Yy]* ) break;;
+        * ) exit;;
+    esac
+done
+
 PACKAGE=$(dpkg-parsechangelog | sed -rne 's/^Source: (.*)/\1/p')
 VERSION=$(dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.A-Za-z~]+)[-+].*$$/\1/p')
 #VERSION=1.0~alpha-1
@@ -31,6 +39,7 @@ echo "Cleanup the working directory..."
 shopt -s extglob
 rm -Rfv !(debian)
 rm -Rf .git* .travis* .pc .idea .settings .classpath .project .checkstyle .lein-failures .dockerignore
+rm -Rf .git* .travis* .pc .idea .settings .classpath .project .checkstyle .lein-failures .dockerignore .hgignore .mvn .ply .appveyor.yml .editorconfig
 
 echo ""
 echo "Preparing the local repository..."


=====================================
stdver.sh
=====================================
@@ -3,7 +3,7 @@
 # Update the Standards-Version field in debian/control
 #
 
-STANDARDS_VERSION=4.1.4
+STANDARDS_VERSION=4.6.0.1
 
 echo "Updating Standards-Version to $STANDARDS_VERSION..."
 echo ""



View it on GitLab: https://salsa.debian.org/java-team/pkg-java-scripts/-/compare/4e20c0388a3e3a58d57ba5f5d543ff7241e21b77...7c5d140e9325f726c149dbe1c34c02ec2f31e6cb

-- 
View it on GitLab: https://salsa.debian.org/java-team/pkg-java-scripts/-/compare/4e20c0388a3e3a58d57ba5f5d543ff7241e21b77...7c5d140e9325f726c149dbe1c34c02ec2f31e6cb
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/pkg-java-commits/attachments/20210917/077132af/attachment.htm>


More information about the pkg-java-commits mailing list